From b6ea56781ce89999c906c9bee40a2dfdd5ea5102 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Wed, 26 Aug 2020 21:11:23 +0100 Subject: [PATCH] rsclient: rev 191 --- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- .../net/runelite/mixins/RSClientMixin.java | 13 + .../java/net/runelite/rs/api/RSClient.java | 19 +- .../java/net/runelite/rs/api/RSFillMode.java | 29 + .../src/main/java/AbstractArchive.java | 1159 +-- .../main/java/AbstractByteArrayCopier.java | 65 +- .../src/main/java/AbstractFont.java | 1062 +- .../src/main/java/AbstractRasterProvider.java | 32 +- .../src/main/java/AbstractSocket.java | 47 +- .../src/main/java/AbstractSound.java | 6 +- .../src/main/java/AbstractUserComparator.java | 184 +- .../src/main/java/AbstractWorldMapData.java | 396 +- .../src/main/java/AbstractWorldMapIcon.java | 237 +- .../src/main/java/AccessFile.java | 172 +- runescape-client/src/main/java/Actor.java | 1072 +- runescape-client/src/main/java/Animation.java | 142 +- .../main/java/ApproximateRouteStrategy.java | 289 +- runescape-client/src/main/java/Archive.java | 634 +- .../src/main/java/ArchiveDisk.java | 343 +- .../src/main/java/ArchiveDiskAction.java | 286 +- .../main/java/ArchiveDiskActionHandler.java | 225 +- .../src/main/java/ArchiveLoader.java | 208 +- .../src/main/java/AttackOption.java | 258 +- .../src/main/java/AudioFilter.java | 178 +- .../src/main/java/BZip2Decompressor.java | 734 +- .../src/main/java/BZip2State.java | 188 +- .../src/main/java/BoundaryObject.java | 492 +- runescape-client/src/main/java/Bounds.java | 139 +- runescape-client/src/main/java/Buddy.java | 160 +- .../src/main/java/BuddyRankComparator.java | 91 +- runescape-client/src/main/java/Buffer.java | 1750 ++-- .../src/main/java/BufferedFile.java | 380 +- .../src/main/java/BufferedNetSocket.java | 84 +- .../src/main/java/BufferedSink.java | 171 +- .../src/main/java/BufferedSource.java | 190 +- .../src/main/java/ByteArrayNode.java | 8 +- .../src/main/java/ByteArrayPool.java | 126 +- runescape-client/src/main/java/Calendar.java | 39 +- runescape-client/src/main/java/Canvas.java | 368 +- .../src/main/java/ChatChannel.java | 336 +- runescape-client/src/main/java/ClanChat.java | 369 +- runescape-client/src/main/java/ClanMate.java | 151 +- runescape-client/src/main/java/Client.java | 8690 +++++++++-------- .../src/main/java/ClientPacket.java | 1032 +- .../src/main/java/ClientPreferences.java | 220 +- runescape-client/src/main/java/Clock.java | 280 +- .../src/main/java/CollisionMap.java | 1013 +- runescape-client/src/main/java/Coord.java | 228 +- runescape-client/src/main/java/Decimator.java | 853 +- .../src/main/java/DefaultsGroup.java | 18 +- .../src/main/java/DemotingHashTable.java | 164 +- .../java/DesktopPlatformInfoProvider.java | 207 +- .../src/main/java/DevicePcmPlayer.java | 107 +- .../main/java/DevicePcmPlayerProvider.java | 257 +- .../src/main/java/DirectByteArrayCopier.java | 86 +- .../src/main/java/DirectWrapper.java | 18 +- runescape-client/src/main/java/DualNode.java | 26 +- .../src/main/java/DualNodeDeque.java | 54 +- .../src/main/java/DynamicObject.java | 404 +- runescape-client/src/main/java/Entity.java | 338 +- .../src/main/java/EnumDefinition.java | 181 +- .../src/main/java/Enumerated.java | 6 +- .../main/java/EvictingDualNodeHashTable.java | 100 +- .../src/main/java/FaceNormal.java | 64 +- .../src/main/java/FileSystem.java | 133 +- runescape-client/src/main/java/FillMode.java | 56 + .../src/main/java/FloorDecoration.java | 182 +- .../src/main/java/FloorOverlayDefinition.java | 366 +- .../main/java/FloorUnderlayDefinition.java | 223 +- runescape-client/src/main/java/Font.java | 122 +- runescape-client/src/main/java/FontName.java | 182 +- runescape-client/src/main/java/Fonts.java | 58 +- runescape-client/src/main/java/Frames.java | 312 +- runescape-client/src/main/java/Friend.java | 66 +- .../src/main/java/FriendLoginUpdate.java | 122 +- .../src/main/java/FriendSystem.java | 695 +- .../src/main/java/FriendsList.java | 186 +- .../src/main/java/GZipDecompressor.java | 45 +- runescape-client/src/main/java/GameBuild.java | 281 +- .../src/main/java/GameObject.java | 151 +- runescape-client/src/main/java/GameShell.java | 1286 ++- .../src/main/java/GrandExchangeEvent.java | 799 +- .../src/main/java/GrandExchangeEvents.java | 412 +- .../src/main/java/GrandExchangeOffer.java | 386 +- .../java/GrandExchangeOfferAgeComparator.java | 322 +- .../GrandExchangeOfferNameComparator.java | 894 +- .../GrandExchangeOfferOwnWorldComparator.java | 365 +- ...dExchangeOfferTotalQuantityComparator.java | 248 +- ...GrandExchangeOfferUnitPriceComparator.java | 124 +- .../GrandExchangeOfferWorldComparator.java | 856 +- .../src/main/java/GraphicsDefaults.java | 136 +- .../src/main/java/GraphicsObject.java | 235 +- runescape-client/src/main/java/HealthBar.java | 1326 +-- .../src/main/java/HealthBarDefinition.java | 316 +- .../src/main/java/HealthBarUpdate.java | 91 +- .../src/main/java/HitSplatDefinition.java | 678 +- .../src/main/java/HorizontalAlignment.java | 89 +- runescape-client/src/main/java/Huffman.java | 342 +- .../src/main/java/IgnoreList.java | 93 +- runescape-client/src/main/java/Ignored.java | 26 +- .../src/main/java/IndexedSprite.java | 296 +- .../src/main/java/Instrument.java | 412 +- .../src/main/java/IntHashTable.java | 42 +- .../src/main/java/IntegerNode.java | 8 +- .../src/main/java/InterfaceParent.java | 42 +- .../src/main/java/Interpreter.java | 180 +- .../src/main/java/InvDefinition.java | 263 +- .../src/main/java/IsaacCipher.java | 338 +- .../src/main/java/ItemContainer.java | 130 +- .../src/main/java/ItemDefinition.java | 1398 ++- .../src/main/java/IterableDualNodeQueue.java | 154 +- .../java/IterableDualNodeQueueIterator.java | 66 +- .../src/main/java/IterableNodeDeque.java | 308 +- .../IterableNodeDequeDescendingIterator.java | 78 +- .../src/main/java/IterableNodeHashTable.java | 126 +- .../java/IterableNodeHashTableIterator.java | 82 +- .../src/main/java/JagexCache.java | 282 +- .../src/main/java/KeyHandler.java | 840 +- .../src/main/java/KitDefinition.java | 420 +- runescape-client/src/main/java/Language.java | 458 +- runescape-client/src/main/java/Link.java | 24 +- runescape-client/src/main/java/LinkDeque.java | 66 +- runescape-client/src/main/java/Login.java | 418 +- .../src/main/java/LoginPacket.java | 99 +- .../src/main/java/LoginScreenAnimation.java | 904 +- runescape-client/src/main/java/LoginType.java | 94 +- .../src/main/java/MenuAction.java | 99 +- runescape-client/src/main/java/Message.java | 343 +- runescape-client/src/main/java/Messages.java | 64 +- .../src/main/java/MidiFileReader.java | 278 +- .../src/main/java/MidiPcmStream.java | 1740 ++-- .../src/main/java/MilliClock.java | 225 +- runescape-client/src/main/java/ModeWhere.java | 241 +- runescape-client/src/main/java/Model.java | 2095 ++-- runescape-client/src/main/java/ModelData.java | 2044 ++-- .../src/main/java/ModelData0.java | 77 +- .../src/main/java/MouseHandler.java | 671 +- .../src/main/java/MouseRecorder.java | 239 +- .../src/main/java/MouseWheel.java | 6 +- .../src/main/java/MouseWheelHandler.java | 42 +- .../src/main/java/MusicPatch.java | 621 +- .../src/main/java/MusicPatchNode.java | 309 +- .../src/main/java/MusicPatchNode2.java | 141 +- .../src/main/java/MusicPatchPcmStream.java | 223 +- .../src/main/java/MusicTrack.java | 546 +- runescape-client/src/main/java/NPC.java | 242 +- .../src/main/java/NPCDefinition.java | 660 +- runescape-client/src/main/java/NanoClock.java | 57 +- runescape-client/src/main/java/NetCache.java | 131 +- .../src/main/java/NetFileRequest.java | 68 +- runescape-client/src/main/java/NetSocket.java | 442 +- runescape-client/src/main/java/Node.java | 30 +- runescape-client/src/main/java/NodeDeque.java | 246 +- .../src/main/java/NodeHashTable.java | 106 +- .../src/main/java/ObjectDefinition.java | 1045 +- .../src/main/java/ObjectNode.java | 8 +- .../src/main/java/ObjectSound.java | 308 +- runescape-client/src/main/java/Occluder.java | 174 +- .../src/main/java/PacketBuffer.java | 255 +- .../src/main/java/PacketBufferNode.java | 81 +- .../src/main/java/PacketWriter.java | 260 +- .../src/main/java/ParamDefinition.java | 93 +- runescape-client/src/main/java/PcmPlayer.java | 577 +- runescape-client/src/main/java/PcmStream.java | 46 +- .../src/main/java/PcmStreamMixer.java | 324 +- .../src/main/java/PcmStreamMixerListener.java | 10 +- .../src/main/java/PendingSpawn.java | 189 +- .../src/main/java/PlatformInfo.java | 326 +- .../src/main/java/PlatformInfoProvider.java | 8 +- runescape-client/src/main/java/Player.java | 1343 ++- .../src/main/java/PlayerAppearance.java | 480 +- .../src/main/java/PlayerProvider.java | 8 +- .../src/main/java/PlayerType.java | 132 +- runescape-client/src/main/java/Players.java | 115 +- .../src/main/java/PrivateChatMode.java | 57 +- .../src/main/java/Projectile.java | 290 +- .../src/main/java/RasterProvider.java | 88 +- .../src/main/java/Rasterizer2D.java | 854 +- .../src/main/java/Rasterizer3D.java | 4372 +++++---- .../src/main/java/RawPcmStream.java | 2110 ++-- runescape-client/src/main/java/RawSound.java | 54 +- .../src/main/java/ReflectionCheck.java | 118 +- .../src/main/java/RouteStrategy.java | 86 +- .../src/main/java/RunException.java | 29 +- runescape-client/src/main/java/Scene.java | 2865 +++--- runescape-client/src/main/java/Script.java | 171 +- .../src/main/java/ScriptEvent.java | 206 +- .../src/main/java/ScriptFrame.java | 77 +- .../src/main/java/SecureRandomCallable.java | 1125 ++- .../src/main/java/SecureRandomFuture.java | 383 +- .../src/main/java/SequenceDefinition.java | 469 +- .../src/main/java/ServerPacket.java | 898 +- runescape-client/src/main/java/Skeleton.java | 115 +- runescape-client/src/main/java/Skills.java | 43 +- .../src/main/java/SoftWrapper.java | 18 +- .../src/main/java/SoundCache.java | 212 +- .../src/main/java/SoundEffect.java | 106 +- .../src/main/java/SoundEnvelope.java | 104 +- .../src/main/java/SoundSystem.java | 200 +- .../main/java/SpotAnimationDefinition.java | 253 +- runescape-client/src/main/java/Sprite.java | 1908 ++-- .../src/main/java/SpriteMask.java | 126 +- runescape-client/src/main/java/Strings.java | 80 +- .../src/main/java/StructDefinition.java | 253 +- .../src/main/java/StudioGame.java | 99 +- runescape-client/src/main/java/Task.java | 22 +- .../src/main/java/TaskHandler.java | 565 +- runescape-client/src/main/java/Texture.java | 243 +- .../src/main/java/TextureLoader.java | 22 +- .../src/main/java/TextureProvider.java | 521 +- runescape-client/src/main/java/Tile.java | 155 +- runescape-client/src/main/java/TileItem.java | 277 +- .../src/main/java/TileItemPile.java | 337 +- runescape-client/src/main/java/TileModel.java | 404 +- runescape-client/src/main/java/TilePaint.java | 111 +- runescape-client/src/main/java/Tiles.java | 981 +- runescape-client/src/main/java/Timer.java | 961 +- runescape-client/src/main/java/TriBool.java | 138 +- .../src/main/java/UrlRequest.java | 70 +- .../src/main/java/UrlRequester.java | 409 +- runescape-client/src/main/java/User.java | 133 +- .../src/main/java/UserComparator1.java | 155 +- .../src/main/java/UserComparator10.java | 69 +- .../src/main/java/UserComparator2.java | 149 +- .../src/main/java/UserComparator3.java | 170 +- .../src/main/java/UserComparator4.java | 143 +- .../src/main/java/UserComparator5.java | 99 +- .../src/main/java/UserComparator6.java | 73 +- .../src/main/java/UserComparator7.java | 224 +- .../src/main/java/UserComparator8.java | 162 +- .../src/main/java/UserComparator9.java | 105 +- runescape-client/src/main/java/UserList.java | 384 +- runescape-client/src/main/java/Username.java | 125 +- runescape-client/src/main/java/Usernamed.java | 6 +- .../src/main/java/VarbitDefinition.java | 142 +- runescape-client/src/main/java/VarcInt.java | 80 +- runescape-client/src/main/java/Varcs.java | 439 +- .../src/main/java/VarpDefinition.java | 177 +- runescape-client/src/main/java/Varps.java | 204 +- .../src/main/java/VertexNormal.java | 66 +- .../src/main/java/VerticalAlignment.java | 124 +- .../src/main/java/ViewportMouse.java | 153 +- .../src/main/java/VorbisCodebook.java | 226 +- .../src/main/java/VorbisFloor.java | 394 +- .../src/main/java/VorbisMapping.java | 38 +- .../src/main/java/VorbisResidue.java | 122 +- .../src/main/java/VorbisSample.java | 806 +- .../src/main/java/WallDecoration.java | 183 +- runescape-client/src/main/java/Widget.java | 1628 +-- runescape-client/src/main/java/World.java | 709 +- runescape-client/src/main/java/WorldMap.java | 1913 ++-- .../src/main/java/WorldMapArchiveLoader.java | 84 +- .../src/main/java/WorldMapArea.java | 568 +- .../src/main/java/WorldMapAreaData.java | 471 +- .../src/main/java/WorldMapCacheName.java | 122 +- .../src/main/java/WorldMapData_0.java | 176 +- .../src/main/java/WorldMapData_1.java | 445 +- .../src/main/java/WorldMapDecoration.java | 165 +- .../src/main/java/WorldMapDecorationType.java | 214 +- .../src/main/java/WorldMapElement.java | 383 +- .../src/main/java/WorldMapEvent.java | 620 +- .../src/main/java/WorldMapID.java | 447 +- .../src/main/java/WorldMapIcon_0.java | 515 +- .../src/main/java/WorldMapIcon_1.java | 339 +- .../src/main/java/WorldMapLabel.java | 780 +- .../src/main/java/WorldMapLabelSize.java | 395 +- .../src/main/java/WorldMapManager.java | 560 +- .../src/main/java/WorldMapRectangle.java | 155 +- .../src/main/java/WorldMapRegion.java | 1430 +-- .../src/main/java/WorldMapScaleHandler.java | 874 +- .../src/main/java/WorldMapSection.java | 34 +- .../src/main/java/WorldMapSection0.java | 1155 +-- .../src/main/java/WorldMapSection1.java | 790 +- .../src/main/java/WorldMapSection2.java | 313 +- .../src/main/java/WorldMapSection3.java | 430 +- .../src/main/java/WorldMapSectionType.java | 86 +- .../src/main/java/WorldMapSprite.java | 261 +- runescape-client/src/main/java/Wrapper.java | 12 +- runescape-client/src/main/java/class0.java | 18 +- runescape-client/src/main/java/class1.java | 703 +- runescape-client/src/main/java/class10.java | 38 +- runescape-client/src/main/java/class105.java | 49 +- runescape-client/src/main/java/class11.java | 2 +- runescape-client/src/main/java/class12.java | 8 +- runescape-client/src/main/java/class13.java | 147 +- runescape-client/src/main/java/class155.java | 6 +- runescape-client/src/main/java/class169.java | 139 +- runescape-client/src/main/java/class170.java | 2 +- runescape-client/src/main/java/class171.java | 303 +- runescape-client/src/main/java/class182.java | 52 +- runescape-client/src/main/java/class190.java | 2 +- runescape-client/src/main/java/class194.java | 130 +- runescape-client/src/main/java/class195.java | 209 +- runescape-client/src/main/java/class197.java | 177 +- runescape-client/src/main/java/class198.java | 21 +- runescape-client/src/main/java/class2.java | 447 +- runescape-client/src/main/java/class200.java | 48 +- runescape-client/src/main/java/class204.java | 138 +- runescape-client/src/main/java/class206.java | 75 +- runescape-client/src/main/java/class217.java | 73 +- runescape-client/src/main/java/class219.java | 70 +- runescape-client/src/main/java/class22.java | 171 +- runescape-client/src/main/java/class224.java | 95 +- runescape-client/src/main/java/class225.java | 230 +- runescape-client/src/main/java/class227.java | 177 +- runescape-client/src/main/java/class228.java | 55 +- runescape-client/src/main/java/class23.java | 886 +- runescape-client/src/main/java/class231.java | 154 +- runescape-client/src/main/java/class232.java | 32 +- runescape-client/src/main/java/class234.java | 29 +- runescape-client/src/main/java/class235.java | 73 +- runescape-client/src/main/java/class236.java | 102 - runescape-client/src/main/java/class237.java | 17 +- runescape-client/src/main/java/class247.java | 405 +- runescape-client/src/main/java/class25.java | 37 +- runescape-client/src/main/java/class257.java | 46 - runescape-client/src/main/java/class277.java | 28 +- runescape-client/src/main/java/class278.java | 30 +- runescape-client/src/main/java/class279.java | 37 +- runescape-client/src/main/java/class280.java | 411 +- runescape-client/src/main/java/class296.java | 40 +- runescape-client/src/main/java/class297.java | 44 +- runescape-client/src/main/java/class298.java | 101 +- runescape-client/src/main/java/class299.java | 124 +- runescape-client/src/main/java/class3.java | 1592 ++- runescape-client/src/main/java/class300.java | 13 + runescape-client/src/main/java/class303.java | 175 +- runescape-client/src/main/java/class306.java | 11 +- runescape-client/src/main/java/class307.java | 331 +- runescape-client/src/main/java/class310.java | 82 +- runescape-client/src/main/java/class322.java | 76 +- runescape-client/src/main/java/class329.java | 25 - runescape-client/src/main/java/class332.java | 109 - runescape-client/src/main/java/class335.java | 29 +- runescape-client/src/main/java/class336.java | 102 +- runescape-client/src/main/java/class346.java | 24 +- runescape-client/src/main/java/class348.java | 18 +- runescape-client/src/main/java/class349.java | 19 - runescape-client/src/main/java/class39.java | 361 +- runescape-client/src/main/java/class4.java | 658 +- runescape-client/src/main/java/class41.java | 637 +- runescape-client/src/main/java/class5.java | 33 +- runescape-client/src/main/java/class52.java | 43 +- runescape-client/src/main/java/class56.java | 12 +- runescape-client/src/main/java/class58.java | 277 +- runescape-client/src/main/java/class6.java | 88 +- runescape-client/src/main/java/class60.java | 381 +- runescape-client/src/main/java/class69.java | 66 +- runescape-client/src/main/java/class7.java | 169 +- runescape-client/src/main/java/class8.java | 215 +- runescape-client/src/main/java/class89.java | 359 +- runescape-client/src/main/java/class9.java | 792 +- runescape-client/src/main/java/class90.java | 381 +- runescape-client/src/main/java/class92.java | 281 +- 354 files changed, 61347 insertions(+), 61083 deletions(-) create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSFillMode.java create mode 100644 runescape-client/src/main/java/FillMode.java delete mode 100644 runescape-client/src/main/java/class236.java delete mode 100644 runescape-client/src/main/java/class257.java create mode 100644 runescape-client/src/main/java/class300.java delete mode 100644 runescape-client/src/main/java/class329.java delete mode 100644 runescape-client/src/main/java/class332.java delete mode 100644 runescape-client/src/main/java/class349.java diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index f5e22dae9d..a0000e8657 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,7 +27,7 @@ object ProjectVersions { const val launcherVersion = "2.2.0" const val rlVersion = "1.6.24" - const val openosrsVersion = "3.4.2" + const val openosrsVersion = "3.4.3" const val rsversion = 191 const val cacheversion = 165 diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 14779ea545..a720baffc9 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1935,5 +1935,18 @@ public abstract class RSClientMixin implements RSClient assert this.isClientThread() : "getNpcDefinition must be called on client thread"; return getRSNpcDefinition(id); } + + // this exists because the original got inlined + @Inject + public void playMusicTrack(int var0, RSAbstractArchive var1, int var2, int var3, int var4, boolean var5) + { + client.setMusicPlayerStatus(1); + client.setMusicTrackArchive(var1); + client.setMusicTrackGroupId(var2); + client.setMusicTrackFileId(var3); + client.setMusicTrackVolume(var4); + client.setMusicTrackBoolean(var5); + client.setPcmSampleLength(var0); + } } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 86ce152acb..5ce614dc45 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -1125,7 +1125,6 @@ public interface RSClient extends RSGameShell, Client @Import("viewportWalking") void setViewportWalking(boolean viewportWalking); - @Import("playMusicTrack") void playMusicTrack(int var0, RSAbstractArchive var1, int var2, int var3, int var4, boolean var5); @Import("midiPcmStream") @@ -1313,4 +1312,22 @@ public interface RSClient extends RSGameShell, Client @Import("meslayerContinueWidget") Widget getMessageContinueWidget(); + + @Import("musicPlayerStatus") + void setMusicPlayerStatus(int var0); + + @Import("musicTrackArchive") + void setMusicTrackArchive(RSAbstractArchive var0); + + @Import("musicTrackGroupId") + void setMusicTrackGroupId(int var0); + + @Import("musicTrackFileId") + void setMusicTrackFileId(int var0); + + @Import("musicTrackBoolean") + void setMusicTrackBoolean(boolean var0); + + @Import("pcmSampleLength") + void setPcmSampleLength(int var0); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFillMode.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFillMode.java new file mode 100644 index 0000000000..94d2621ada --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFillMode.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2020, ThatGamerBlue + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.rs.api; + +public interface RSFillMode +{ +} diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 4c51dfbfba..a54c3c81ad 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -7,152 +7,152 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ic") @Implements("AbstractArchive") public abstract class AbstractArchive { - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lmu;" + descriptor = "Lma;" ) @Export("gzipDecompressor") static GZipDecompressor gzipDecompressor; - @ObfuscatedName("v") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1465326177 + intValue = 1188846239 ) - static int field3177; - @ObfuscatedName("o") + static int field3176; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 307318581 + intValue = -1207757515 ) @Export("groupCount") int groupCount; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("groupIds") int[] groupIds; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("groupNameHashes") int[] groupNameHashes; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmh;" + descriptor = "Lmc;" ) @Export("groupNameHashTable") IntHashTable groupNameHashTable; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("groupCrcs") int[] groupCrcs; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("groupVersions") int[] groupVersions; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("fileCounts") int[] fileCounts; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("fileIds") int[][] fileIds; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("fileNameHashes") int[][] fileNameHashes; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lmh;" + descriptor = "[Lmc;" ) @Export("fileNameHashTables") IntHashTable[] fileNameHashTables; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("groups") Object[] groups; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("files") Object[][] files; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 981186733 + intValue = 1382012253 ) @Export("hash") public int hash; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("releaseGroups") boolean releaseGroups; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("shallowFiles") boolean shallowFiles; static { - gzipDecompressor = new GZipDecompressor(); - field3177 = 0; + gzipDecompressor = new GZipDecompressor(); // L: 23 + field3176 = 0; // L: 27 } AbstractArchive(boolean var1, boolean var2) { - this.releaseGroups = var1; - this.shallowFiles = var2; - } + this.releaseGroups = var1; // L: 32 + this.shallowFiles = var2; // L: 33 + } // L: 34 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "-101" + descriptor = "([BI)V", + garbageValue = "1234348933" ) @Export("decodeIndex") void decodeIndex(byte[] var1) { - this.hash = FloorOverlayDefinition.method4936(var1, var1.length); - Buffer var2 = new Buffer(Coord.decompressBytes(var1)); - int var3 = var2.readUnsignedByte(); - if (var3 >= 5 && var3 <= 7) { - if (var3 >= 6) { - var2.readInt(); + this.hash = GameShell.method1108(var1, var1.length); // L: 37 + Buffer var2 = new Buffer(DevicePcmPlayerProvider.decompressBytes(var1)); // L: 38 + int var3 = var2.readUnsignedByte(); // L: 39 + if (var3 >= 5 && var3 <= 7) { // L: 40 + if (var3 >= 6) { // L: 41 + var2.readInt(); // L: 42 } - int var4 = var2.readUnsignedByte(); - if (var3 >= 7) { - this.groupCount = var2.method5733(); + int var4 = var2.readUnsignedByte(); // L: 45 + if (var3 >= 7) { // L: 46 + this.groupCount = var2.method5666(); } else { - this.groupCount = var2.readUnsignedShort(); + this.groupCount = var2.readUnsignedShort(); // L: 47 } - int var5 = 0; - int var6 = -1; - this.groupIds = new int[this.groupCount]; + int var5 = 0; // L: 48 + int var6 = -1; // L: 49 + this.groupIds = new int[this.groupCount]; // L: 50 int var7; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.method5733(); - if (this.groupIds[var7] > var6) { + if (var3 >= 7) { // L: 51 + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 52 + this.groupIds[var7] = var5 += var2.method5666(); // L: 53 + if (this.groupIds[var7] > var6) { // L: 54 var6 = this.groupIds[var7]; } } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - this.groupIds[var7] = var5 += var2.readUnsignedShort(); - if (this.groupIds[var7] > var6) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 58 + this.groupIds[var7] = var5 += var2.readUnsignedShort(); // L: 59 + if (this.groupIds[var7] > var6) { // L: 60 var6 = this.groupIds[var7]; } } } - this.groupCrcs = new int[var6 + 1]; - this.groupVersions = new int[var6 + 1]; - this.fileCounts = new int[var6 + 1]; - this.fileIds = new int[var6 + 1][]; - this.groups = new Object[var6 + 1]; - this.files = new Object[var6 + 1][]; - if (var4 != 0) { - this.groupNameHashes = new int[var6 + 1]; + this.groupCrcs = new int[var6 + 1]; // L: 63 + this.groupVersions = new int[var6 + 1]; // L: 64 + this.fileCounts = new int[var6 + 1]; // L: 65 + this.fileIds = new int[var6 + 1][]; // L: 66 + this.groups = new Object[var6 + 1]; // L: 67 + this.files = new Object[var6 + 1][]; // L: 68 + if (var4 != 0) { // L: 69 + this.groupNameHashes = new int[var6 + 1]; // L: 70 - for (var7 = 0; var7 < this.groupCount; ++var7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 71 this.groupNameHashes[this.groupIds[var7]] = var2.readInt(); } - this.groupNameHashTable = new IntHashTable(this.groupNameHashes); + this.groupNameHashTable = new IntHashTable(this.groupNameHashes); // L: 72 } - for (var7 = 0; var7 < this.groupCount; ++var7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 74 this.groupCrcs[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 75 this.groupVersions[this.groupIds[var7]] = var2.readInt(); } - for (var7 = 0; var7 < this.groupCount; ++var7) { + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 76 this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort(); } @@ -161,644 +161,537 @@ public abstract class AbstractArchive { int var10; int var11; int var12; - if (var3 >= 7) { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; + if (var3 >= 7) { // L: 77 + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 78 + var8 = this.groupIds[var7]; // L: 79 + var9 = this.fileCounts[var8]; // L: 80 + var5 = 0; // L: 81 + var10 = -1; // L: 82 + this.fileIds[var8] = new int[var9]; // L: 83 - for (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.method5733(); - if (var12 > var10) { + for (var11 = 0; var11 < var9; ++var11) { // L: 84 + var12 = this.fileIds[var8][var11] = var5 += var2.method5666(); // L: 85 + if (var12 > var10) { // L: 86 var10 = var12; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; // L: 88 } } else { - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - var5 = 0; - var10 = -1; - this.fileIds[var8] = new int[var9]; + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 92 + var8 = this.groupIds[var7]; // L: 93 + var9 = this.fileCounts[var8]; // L: 94 + var5 = 0; // L: 95 + var10 = -1; // L: 96 + this.fileIds[var8] = new int[var9]; // L: 97 - for (var11 = 0; var11 < var9; ++var11) { - var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); - if (var12 > var10) { + for (var11 = 0; var11 < var9; ++var11) { // L: 98 + var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort(); // L: 99 + if (var12 > var10) { // L: 100 var10 = var12; } } - this.files[var8] = new Object[var10 + 1]; + this.files[var8] = new Object[var10 + 1]; // L: 102 } } - if (var4 != 0) { - this.fileNameHashes = new int[var6 + 1][]; - this.fileNameHashTables = new IntHashTable[var6 + 1]; + if (var4 != 0) { // L: 105 + this.fileNameHashes = new int[var6 + 1][]; // L: 106 + this.fileNameHashTables = new IntHashTable[var6 + 1]; // L: 107 - for (var7 = 0; var7 < this.groupCount; ++var7) { - var8 = this.groupIds[var7]; - var9 = this.fileCounts[var8]; - this.fileNameHashes[var8] = new int[this.files[var8].length]; + for (var7 = 0; var7 < this.groupCount; ++var7) { // L: 108 + var8 = this.groupIds[var7]; // L: 109 + var9 = this.fileCounts[var8]; // L: 110 + this.fileNameHashes[var8] = new int[this.files[var8].length]; // L: 111 - for (var10 = 0; var10 < var9; ++var10) { + for (var10 = 0; var10 < var9; ++var10) { // L: 112 this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt(); } - this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); + this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]); // L: 113 } } } else { throw new RuntimeException(""); } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "479482423" - ) - @Export("loadRegionFromGroup") - void loadRegionFromGroup(int var1) { - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)[B", - garbageValue = "1860640327" - ) - @Export("takeFile") - public byte[] takeFile(int var1, int var2) { - return this.takeFileEncrypted(var1, var2, (int[])null); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(II[II)[B", - garbageValue = "-1226634846" - ) - @Export("takeFileEncrypted") - public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { - if (this.files[var1][var2] == null) { - boolean var4 = this.buildFiles(var1, var3); - if (!var4) { - this.loadGroup(var1); - var4 = this.buildFiles(var1, var3); - if (!var4) { - return null; - } - } - } - - byte[] var5 = FloorUnderlayDefinition.method4613(this.files[var1][var2], false); - if (this.shallowFiles) { - this.files[var1][var2] = null; - } - - return var5; - } else { - return null; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "1957538709" - ) - @Export("tryLoadFile") - public boolean tryLoadFile(int var1, int var2) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { - if (this.files[var1][var2] != null) { - return true; - } else if (this.groups[var1] != null) { - return true; - } else { - this.loadGroup(var1); - return this.groups[var1] != null; - } - } else { - return false; - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2058273834" - ) - public boolean method4359(int var1) { - if (this.files.length == 1) { - return this.tryLoadFile(0, var1); - } else if (this.files[var1].length == 1) { - return this.tryLoadFile(var1, 0); - } else { - throw new RuntimeException(); - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1896348837" - ) - @Export("tryLoadGroup") - public boolean tryLoadGroup(int var1) { - if (this.groups[var1] != null) { - return true; - } else { - this.loadGroup(var1); - return this.groups[var1] != null; - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" - ) - @Export("isFullyLoaded") - public boolean isFullyLoaded() { - boolean var1 = true; - - for (int var2 = 0; var2 < this.groupIds.length; ++var2) { - int var3 = this.groupIds[var2]; - if (this.groups[var3] == null) { - this.loadGroup(var3); - if (this.groups[var3] == null) { - var1 = false; - } - } - } - - return var1; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1350822089" - ) - @Export("groupLoadPercent") - int groupLoadPercent(int var1) { - return this.groups[var1] != null ? 100 : 0; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "1718789334" - ) - @Export("takeFileFlat") - public byte[] takeFileFlat(int var1) { - if (this.files.length == 1) { - return this.takeFile(0, var1); - } else if (this.files[var1].length == 1) { - return this.takeFile(var1, 0); - } else { - throw new RuntimeException(); - } - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(III)[B", - garbageValue = "490044156" - ) - @Export("getFile") - public byte[] getFile(int var1, int var2) { - if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { - if (this.files[var1][var2] == null) { - boolean var3 = this.buildFiles(var1, (int[])null); - if (!var3) { - this.loadGroup(var1); - var3 = this.buildFiles(var1, (int[])null); - if (!var3) { - return null; - } - } - } - - byte[] var4 = FloorUnderlayDefinition.method4613(this.files[var1][var2], false); - return var4; - } else { - return null; - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "1362853135" - ) - @Export("getFileFlat") - public byte[] getFileFlat(int var1) { - if (this.files.length == 1) { - return this.getFile(0, var1); - } else if (this.files[var1].length == 1) { - return this.getFile(var1, 0); - } else { - throw new RuntimeException(); - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1560066319" - ) - @Export("loadGroup") - void loadGroup(int var1) { - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IB)[I", - garbageValue = "-56" - ) - @Export("getGroupFileIds") - public int[] getGroupFileIds(int var1) { - return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; - } + } // L: 116 @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-888140327" - ) - @Export("getGroupFileCount") - public int getGroupFileCount(int var1) { - return this.files[var1].length; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-763058439" - ) - @Export("getGroupCount") - public int getGroupCount() { - return this.files.length; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1760033757" - ) - @Export("clearGroups") - public void clearGroups() { - for (int var1 = 0; var1 < this.groups.length; ++var1) { - this.groups[var1] = null; - } - - } - - @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-546235261" + garbageValue = "176946518" ) - @Export("clearFilesGroup") - public void clearFilesGroup(int var1) { - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { - this.files[var1][var2] = null; - } + @Export("loadRegionFromGroup") + void loadRegionFromGroup(int var1) { + } // L: 118 - } - - @ObfuscatedName("l") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(III)[B", + garbageValue = "273690094" ) - @Export("clearFiles") - public void clearFiles() { - for (int var1 = 0; var1 < this.files.length; ++var1) { - if (this.files[var1] != null) { - for (int var2 = 0; var2 < this.files[var1].length; ++var2) { - this.files[var1][var2] = null; - } - } - } - + @Export("takeFile") + public byte[] takeFile(int var1, int var2) { + return this.takeFileEncrypted(var1, var2, (int[])null); // L: 121 } @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I[II)Z", - garbageValue = "-1692394825" + descriptor = "(II[II)[B", + garbageValue = "1965350454" ) - @Export("buildFiles") - boolean buildFiles(int var1, int[] var2) { - if (this.groups[var1] == null) { - return false; - } else { - int var3 = this.fileCounts[var1]; - int[] var4 = this.fileIds[var1]; - Object[] var5 = this.files[var1]; - boolean var6 = true; - - for (int var7 = 0; var7 < var3; ++var7) { - if (var5[var4[var7]] == null) { - var6 = false; - break; + @Export("takeFileEncrypted") + public byte[] takeFileEncrypted(int var1, int var2, int[] var3) { + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 125 + if (this.files[var1][var2] == null) { // L: 126 + boolean var4 = this.buildFiles(var1, var3); // L: 127 + if (!var4) { // L: 128 + this.loadGroup(var1); // L: 129 + var4 = this.buildFiles(var1, var3); // L: 130 + if (!var4) { // L: 131 + return null; + } } } - if (var6) { + byte[] var5 = Script.method2323(this.files[var1][var2], false); // L: 134 + if (this.shallowFiles) { + this.files[var1][var2] = null; // L: 135 + } + + return var5; // L: 136 + } else { + return null; + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IIB)Z", + garbageValue = "49" + ) + @Export("tryLoadFile") + public boolean tryLoadFile(int var1, int var2) { + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 140 + if (this.files[var1][var2] != null) { // L: 141 + return true; + } else if (this.groups[var1] != null) { // L: 142 return true; } else { - byte[] var21; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var21 = FloorUnderlayDefinition.method4613(this.groups[var1], false); - } else { - var21 = FloorUnderlayDefinition.method4613(this.groups[var1], true); - Buffer var8 = new Buffer(var21); - var8.xteaDecrypt(var2, 5, var8.array.length); - } - - byte[] var25 = Coord.decompressBytes(var21); - if (this.releaseGroups) { - this.groups[var1] = null; - } - - int var10; - if (var3 > 1) { - int var9 = var25.length; - --var9; - var10 = var25[var9] & 255; - var9 -= var10 * var3 * 4; - Buffer var11 = new Buffer(var25); - int[] var12 = new int[var3]; - var11.offset = var9; - - int var14; - int var15; - for (int var13 = 0; var13 < var10; ++var13) { - var14 = 0; - - for (var15 = 0; var15 < var3; ++var15) { - var14 += var11.readInt(); - var12[var15] += var14; - } - } - - byte[][] var22 = new byte[var3][]; - - for (var14 = 0; var14 < var3; ++var14) { - var22[var14] = new byte[var12[var14]]; - var12[var14] = 0; - } - - var11.offset = var9; - var14 = 0; - - int var17; - for (var15 = 0; var15 < var10; ++var15) { - int var16 = 0; - - for (var17 = 0; var17 < var3; ++var17) { - var16 += var11.readInt(); - System.arraycopy(var25, var14, var22[var17], var12[var17], var16); - var12[var17] += var16; - var14 += var16; - } - } - - for (var15 = 0; var15 < var3; ++var15) { - if (!this.shallowFiles) { - var17 = var4[var15]; - byte[] var19 = var22[var15]; - Object var18; - if (var19 == null) { - var18 = null; - } else if (var19.length > 136) { - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); - var20.set(var19); - var18 = var20; - } else { - var18 = var19; - } - - var5[var17] = var18; - } else { - var5[var4[var15]] = var22[var15]; - } - } - } else if (!this.shallowFiles) { - var10 = var4[0]; - Object var26; - if (var25 == null) { - var26 = null; - } else if (var25.length > 136) { - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); - var27.set(var25); - var26 = var27; - } else { - var26 = var25; - } - - var5[var10] = var26; - } else { - var5[var4[0]] = var25; - } - - return true; + this.loadGroup(var1); // L: 143 + return this.groups[var1] != null; // L: 144 } + } else { + return false; // L: 145 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "5" + ) + public boolean method4251(int var1) { + if (this.files.length == 1) { // L: 149 + return this.tryLoadFile(0, var1); + } else if (this.files[var1].length == 1) { + return this.tryLoadFile(var1, 0); // L: 150 + } else { + throw new RuntimeException(); // L: 151 } } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-1113782685" + descriptor = "(II)Z", + garbageValue = "2078810359" ) - @Export("getGroupId") - public int getGroupId(String var1) { - var1 = var1.toLowerCase(); - return this.groupNameHashTable.get(class219.hashString(var1)); - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)I", - garbageValue = "1362853135" - ) - @Export("getFileId") - public int getFileId(int var1, String var2) { - var2 = var2.toLowerCase(); - return this.fileNameHashTables[var1].get(class219.hashString(var2)); - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-1310066556" - ) - @Export("isValidFileName") - public boolean isValidFileName(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(class219.hashString(var1)); - if (var3 < 0) { - return false; + @Export("tryLoadGroup") + public boolean tryLoadGroup(int var1) { + if (this.groups[var1] != null) { // L: 155 + return true; } else { - int var4 = this.fileNameHashTables[var3].get(class219.hashString(var2)); - return var4 >= 0; + this.loadGroup(var1); // L: 156 + return this.groups[var1] != null; // L: 157 } } - @ObfuscatedName("ao") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", - garbageValue = "-222408314" + descriptor = "(I)Z", + garbageValue = "-719435847" ) - @Export("takeFileByNames") - public byte[] takeFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(class219.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(class219.hashString(var2)); - return this.takeFile(var3, var4); + @Export("isFullyLoaded") + public boolean isFullyLoaded() { + boolean var1 = true; // L: 162 + + for (int var2 = 0; var2 < this.groupIds.length; ++var2) { // L: 163 + int var3 = this.groupIds[var2]; // L: 164 + if (this.groups[var3] == null) { // L: 165 + this.loadGroup(var3); // L: 166 + if (this.groups[var3] == null) { // L: 167 + var1 = false; + } + } + } + + return var1; // L: 170 } - @ObfuscatedName("ae") + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-21407020" + ) + @Export("groupLoadPercent") + int groupLoadPercent(int var1) { + return this.groups[var1] != null ? 100 : 0; // L: 174 175 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(II)[B", + garbageValue = "-1800797786" + ) + @Export("takeFileFlat") + public byte[] takeFileFlat(int var1) { + if (this.files.length == 1) { // L: 179 + return this.takeFile(0, var1); + } else if (this.files[var1].length == 1) { + return this.takeFile(var1, 0); // L: 180 + } else { + throw new RuntimeException(); // L: 181 + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(III)[B", + garbageValue = "-1118526903" + ) + @Export("getFile") + public byte[] getFile(int var1, int var2) { + if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { // L: 185 + if (this.files[var1][var2] == null) { // L: 186 + boolean var3 = this.buildFiles(var1, (int[])null); // L: 187 + if (!var3) { // L: 188 + this.loadGroup(var1); // L: 189 + var3 = this.buildFiles(var1, (int[])null); // L: 190 + if (!var3) { // L: 191 + return null; + } + } + } + + byte[] var4 = Script.method2323(this.files[var1][var2], false); // L: 194 + return var4; // L: 195 + } else { + return null; + } + } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IB)[B", + garbageValue = "89" + ) + @Export("getFileFlat") + public byte[] getFileFlat(int var1) { + if (this.files.length == 1) { // L: 199 + return this.getFile(0, var1); + } else if (this.files[var1].length == 1) { + return this.getFile(var1, 0); // L: 200 + } else { + throw new RuntimeException(); // L: 201 + } + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "450530880" + ) + @Export("loadGroup") + void loadGroup(int var1) { + } // L: 204 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IB)[I", + garbageValue = "-40" + ) + @Export("getGroupFileIds") + public int[] getGroupFileIds(int var1) { + return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null; // L: 207 208 210 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-1433553741" + ) + @Export("getGroupFileCount") + public int getGroupFileCount(int var1) { + return this.files[var1].length; // L: 214 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2124979087" + ) + @Export("getGroupCount") + public int getGroupCount() { + return this.files.length; // L: 218 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1681224039" + ) + @Export("clearGroups") + public void clearGroups() { + for (int var1 = 0; var1 < this.groups.length; ++var1) { // L: 222 + this.groups[var1] = null; + } + + } // L: 223 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1439856856" + ) + @Export("clearFilesGroup") + public void clearFilesGroup(int var1) { + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 226 + this.files[var1][var2] = null; + } + + } // L: 227 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-83" + ) + @Export("clearFiles") + public void clearFiles() { + for (int var1 = 0; var1 < this.files.length; ++var1) { // L: 230 + if (this.files[var1] != null) { // L: 231 + for (int var2 = 0; var2 < this.files[var1].length; ++var2) { // L: 232 + this.files[var1][var2] = null; + } + } + } + + } // L: 235 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I[II)Z", + garbageValue = "303004992" + ) + @Export("buildFiles") + boolean buildFiles(int var1, int[] var2) { + if (this.groups[var1] == null) { // L: 238 + return false; + } else { + int var3 = this.fileCounts[var1]; // L: 239 + int[] var4 = this.fileIds[var1]; // L: 240 + Object[] var5 = this.files[var1]; // L: 241 + boolean var6 = true; // L: 242 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 243 + if (var5[var4[var7]] == null) { // L: 244 + var6 = false; // L: 245 + break; + } + } + + if (var6) { // L: 249 + return true; + } else { + byte[] var18; + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { // L: 251 + var18 = Script.method2323(this.groups[var1], false); // L: 256 + } else { + var18 = Script.method2323(this.groups[var1], true); // L: 252 + Buffer var8 = new Buffer(var18); // L: 253 + var8.xteaDecrypt(var2, 5, var8.array.length); // L: 254 + } + + byte[] var20 = DevicePcmPlayerProvider.decompressBytes(var18); // L: 259 + if (this.releaseGroups) { // L: 264 + this.groups[var1] = null; + } + + if (var3 > 1) { // L: 265 + int var9 = var20.length; // L: 266 + --var9; + int var10 = var20[var9] & 255; // L: 267 + var9 -= var10 * var3 * 4; // L: 268 + Buffer var11 = new Buffer(var20); // L: 269 + int[] var12 = new int[var3]; // L: 270 + var11.offset = var9; // L: 271 + + int var14; + int var15; + for (int var13 = 0; var13 < var10; ++var13) { // L: 272 + var14 = 0; // L: 273 + + for (var15 = 0; var15 < var3; ++var15) { // L: 274 + var14 += var11.readInt(); // L: 275 + var12[var15] += var14; // L: 276 + } + } + + byte[][] var19 = new byte[var3][]; // L: 279 + + for (var14 = 0; var14 < var3; ++var14) { // L: 280 + var19[var14] = new byte[var12[var14]]; // L: 281 + var12[var14] = 0; // L: 282 + } + + var11.offset = var9; // L: 284 + var14 = 0; // L: 285 + + for (var15 = 0; var15 < var10; ++var15) { // L: 286 + int var16 = 0; // L: 287 + + for (int var17 = 0; var17 < var3; ++var17) { // L: 288 + var16 += var11.readInt(); // L: 289 + System.arraycopy(var20, var14, var19[var17], var12[var17], var16); // L: 290 + var12[var17] += var16; // L: 291 + var14 += var16; // L: 292 + } + } + + for (var15 = 0; var15 < var3; ++var15) { // L: 295 + if (!this.shallowFiles) { // L: 296 + var5[var4[var15]] = MenuAction.method2140(var19[var15], false); + } else { + var5[var4[var15]] = var19[var15]; // L: 297 + } + } + } else if (!this.shallowFiles) { // L: 301 + var5[var4[0]] = MenuAction.method2140(var20, false); + } else { + var5[var4[0]] = var20; // L: 302 + } + + return true; // L: 304 + } + } + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "-1161611566" + ) + @Export("getGroupId") + public int getGroupId(String var1) { + var1 = var1.toLowerCase(); // L: 308 + return this.groupNameHashTable.get(Timer.hashString(var1)); // L: 309 + } + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;B)I", + garbageValue = "-117" + ) + @Export("getFileId") + public int getFileId(int var1, String var2) { + var2 = var2.toLowerCase(); // L: 313 + return this.fileNameHashTables[var1].get(Timer.hashString(var2)); // L: 314 + } + + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;Ljava/lang/String;I)Z", - garbageValue = "-778364429" + garbageValue = "-1221134152" ) - @Export("tryLoadFileByNames") - public boolean tryLoadFileByNames(String var1, String var2) { - var1 = var1.toLowerCase(); - var2 = var2.toLowerCase(); - int var3 = this.groupNameHashTable.get(class219.hashString(var1)); - int var4 = this.fileNameHashTables[var3].get(class219.hashString(var2)); - return this.tryLoadFile(var3, var4); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Z", - garbageValue = "-81" - ) - @Export("tryLoadGroupByName") - public boolean tryLoadGroupByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(class219.hashString(var1)); - return this.tryLoadGroup(var2); - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1143877885" - ) - @Export("loadRegionFromName") - public void loadRegionFromName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(class219.hashString(var1)); - if (var2 >= 0) { - this.loadRegionFromGroup(var2); + @Export("isValidFileName") + public boolean isValidFileName(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 318 + var2 = var2.toLowerCase(); // L: 319 + int var3 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 320 + if (var3 < 0) { // L: 321 + return false; + } else { + int var4 = this.fileNameHashTables[var3].get(Timer.hashString(var2)); // L: 322 + return var4 >= 0; // L: 323 } } @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;I)[B", + garbageValue = "-406743682" + ) + @Export("takeFileByNames") + public byte[] takeFileByNames(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 328 + var2 = var2.toLowerCase(); // L: 329 + int var3 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 330 + int var4 = this.fileNameHashTables[var3].get(Timer.hashString(var2)); // L: 331 + return this.takeFile(var3, var4); // L: 332 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;B)Z", + garbageValue = "63" + ) + @Export("tryLoadFileByNames") + public boolean tryLoadFileByNames(String var1, String var2) { + var1 = var1.toLowerCase(); // L: 336 + var2 = var2.toLowerCase(); // L: 337 + int var3 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 338 + int var4 = this.fileNameHashTables[var3].get(Timer.hashString(var2)); // L: 339 + return this.tryLoadFile(var3, var4); // L: 340 + } + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Z", + garbageValue = "1277602080" + ) + @Export("tryLoadGroupByName") + public boolean tryLoadGroupByName(String var1) { + var1 = var1.toLowerCase(); // L: 344 + int var2 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 345 + return this.tryLoadGroup(var2); // L: 346 + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "663022777" + ) + @Export("loadRegionFromName") + public void loadRegionFromName(String var1) { + var1 = var1.toLowerCase(); // L: 350 + int var2 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 351 + if (var2 >= 0) { // L: 352 + this.loadRegionFromGroup(var2); // L: 353 + } + } // L: 354 + + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-252379742" + garbageValue = "-1179908278" ) @Export("groupLoadPercentByName") public int groupLoadPercentByName(String var1) { - var1 = var1.toLowerCase(); - int var2 = this.groupNameHashTable.get(class219.hashString(var1)); - return this.groupLoadPercent(var2); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lkn;IIIIIII)V", - garbageValue = "-1571118584" - ) - @Export("loadTerrain") - static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - Tiles.Tiles_renderFlags[var1][var2][var3] = 0; - - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -PacketBufferNode.method3750(var4 + var2 + 932731, var3 + 556238 + var5) * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; - } - break; - } - - if (var7 == 1) { - int var8 = var0.readUnsignedByte(); - if (var8 == 1) { - var8 = 0; - } - - if (var1 == 0) { - Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; - } else { - Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; - } - break; - } - - if (var7 <= 49) { - Tiles.field524[var1][var2][var3] = var0.readByte(); - Tiles.field525[var1][var2][var3] = (byte)((var7 - 2) / 4); - WorldMapLabel.field269[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); - } else if (var7 <= 81) { - Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); - } else { - Tiles.field530[var1][var2][var3] = (byte)(var7 - 81); - } - } - } else { - while (true) { - var7 = var0.readUnsignedByte(); - if (var7 == 0) { - break; - } - - if (var7 == 1) { - var0.readUnsignedByte(); - break; - } - - if (var7 <= 49) { - var0.readUnsignedByte(); - } - } - } - - } - - @ObfuscatedName("gr") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "682759182" - ) - static final int method4411() { - if (NetSocket.clientPreferences.roofsHidden) { - return TileItemPile.Client_plane; - } else { - int var0 = Language.getTileHeight(MouseHandler.cameraX, ObjectSound.cameraZ, TileItemPile.Client_plane); - return var0 - WorldMapSection3.cameraY < 800 && (Tiles.Tiles_renderFlags[TileItemPile.Client_plane][MouseHandler.cameraX >> 7][ObjectSound.cameraZ >> 7] & 4) != 0 ? TileItemPile.Client_plane : 3; - } + var1 = var1.toLowerCase(); // L: 357 + int var2 = this.groupNameHashTable.get(Timer.hashString(var1)); // L: 358 + return this.groupLoadPercent(var2); // L: 359 } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index bcc0b5596c..439550ca90 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -3,25 +3,72 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hq") +@ObfuscatedName("hh") @Implements("AbstractByteArrayCopier") public abstract class AbstractByteArrayCopier { - AbstractByteArrayCopier() { - } + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "[Lct;" + ) + @Export("World_worlds") + static World[] World_worlds; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + @Export("logoSprite") + static IndexedSprite logoSprite; - @ObfuscatedName("j") + AbstractByteArrayCopier() { + } // L: 4 + + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "300747627" + garbageValue = "-1021172953" ) @Export("get") abstract byte[] get(); - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "92" + descriptor = "([BI)V", + garbageValue = "-1366071744" ) @Export("set") - public abstract void set(byte[] var1); + abstract void set(byte[] var1); + + @ObfuscatedName("ig") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Lhq;I)Ljava/lang/String;", + garbageValue = "506679014" + ) + static String method4028(String var0, Widget var1) { + if (var0.indexOf("%") != -1) { // L: 9162 + for (int var2 = 1; var2 <= 5; ++var2) { // L: 9163 + while (true) { + int var3 = var0.indexOf("%" + var2); // L: 9165 + if (var3 == -1) { // L: 9166 + break; + } + + var0 = var0.substring(0, var3) + ArchiveDiskActionHandler.method4338(GrandExchangeOfferNameComparator.method230(var1, var2 - 1)) + var0.substring(var3 + 2); // L: 9167 + } + } + } + + return var0; // L: 9171 + } + + @ObfuscatedName("kk") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1068531314" + ) + @Export("Clan_leaveChat") + static final void Clan_leaveChat() { + PacketBufferNode var0 = Client.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); // L: 10705 + var0.packetBuffer.writeByte(0); // L: 10706 + Client.packetWriter.addNode(var0); // L: 10707 + } // L: 10708 } diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 22d3ee7d1c..e258db3ef3 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -4,244 +4,244 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ka") +@ObfuscatedName("kj") @Implements("AbstractFont") public abstract class AbstractFont extends Rasterizer2D { - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "[Llh;" + descriptor = "[Lls;" ) @Export("AbstractFont_modIconSprites") public static IndexedSprite[] AbstractFont_modIconSprites; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("AbstractFont_strike") static int AbstractFont_strike; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("AbstractFont_underline") static int AbstractFont_underline; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("AbstractFont_previousShadow") static int AbstractFont_previousShadow; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("AbstractFont_shadow") static int AbstractFont_shadow; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("AbstractFont_previousColor") static int AbstractFont_previousColor; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("AbstractFont_color") static int AbstractFont_color; - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("AbstractFont_alpha") static int AbstractFont_alpha; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("AbstractFont_justificationTotal") static int AbstractFont_justificationTotal; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("AbstractFont_justificationCurrent") static int AbstractFont_justificationCurrent; - @ObfuscatedName("l") + @ObfuscatedName("r") @Export("AbstractFont_random") static Random AbstractFont_random; - @ObfuscatedName("t") + @ObfuscatedName("u") @Export("AbstractFont_lines") static String[] AbstractFont_lines; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("pixels") byte[][] pixels; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("advances") int[] advances; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("widths") int[] widths; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("heights") int[] heights; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("leftBearings") int[] leftBearings; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("topBearings") int[] topBearings; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("ascent") public int ascent; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("maxAscent") public int maxAscent; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("maxDescent") public int maxDescent; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("kerning") byte[] kerning; static { - AbstractFont_strike = -1; - AbstractFont_underline = -1; - AbstractFont_previousShadow = -1; - AbstractFont_shadow = -1; - AbstractFont_previousColor = 0; - AbstractFont_color = 0; - AbstractFont_alpha = 256; - AbstractFont_justificationTotal = 0; - AbstractFont_justificationCurrent = 0; - AbstractFont_random = new Random(); - AbstractFont_lines = new String[100]; + AbstractFont_strike = -1; // L: 23 + AbstractFont_underline = -1; // L: 24 + AbstractFont_previousShadow = -1; // L: 25 + AbstractFont_shadow = -1; // L: 26 + AbstractFont_previousColor = 0; // L: 27 + AbstractFont_color = 0; // L: 28 + AbstractFont_alpha = 256; // L: 29 + AbstractFont_justificationTotal = 0; // L: 30 + AbstractFont_justificationCurrent = 0; // L: 31 + AbstractFont_random = new Random(); // L: 32 + AbstractFont_lines = new String[100]; // L: 33 } AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { this.pixels = new byte[256][]; this.ascent = 0; - this.leftBearings = var2; - this.topBearings = var3; - this.widths = var4; - this.heights = var5; - this.readMetrics(var1); - this.pixels = var7; - int var8 = Integer.MAX_VALUE; - int var9 = Integer.MIN_VALUE; + this.leftBearings = var2; // L: 36 + this.topBearings = var3; // L: 37 + this.widths = var4; // L: 38 + this.heights = var5; // L: 39 + this.readMetrics(var1); // L: 40 + this.pixels = var7; // L: 41 + int var8 = Integer.MAX_VALUE; // L: 42 + int var9 = Integer.MIN_VALUE; // L: 43 - for (int var10 = 0; var10 < 256; ++var10) { - if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { + for (int var10 = 0; var10 < 256; ++var10) { // L: 44 + if (this.topBearings[var10] < var8 && this.heights[var10] != 0) { // L: 45 var8 = this.topBearings[var10]; } - if (this.topBearings[var10] + this.heights[var10] > var9) { + if (this.topBearings[var10] + this.heights[var10] > var9) { // L: 46 var9 = this.topBearings[var10] + this.heights[var10]; } } - this.maxAscent = this.ascent - var8; - this.maxDescent = var9 - this.ascent; - } + this.maxAscent = this.ascent - var8; // L: 48 + this.maxDescent = var9 - this.ascent; // L: 49 + } // L: 50 AbstractFont(byte[] var1) { - this.pixels = new byte[256][]; - this.ascent = 0; - this.readMetrics(var1); - } + this.pixels = new byte[256][]; // L: 12 + this.ascent = 0; // L: 18 + this.readMetrics(var1); // L: 53 + } // L: 54 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("drawGlyph") abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6); - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("drawGlyphAlpha") abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7); - @ObfuscatedName("y") + @ObfuscatedName("g") @Export("readMetrics") void readMetrics(byte[] var1) { - this.advances = new int[256]; + this.advances = new int[256]; // L: 57 int var2; - if (var1.length == 257) { - for (var2 = 0; var2 < this.advances.length; ++var2) { + if (var1.length == 257) { // L: 58 + for (var2 = 0; var2 < this.advances.length; ++var2) { // L: 59 this.advances[var2] = var1[var2] & 255; } - this.ascent = var1[256] & 255; + this.ascent = var1[256] & 255; // L: 60 } else { - var2 = 0; + var2 = 0; // L: 63 - for (int var3 = 0; var3 < 256; ++var3) { + for (int var3 = 0; var3 < 256; ++var3) { // L: 64 this.advances[var3] = var1[var2++] & 255; } - int[] var10 = new int[256]; - int[] var4 = new int[256]; + int[] var10 = new int[256]; // L: 65 + int[] var4 = new int[256]; // L: 66 int var5; - for (var5 = 0; var5 < 256; ++var5) { + for (var5 = 0; var5 < 256; ++var5) { // L: 67 var10[var5] = var1[var2++] & 255; } - for (var5 = 0; var5 < 256; ++var5) { + for (var5 = 0; var5 < 256; ++var5) { // L: 68 var4[var5] = var1[var2++] & 255; } - byte[][] var11 = new byte[256][]; + byte[][] var11 = new byte[256][]; // L: 69 int var8; - for (int var6 = 0; var6 < 256; ++var6) { - var11[var6] = new byte[var10[var6]]; - byte var7 = 0; + for (int var6 = 0; var6 < 256; ++var6) { // L: 70 + var11[var6] = new byte[var10[var6]]; // L: 71 + byte var7 = 0; // L: 72 - for (var8 = 0; var8 < var11[var6].length; ++var8) { - var7 += var1[var2++]; - var11[var6][var8] = var7; + for (var8 = 0; var8 < var11[var6].length; ++var8) { // L: 73 + var7 += var1[var2++]; // L: 74 + var11[var6][var8] = var7; // L: 75 } } - byte[][] var12 = new byte[256][]; + byte[][] var12 = new byte[256][]; // L: 78 int var13; - for (var13 = 0; var13 < 256; ++var13) { - var12[var13] = new byte[var10[var13]]; - byte var14 = 0; + for (var13 = 0; var13 < 256; ++var13) { // L: 79 + var12[var13] = new byte[var10[var13]]; // L: 80 + byte var14 = 0; // L: 81 - for (int var9 = 0; var9 < var12[var13].length; ++var9) { - var14 += var1[var2++]; - var12[var13][var9] = var14; + for (int var9 = 0; var9 < var12[var13].length; ++var9) { // L: 82 + var14 += var1[var2++]; // L: 83 + var12[var13][var9] = var14; // L: 84 } } - this.kerning = new byte[65536]; + this.kerning = new byte[65536]; // L: 87 - for (var13 = 0; var13 < 256; ++var13) { - if (var13 != 32 && var13 != 160) { - for (var8 = 0; var8 < 256; ++var8) { - if (var8 != 32 && var8 != 160) { - this.kerning[var8 + (var13 << 8)] = (byte)method5603(var11, var12, var4, this.advances, var10, var13, var8); + for (var13 = 0; var13 < 256; ++var13) { // L: 88 + if (var13 != 32 && var13 != 160) { // L: 89 + for (var8 = 0; var8 < 256; ++var8) { // L: 90 + if (var8 != 32 && var8 != 160) { // L: 91 + this.kerning[var8 + (var13 << 8)] = (byte)method5464(var11, var12, var4, this.advances, var10, var13, var8); // L: 92 } } } } - this.ascent = var4[32] + var10[32]; + this.ascent = var4[32] + var10[32]; // L: 95 } - } + } // L: 97 - @ObfuscatedName("h") + @ObfuscatedName("n") @Export("charWidth") int charWidth(char var1) { - if (var1 == 160) { + if (var1 == 160) { // L: 122 var1 = ' '; } - return this.advances[UserComparator3.charToByteCp1252(var1) & 255]; + return this.advances[class227.charToByteCp1252(var1) & 255]; // L: 123 } - @ObfuscatedName("k") + @ObfuscatedName("d") @Export("stringWidth") public int stringWidth(String var1) { - if (var1 == null) { + if (var1 == null) { // L: 127 return 0; } else { - int var2 = -1; - int var3 = -1; - int var4 = 0; + int var2 = -1; // L: 128 + int var3 = -1; // L: 129 + int var4 = 0; // L: 130 - for (int var5 = 0; var5 < var1.length(); ++var5) { - char var6 = var1.charAt(var5); - if (var6 == '<') { - var2 = var5; + for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 131 + char var6 = var1.charAt(var5); // L: 132 + if (var6 == '<') { // L: 133 + var2 = var5; // L: 134 } else { - if (var6 == '>' && var2 != -1) { - String var7 = var1.substring(var2 + 1, var5); - var2 = -1; - if (var7.equals("lt")) { + if (var6 == '>' && var2 != -1) { // L: 137 + String var7 = var1.substring(var2 + 1, var5); // L: 138 + var2 = -1; // L: 139 + if (var7.equals("lt")) { // L: 140 var6 = '<'; } else { - if (!var7.equals("gt")) { - if (var7.startsWith("img=")) { + if (!var7.equals("gt")) { // L: 141 + if (var7.startsWith("img=")) { // L: 142 try { - int var8 = Tiles.parseInt(var7.substring(4)); - var4 += AbstractFont_modIconSprites[var8].width; - var3 = -1; - } catch (Exception var10) { + int var8 = GrandExchangeOfferTotalQuantityComparator.parseInt(var7.substring(4)); // L: 144 + var4 += AbstractFont_modIconSprites[var8].width; // L: 145 + var3 = -1; // L: 146 + } catch (Exception var10) { // L: 148 } } continue; @@ -251,426 +251,426 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var6 == 160) { + if (var6 == 160) { // L: 153 var6 = ' '; } - if (var2 == -1) { - var4 += this.advances[(char)(UserComparator3.charToByteCp1252(var6) & 255)]; - if (this.kerning != null && var3 != -1) { + if (var2 == -1) { // L: 154 + var4 += this.advances[(char)(class227.charToByteCp1252(var6) & 255)]; // L: 155 + if (this.kerning != null && var3 != -1) { // L: 156 var4 += this.kerning[var6 + (var3 << 8)]; } - var3 = var6; + var3 = var6; // L: 157 } } } - return var4; + return var4; // L: 160 } } - @ObfuscatedName("r") + @ObfuscatedName("h") @Export("breakLines") public int breakLines(String var1, int[] var2, String[] var3) { - if (var1 == null) { + if (var1 == null) { // L: 164 return 0; } else { - int var4 = 0; - int var5 = 0; - StringBuilder var6 = new StringBuilder(100); - int var7 = -1; - int var8 = 0; - byte var9 = 0; - int var10 = -1; - char var11 = 0; - int var12 = 0; - int var13 = var1.length(); + int var4 = 0; // L: 165 + int var5 = 0; // L: 166 + StringBuilder var6 = new StringBuilder(100); // L: 167 + int var7 = -1; // L: 168 + int var8 = 0; // L: 169 + byte var9 = 0; // L: 170 + int var10 = -1; // L: 171 + char var11 = 0; // L: 172 + int var12 = 0; // L: 173 + int var13 = var1.length(); // L: 174 - for (int var14 = 0; var14 < var13; ++var14) { - char var15 = var1.charAt(var14); - if (var15 == '<') { - var10 = var14; + for (int var14 = 0; var14 < var13; ++var14) { // L: 175 + char var15 = var1.charAt(var14); // L: 176 + if (var15 == '<') { // L: 177 + var10 = var14; // L: 178 } else { - if (var15 == '>' && var10 != -1) { - String var16 = var1.substring(var10 + 1, var14); - var10 = -1; - var6.append('<'); - var6.append(var16); - var6.append('>'); - if (var16.equals("br")) { - var3[var12] = var6.toString().substring(var5, var6.length()); - ++var12; - var5 = var6.length(); - var4 = 0; - var7 = -1; - var11 = 0; - } else if (var16.equals("lt")) { - var4 += this.charWidth('<'); - if (this.kerning != null && var11 != -1) { + if (var15 == '>' && var10 != -1) { // L: 181 + String var16 = var1.substring(var10 + 1, var14); // L: 182 + var10 = -1; // L: 183 + var6.append('<'); // L: 184 + var6.append(var16); // L: 185 + var6.append('>'); // L: 186 + if (var16.equals("br")) { // L: 187 + var3[var12] = var6.toString().substring(var5, var6.length()); // L: 188 + ++var12; // L: 189 + var5 = var6.length(); // L: 190 + var4 = 0; // L: 191 + var7 = -1; // L: 192 + var11 = 0; // L: 193 + } else if (var16.equals("lt")) { // L: 195 + var4 += this.charWidth('<'); // L: 196 + if (this.kerning != null && var11 != -1) { // L: 197 var4 += this.kerning[(var11 << '\b') + 60]; } - var11 = '<'; - } else if (var16.equals("gt")) { - var4 += this.charWidth('>'); - if (this.kerning != null && var11 != -1) { + var11 = '<'; // L: 198 + } else if (var16.equals("gt")) { // L: 200 + var4 += this.charWidth('>'); // L: 201 + if (this.kerning != null && var11 != -1) { // L: 202 var4 += this.kerning[(var11 << '\b') + 62]; } - var11 = '>'; - } else if (var16.startsWith("img=")) { + var11 = '>'; // L: 203 + } else if (var16.startsWith("img=")) { // L: 205 try { - int var17 = Tiles.parseInt(var16.substring(4)); - var4 += AbstractFont_modIconSprites[var17].width; - var11 = 0; - } catch (Exception var20) { + int var17 = GrandExchangeOfferTotalQuantityComparator.parseInt(var16.substring(4)); // L: 207 + var4 += AbstractFont_modIconSprites[var17].width; // L: 208 + var11 = 0; // L: 209 + } catch (Exception var20) { // L: 211 } } - var15 = 0; + var15 = 0; // L: 213 } - if (var10 == -1) { - if (var15 != 0) { - var6.append(var15); - var4 += this.charWidth(var15); - if (this.kerning != null && var11 != -1) { + if (var10 == -1) { // L: 215 + if (var15 != 0) { // L: 216 + var6.append(var15); // L: 217 + var4 += this.charWidth(var15); // L: 218 + if (this.kerning != null && var11 != -1) { // L: 219 var4 += this.kerning[var15 + (var11 << '\b')]; } - var11 = var15; + var11 = var15; // L: 220 } - if (var15 == ' ') { - var7 = var6.length(); - var8 = var4; - var9 = 1; + if (var15 == ' ') { // L: 222 + var7 = var6.length(); // L: 223 + var8 = var4; // L: 224 + var9 = 1; // L: 225 } - if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { - var3[var12] = var6.toString().substring(var5, var7 - var9); - ++var12; - var5 = var7; - var7 = -1; - var4 -= var8; - var11 = 0; + if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { // L: 227 + var3[var12] = var6.toString().substring(var5, var7 - var9); // L: 228 + ++var12; // L: 229 + var5 = var7; // L: 230 + var7 = -1; // L: 231 + var4 -= var8; // L: 232 + var11 = 0; // L: 233 } - if (var15 == '-') { - var7 = var6.length(); - var8 = var4; - var9 = 0; + if (var15 == '-') { // L: 235 + var7 = var6.length(); // L: 236 + var8 = var4; // L: 237 + var9 = 0; // L: 238 } } } } - String var19 = var6.toString(); - if (var19.length() > var5) { + String var19 = var6.toString(); // L: 242 + if (var19.length() > var5) { // L: 243 var3[var12++] = var19.substring(var5, var19.length()); } - return var12; + return var12; // L: 244 } } - @ObfuscatedName("d") + @ObfuscatedName("a") @Export("lineWidth") public int lineWidth(String var1, int var2) { - int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); - int var4 = 0; + int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 248 + int var4 = 0; // L: 249 - for (int var5 = 0; var5 < var3; ++var5) { - int var6 = this.stringWidth(AbstractFont_lines[var5]); - if (var6 > var4) { + for (int var5 = 0; var5 < var3; ++var5) { // L: 250 + int var6 = this.stringWidth(AbstractFont_lines[var5]); // L: 251 + if (var6 > var4) { // L: 252 var4 = var6; } } - return var4; + return var4; // L: 254 } - @ObfuscatedName("e") + @ObfuscatedName("q") @Export("lineCount") public int lineCount(String var1, int var2) { - return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); + return this.breakLines(var1, new int[]{var2}, AbstractFont_lines); // L: 258 } - @ObfuscatedName("t") + @ObfuscatedName("j") @Export("draw") public void draw(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2, var3); + if (var1 != null) { // L: 279 + this.reset(var4, var5); // L: 280 + this.draw0(var1, var2, var3); // L: 281 } - } + } // L: 282 - @ObfuscatedName("x") + @ObfuscatedName("r") @Export("drawAlpha") public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { - this.reset(var4, var5); - AbstractFont_alpha = var6; - this.draw0(var1, var2, var3); + if (var1 != null) { // L: 285 + this.reset(var4, var5); // L: 286 + AbstractFont_alpha = var6; // L: 287 + this.draw0(var1, var2, var3); // L: 288 } - } + } // L: 289 - @ObfuscatedName("ah") + @ObfuscatedName("u") @Export("drawRightAligned") public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2 - this.stringWidth(var1), var3); + if (var1 != null) { // L: 292 + this.reset(var4, var5); // L: 293 + this.draw0(var1, var2 - this.stringWidth(var1), var3); // L: 294 } - } + } // L: 295 - @ObfuscatedName("ai") + @ObfuscatedName("p") @Export("drawCentered") public void drawCentered(String var1, int var2, int var3, int var4, int var5) { - if (var1 != null) { - this.reset(var4, var5); - this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); + if (var1 != null) { // L: 298 + this.reset(var4, var5); // L: 299 + this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3); // L: 300 } - } + } // L: 301 - @ObfuscatedName("ao") + @ObfuscatedName("b") @Export("drawLines") public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - if (var1 == null) { + if (var1 == null) { // L: 304 return 0; } else { - this.reset(var6, var7); - if (var10 == 0) { + this.reset(var6, var7); // L: 305 + if (var10 == 0) { // L: 306 var10 = this.ascent; } - int[] var11 = new int[]{var4}; - if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { + int[] var11 = new int[]{var4}; // L: 307 + if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { // L: 308 var11 = null; } - int var12 = this.breakLines(var1, var11, AbstractFont_lines); - if (var9 == 3 && var12 == 1) { + int var12 = this.breakLines(var1, var11, AbstractFont_lines); // L: 309 + if (var9 == 3 && var12 == 1) { // L: 311 var9 = 1; } int var13; int var14; - if (var9 == 0) { + if (var9 == 0) { // L: 312 var13 = var3 + this.maxAscent; - } else if (var9 == 1) { + } else if (var9 == 1) { // L: 313 var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if (var9 == 2) { + } else if (var9 == 2) { // L: 314 var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); } else { - var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); - if (var14 < 0) { + var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); // L: 316 + if (var14 < 0) { // L: 317 var14 = 0; } - var13 = var3 + var14 + this.maxAscent; - var10 += var14; + var13 = var3 + var14 + this.maxAscent; // L: 318 + var10 += var14; // L: 319 } - for (var14 = 0; var14 < var12; ++var14) { + for (var14 = 0; var14 < var12; ++var14) { // L: 321 if (var8 == 0) { - this.draw0(AbstractFont_lines[var14], var2, var13); - } else if (var8 == 1) { + this.draw0(AbstractFont_lines[var14], var2, var13); // L: 322 + } else if (var8 == 1) { // L: 323 this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if (var8 == 2) { + } else if (var8 == 2) { // L: 324 this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); - } else if (var14 == var12 - 1) { + } else if (var14 == var12 - 1) { // L: 326 this.draw0(AbstractFont_lines[var14], var2, var13); } else { - this.calculateLineJustification(AbstractFont_lines[var14], var4); - this.draw0(AbstractFont_lines[var14], var2, var13); - AbstractFont_justificationTotal = 0; + this.calculateLineJustification(AbstractFont_lines[var14], var4); // L: 328 + this.draw0(AbstractFont_lines[var14], var2, var13); // L: 329 + AbstractFont_justificationTotal = 0; // L: 330 } - var13 += var10; + var13 += var10; // L: 333 } - return var12; + return var12; // L: 335 } } - @ObfuscatedName("ae") + @ObfuscatedName("l") @Export("drawCenteredWave") public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { - this.reset(var4, var5); - int[] var7 = new int[var1.length()]; + if (var1 != null) { // L: 339 + this.reset(var4, var5); // L: 340 + int[] var7 = new int[var1.length()]; // L: 341 - for (int var8 = 0; var8 < var1.length(); ++var8) { + for (int var8 = 0; var8 < var1.length(); ++var8) { // L: 342 var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)var6 / 5.0D) * 5.0D); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7); // L: 343 } - } + } // L: 344 - @ObfuscatedName("ax") + @ObfuscatedName("e") @Export("drawCenteredWave2") public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { - this.reset(var4, var5); - int[] var7 = new int[var1.length()]; - int[] var8 = new int[var1.length()]; + if (var1 != null) { // L: 347 + this.reset(var4, var5); // L: 348 + int[] var7 = new int[var1.length()]; // L: 349 + int[] var8 = new int[var1.length()]; // L: 350 - for (int var9 = 0; var9 < var1.length(); ++var9) { - var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); - var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 351 + var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D); // L: 352 + var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D); // L: 353 } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8); // L: 355 } - } + } // L: 356 - @ObfuscatedName("ag") + @ObfuscatedName("ab") @Export("drawCenteredShake") public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var1 != null) { - this.reset(var4, var5); - double var8 = 7.0D - (double)var7 / 8.0D; - if (var8 < 0.0D) { + if (var1 != null) { // L: 359 + this.reset(var4, var5); // L: 360 + double var8 = 7.0D - (double)var7 / 8.0D; // L: 361 + if (var8 < 0.0D) { // L: 362 var8 = 0.0D; } - int[] var10 = new int[var1.length()]; + int[] var10 = new int[var1.length()]; // L: 363 - for (int var11 = 0; var11 < var1.length(); ++var11) { + for (int var11 = 0; var11 < var1.length(); ++var11) { // L: 364 var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)var6 / 1.0D) * var8); } - this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); + this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10); // L: 365 } - } + } // L: 366 - @ObfuscatedName("ab") + @ObfuscatedName("ag") @Export("drawRandomAlphaAndSpacing") public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 != null) { - this.reset(var4, var5); - AbstractFont_random.setSeed((long)var6); - AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); - int[] var7 = new int[var1.length()]; - int var8 = 0; + if (var1 != null) { // L: 369 + this.reset(var4, var5); // L: 370 + AbstractFont_random.setSeed((long)var6); // L: 371 + AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31); // L: 372 + int[] var7 = new int[var1.length()]; // L: 373 + int var8 = 0; // L: 374 - for (int var9 = 0; var9 < var1.length(); ++var9) { - var7[var9] = var8; - if ((AbstractFont_random.nextInt() & 3) == 0) { + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 375 + var7[var9] = var8; // L: 376 + if ((AbstractFont_random.nextInt() & 3) == 0) { // L: 377 ++var8; } } - this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); + this.drawWithOffsets0(var1, var2, var3, var7, (int[])null); // L: 379 } - } + } // L: 380 - @ObfuscatedName("am") + @ObfuscatedName("ao") @Export("reset") void reset(int var1, int var2) { - AbstractFont_strike = -1; - AbstractFont_underline = -1; - AbstractFont_previousShadow = var2; + AbstractFont_strike = -1; // L: 383 + AbstractFont_underline = -1; // L: 384 + AbstractFont_previousShadow = var2; // L: 385 AbstractFont_shadow = var2; - AbstractFont_previousColor = var1; + AbstractFont_previousColor = var1; // L: 386 AbstractFont_color = var1; - AbstractFont_alpha = 256; - AbstractFont_justificationTotal = 0; - AbstractFont_justificationCurrent = 0; - } + AbstractFont_alpha = 256; // L: 387 + AbstractFont_justificationTotal = 0; // L: 388 + AbstractFont_justificationCurrent = 0; // L: 389 + } // L: 390 - @ObfuscatedName("ak") + @ObfuscatedName("ae") @Export("decodeTag") void decodeTag(String var1) { try { - if (var1.startsWith("col=")) { - AbstractFont_color = Username.method5398(var1.substring(4), 16); - } else if (var1.equals("/col")) { + if (var1.startsWith("col=")) { // L: 394 + AbstractFont_color = class228.method4190(var1.substring(4), 16); + } else if (var1.equals("/col")) { // L: 395 AbstractFont_color = AbstractFont_previousColor; - } else if (var1.startsWith("str=")) { - AbstractFont_strike = Username.method5398(var1.substring(4), 16); - } else if (var1.equals("str")) { + } else if (var1.startsWith("str=")) { // L: 396 + AbstractFont_strike = class228.method4190(var1.substring(4), 16); + } else if (var1.equals("str")) { // L: 397 AbstractFont_strike = 8388608; - } else if (var1.equals("/str")) { + } else if (var1.equals("/str")) { // L: 398 AbstractFont_strike = -1; - } else if (var1.startsWith("u=")) { - AbstractFont_underline = Username.method5398(var1.substring(2), 16); - } else if (var1.equals("u")) { + } else if (var1.startsWith("u=")) { // L: 399 + AbstractFont_underline = class228.method4190(var1.substring(2), 16); + } else if (var1.equals("u")) { // L: 400 AbstractFont_underline = 0; - } else if (var1.equals("/u")) { + } else if (var1.equals("/u")) { // L: 401 AbstractFont_underline = -1; - } else if (var1.startsWith("shad=")) { - AbstractFont_shadow = Username.method5398(var1.substring(5), 16); - } else if (var1.equals("shad")) { + } else if (var1.startsWith("shad=")) { // L: 402 + AbstractFont_shadow = class228.method4190(var1.substring(5), 16); + } else if (var1.equals("shad")) { // L: 403 AbstractFont_shadow = 0; - } else if (var1.equals("/shad")) { + } else if (var1.equals("/shad")) { // L: 404 AbstractFont_shadow = AbstractFont_previousShadow; - } else if (var1.equals("br")) { + } else if (var1.equals("br")) { // L: 405 this.reset(AbstractFont_previousColor, AbstractFont_previousShadow); } - } catch (Exception var3) { + } catch (Exception var3) { // L: 407 } - } + } // L: 408 - @ObfuscatedName("ad") + @ObfuscatedName("ap") @Export("calculateLineJustification") void calculateLineJustification(String var1, int var2) { - int var3 = 0; - boolean var4 = false; + int var3 = 0; // L: 411 + boolean var4 = false; // L: 412 - for (int var5 = 0; var5 < var1.length(); ++var5) { - char var6 = var1.charAt(var5); - if (var6 == '<') { + for (int var5 = 0; var5 < var1.length(); ++var5) { // L: 413 + char var6 = var1.charAt(var5); // L: 414 + if (var6 == '<') { // L: 415 var4 = true; - } else if (var6 == '>') { + } else if (var6 == '>') { // L: 416 var4 = false; - } else if (!var4 && var6 == ' ') { + } else if (!var4 && var6 == ' ') { // L: 417 ++var3; } } - if (var3 > 0) { + if (var3 > 0) { // L: 419 AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3; } - } + } // L: 420 - @ObfuscatedName("as") + @ObfuscatedName("au") @Export("draw0") void draw0(String var1, int var2, int var3) { - var3 -= this.ascent; - int var4 = -1; - int var5 = -1; + var3 -= this.ascent; // L: 423 + int var4 = -1; // L: 424 + int var5 = -1; // L: 425 - for (int var6 = 0; var6 < var1.length(); ++var6) { - if (var1.charAt(var6) != 0) { - char var7 = (char)(UserComparator3.charToByteCp1252(var1.charAt(var6)) & 255); - if (var7 == '<') { - var4 = var6; + for (int var6 = 0; var6 < var1.length(); ++var6) { // L: 426 + if (var1.charAt(var6) != 0) { // L: 427 + char var7 = (char)(class227.charToByteCp1252(var1.charAt(var6)) & 255); // L: 428 + if (var7 == '<') { // L: 429 + var4 = var6; // L: 430 } else { int var9; - if (var7 == '>' && var4 != -1) { - String var8 = var1.substring(var4 + 1, var6); - var4 = -1; - if (var8.equals("lt")) { + if (var7 == '>' && var4 != -1) { // L: 433 + String var8 = var1.substring(var4 + 1, var6); // L: 434 + var4 = -1; // L: 435 + if (var8.equals("lt")) { // L: 436 var7 = '<'; } else { - if (!var8.equals("gt")) { - if (var8.startsWith("img=")) { + if (!var8.equals("gt")) { // L: 437 + if (var8.startsWith("img=")) { // L: 438 try { - var9 = Tiles.parseInt(var8.substring(4)); - IndexedSprite var10 = AbstractFont_modIconSprites[var9]; - var10.drawAt(var2, var3 + this.ascent - var10.height); - var2 += var10.width; - var5 = -1; - } catch (Exception var14) { + var9 = GrandExchangeOfferTotalQuantityComparator.parseInt(var8.substring(4)); // L: 440 + IndexedSprite var10 = AbstractFont_modIconSprites[var9]; // L: 441 + var10.drawAt(var2, var3 + this.ascent - var10.height); // L: 442 + var2 += var10.width; // L: 443 + var5 = -1; // L: 444 + } catch (Exception var14) { // L: 446 } } else { - this.decodeTag(var8); + this.decodeTag(var8); // L: 450 } continue; } @@ -679,103 +679,103 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var7 == 160) { + if (var7 == 160) { // L: 454 var7 = ' '; } - if (var4 == -1) { - if (this.kerning != null && var5 != -1) { + if (var4 == -1) { // L: 455 + if (this.kerning != null && var5 != -1) { // L: 456 var2 += this.kerning[var7 + (var5 << 8)]; } - int var12 = this.widths[var7]; - var9 = this.heights[var7]; - if (var7 != ' ') { - if (AbstractFont_alpha == 256) { - if (AbstractFont_shadow != -1) { + int var12 = this.widths[var7]; // L: 457 + var9 = this.heights[var7]; // L: 458 + if (var7 != ' ') { // L: 459 + if (AbstractFont_alpha == 256) { // L: 460 + if (AbstractFont_shadow != -1) { // L: 461 AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); + this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color); // L: 462 } else { - if (AbstractFont_shadow != -1) { + if (AbstractFont_shadow != -1) { // L: 465 AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); + this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha); // L: 466 } - } else if (AbstractFont_justificationTotal > 0) { - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; - AbstractFont_justificationCurrent &= 255; + } else if (AbstractFont_justificationTotal > 0) { // L: 470 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 471 + var2 += AbstractFont_justificationCurrent >> 8; // L: 472 + AbstractFont_justificationCurrent &= 255; // L: 473 } - int var13 = this.advances[var7]; - if (AbstractFont_strike != -1) { + int var13 = this.advances[var7]; // L: 476 + if (AbstractFont_strike != -1) { // L: 477 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike); } - if (AbstractFont_underline != -1) { + if (AbstractFont_underline != -1) { // L: 478 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline); } - var2 += var13; - var5 = var7; + var2 += var13; // L: 479 + var5 = var7; // L: 480 } } } } - } + } // L: 483 - @ObfuscatedName("ar") + @ObfuscatedName("aa") @Export("drawWithOffsets0") void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) { - var3 -= this.ascent; - int var6 = -1; - int var7 = -1; - int var8 = 0; + var3 -= this.ascent; // L: 486 + int var6 = -1; // L: 487 + int var7 = -1; // L: 488 + int var8 = 0; // L: 489 - for (int var9 = 0; var9 < var1.length(); ++var9) { - if (var1.charAt(var9) != 0) { - char var10 = (char)(UserComparator3.charToByteCp1252(var1.charAt(var9)) & 255); - if (var10 == '<') { - var6 = var9; + for (int var9 = 0; var9 < var1.length(); ++var9) { // L: 490 + if (var1.charAt(var9) != 0) { // L: 491 + char var10 = (char)(class227.charToByteCp1252(var1.charAt(var9)) & 255); // L: 492 + if (var10 == '<') { // L: 493 + var6 = var9; // L: 494 } else { int var12; int var13; int var14; - if (var10 == '>' && var6 != -1) { - String var11 = var1.substring(var6 + 1, var9); - var6 = -1; - if (var11.equals("lt")) { + if (var10 == '>' && var6 != -1) { // L: 497 + String var11 = var1.substring(var6 + 1, var9); // L: 498 + var6 = -1; // L: 499 + if (var11.equals("lt")) { // L: 500 var10 = '<'; } else { - if (!var11.equals("gt")) { - if (var11.startsWith("img=")) { + if (!var11.equals("gt")) { // L: 501 + if (var11.startsWith("img=")) { // L: 502 try { - if (var4 != null) { + if (var4 != null) { // L: 505 var12 = var4[var8]; } else { - var12 = 0; + var12 = 0; // L: 506 } - if (var5 != null) { + if (var5 != null) { // L: 508 var13 = var5[var8]; } else { - var13 = 0; + var13 = 0; // L: 509 } - ++var8; - var14 = Tiles.parseInt(var11.substring(4)); - IndexedSprite var15 = AbstractFont_modIconSprites[var14]; - var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); - var2 += var15.width; - var7 = -1; - } catch (Exception var19) { + ++var8; // L: 510 + var14 = GrandExchangeOfferTotalQuantityComparator.parseInt(var11.substring(4)); // L: 511 + IndexedSprite var15 = AbstractFont_modIconSprites[var14]; // L: 512 + var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height)); // L: 513 + var2 += var15.width; // L: 514 + var7 = -1; // L: 515 + } catch (Exception var19) { // L: 517 } } else { - this.decodeTag(var11); + this.decodeTag(var11); // L: 521 } continue; } @@ -784,284 +784,284 @@ public abstract class AbstractFont extends Rasterizer2D { } } - if (var10 == 160) { + if (var10 == 160) { // L: 525 var10 = ' '; } - if (var6 == -1) { - if (this.kerning != null && var7 != -1) { + if (var6 == -1) { // L: 526 + if (this.kerning != null && var7 != -1) { // L: 527 var2 += this.kerning[var10 + (var7 << 8)]; } - int var17 = this.widths[var10]; - var12 = this.heights[var10]; - if (var4 != null) { + int var17 = this.widths[var10]; // L: 528 + var12 = this.heights[var10]; // L: 529 + if (var4 != null) { // L: 531 var13 = var4[var8]; } else { - var13 = 0; + var13 = 0; // L: 532 } - if (var5 != null) { + if (var5 != null) { // L: 534 var14 = var5[var8]; } else { - var14 = 0; + var14 = 0; // L: 535 } - ++var8; - if (var10 != ' ') { - if (AbstractFont_alpha == 256) { - if (AbstractFont_shadow != -1) { + ++var8; // L: 536 + if (var10 != ' ') { // L: 537 + if (AbstractFont_alpha == 256) { // L: 538 + if (AbstractFont_shadow != -1) { // L: 539 AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow); } - this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); + this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color); // L: 540 } else { - if (AbstractFont_shadow != -1) { + if (AbstractFont_shadow != -1) { // L: 543 AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha); } - this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); + this.drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color, AbstractFont_alpha); // L: 544 } - } else if (AbstractFont_justificationTotal > 0) { - AbstractFont_justificationCurrent += AbstractFont_justificationTotal; - var2 += AbstractFont_justificationCurrent >> 8; - AbstractFont_justificationCurrent &= 255; + } else if (AbstractFont_justificationTotal > 0) { // L: 548 + AbstractFont_justificationCurrent += AbstractFont_justificationTotal; // L: 549 + var2 += AbstractFont_justificationCurrent >> 8; // L: 550 + AbstractFont_justificationCurrent &= 255; // L: 551 } - int var18 = this.advances[var10]; - if (AbstractFont_strike != -1) { + int var18 = this.advances[var10]; // L: 554 + if (AbstractFont_strike != -1) { // L: 555 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike); } - if (AbstractFont_underline != -1) { + if (AbstractFont_underline != -1) { // L: 556 Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline); } - var2 += var18; - var7 = var10; + var2 += var18; // L: 557 + var7 = var10; // L: 558 } } } } - } + } // L: 561 - @ObfuscatedName("c") - static int method5603(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { - int var7 = var2[var5]; - int var8 = var7 + var4[var5]; - int var9 = var2[var6]; - int var10 = var9 + var4[var6]; - int var11 = var7; - if (var9 > var7) { + @ObfuscatedName("m") + static int method5464(byte[][] var0, byte[][] var1, int[] var2, int[] var3, int[] var4, int var5, int var6) { + int var7 = var2[var5]; // L: 100 + int var8 = var7 + var4[var5]; // L: 101 + int var9 = var2[var6]; // L: 102 + int var10 = var9 + var4[var6]; // L: 103 + int var11 = var7; // L: 104 + if (var9 > var7) { // L: 105 var11 = var9; } - int var12 = var8; - if (var10 < var8) { + int var12 = var8; // L: 106 + if (var10 < var8) { // L: 107 var12 = var10; } - int var13 = var3[var5]; - if (var3[var6] < var13) { + int var13 = var3[var5]; // L: 108 + if (var3[var6] < var13) { // L: 109 var13 = var3[var6]; } - byte[] var14 = var1[var5]; - byte[] var15 = var0[var6]; - int var16 = var11 - var7; - int var17 = var11 - var9; + byte[] var14 = var1[var5]; // L: 110 + byte[] var15 = var0[var6]; // L: 111 + int var16 = var11 - var7; // L: 112 + int var17 = var11 - var9; // L: 113 - for (int var18 = var11; var18 < var12; ++var18) { - int var19 = var14[var16++] + var15[var17++]; - if (var19 < var13) { + for (int var18 = var11; var18 < var12; ++var18) { // L: 114 + int var19 = var14[var16++] + var15[var17++]; // L: 115 + if (var19 < var13) { // L: 116 var13 = var19; } } - return -var13; + return -var13; // L: 118 } - @ObfuscatedName("l") + @ObfuscatedName("c") @Export("escapeBrackets") public static String escapeBrackets(String var0) { - int var1 = var0.length(); - int var2 = 0; + int var1 = var0.length(); // L: 262 + int var2 = 0; // L: 263 - for (int var3 = 0; var3 < var1; ++var3) { - char var4 = var0.charAt(var3); + for (int var3 = 0; var3 < var1; ++var3) { // L: 264 + char var4 = var0.charAt(var3); // L: 265 if (var4 == '<' || var4 == '>') { - var2 += 3; + var2 += 3; // L: 266 } } - StringBuilder var6 = new StringBuilder(var1 + var2); + StringBuilder var6 = new StringBuilder(var1 + var2); // L: 268 - for (int var7 = 0; var7 < var1; ++var7) { - char var5 = var0.charAt(var7); + for (int var7 = 0; var7 < var1; ++var7) { // L: 269 + char var5 = var0.charAt(var7); // L: 270 if (var5 == '<') { - var6.append(""); - } else if (var5 == '>') { + var6.append(""); // L: 271 + } else if (var5 == '>') { // L: 272 var6.append(""); } else { - var6.append(var5); + var6.append(var5); // L: 273 } } - return var6.toString(); + return var6.toString(); // L: 275 } - @ObfuscatedName("ap") + @ObfuscatedName("ar") @Export("AbstractFont_drawGlyph") static void AbstractFont_drawGlyph(byte[] var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var7 = Rasterizer2D.Rasterizer2D_width - var3; - int var8 = 0; - int var9 = 0; + int var6 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 567 + int var7 = Rasterizer2D.Rasterizer2D_width - var3; // L: 568 + int var8 = 0; // L: 569 + int var9 = 0; // L: 570 int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var10; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var9 += var3 * var10; - var6 += var10 * Rasterizer2D.Rasterizer2D_width; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 571 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 572 + var4 -= var10; // L: 573 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 574 + var9 += var3 * var10; // L: 575 + var6 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 576 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 578 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var10; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; - var9 += var10; - var6 += var10; - var8 += var10; - var7 += var10; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 579 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 580 + var3 -= var10; // L: 581 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 582 + var9 += var10; // L: 583 + var6 += var10; // L: 584 + var8 += var10; // L: 585 + var7 += var10; // L: 586 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var10; - var8 += var10; - var7 += var10; + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 588 + var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 589 + var3 -= var10; // L: 590 + var8 += var10; // L: 591 + var7 += var10; // L: 592 } - if (var3 > 0 && var4 > 0) { - AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); + if (var3 > 0 && var4 > 0) { // L: 594 + AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8); // L: 595 } - } + } // L: 596 - @ObfuscatedName("al") + @ObfuscatedName("at") @Export("AbstractFont_placeGlyph") static void AbstractFont_placeGlyph(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); - var5 = -(var5 & 3); + int var9 = -(var5 >> 2); // L: 599 + var5 = -(var5 & 3); // L: 600 - for (int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { // L: 601 int var11; - for (var11 = var9; var11 < 0; ++var11) { - if (var1[var3++] != 0) { + for (var11 = var9; var11 < 0; ++var11) { // L: 602 + if (var1[var3++] != 0) { // L: 603 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 604 } - if (var1[var3++] != 0) { + if (var1[var3++] != 0) { // L: 605 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 606 } - if (var1[var3++] != 0) { + if (var1[var3++] != 0) { // L: 607 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 608 } - if (var1[var3++] != 0) { + if (var1[var3++] != 0) { // L: 609 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 610 } } - for (var11 = var5; var11 < 0; ++var11) { - if (var1[var3++] != 0) { + for (var11 = var5; var11 < 0; ++var11) { // L: 612 + if (var1[var3++] != 0) { // L: 613 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 614 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 616 + var3 += var8; // L: 617 } - } + } // L: 619 - @ObfuscatedName("an") + @ObfuscatedName("aq") @Export("AbstractFont_drawGlyphAlpha") static void AbstractFont_drawGlyphAlpha(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var8 = Rasterizer2D.Rasterizer2D_width - var3; - int var9 = 0; - int var10 = 0; + int var7 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 622 + int var8 = Rasterizer2D.Rasterizer2D_width - var3; // L: 623 + int var9 = 0; // L: 624 + int var10 = 0; // L: 625 int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var11; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var10 += var3 * var11; - var7 += var11 * Rasterizer2D.Rasterizer2D_width; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 626 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 627 + var4 -= var11; // L: 628 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 629 + var10 += var3 * var11; // L: 630 + var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 631 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 633 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var11; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; - var10 += var11; - var7 += var11; - var9 += var11; - var8 += var11; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 634 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 635 + var3 -= var11; // L: 636 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 637 + var10 += var11; // L: 638 + var7 += var11; // L: 639 + var9 += var11; // L: 640 + var8 += var11; // L: 641 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var11; - var9 += var11; - var8 += var11; + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 643 + var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 644 + var3 -= var11; // L: 645 + var9 += var11; // L: 646 + var8 += var11; // L: 647 } - if (var3 > 0 && var4 > 0) { - AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); + if (var3 > 0 && var4 > 0) { // L: 649 + AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6); // L: 650 } - } + } // L: 651 - @ObfuscatedName("ac") + @ObfuscatedName("al") @Export("AbstractFont_placeGlyphAlpha") static void AbstractFont_placeGlyphAlpha(int[] var0, byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; - var9 = 256 - var9; + var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8; // L: 654 + var9 = 256 - var9; // L: 655 - for (int var10 = -var6; var10 < 0; ++var10) { - for (int var11 = -var5; var11 < 0; ++var11) { - if (var1[var3++] != 0) { - int var12 = var0[var4]; - var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; + for (int var10 = -var6; var10 < 0; ++var10) { // L: 656 + for (int var11 = -var5; var11 < 0; ++var11) { // L: 657 + if (var1[var3++] != 0) { // L: 658 + int var12 = var0[var4]; // L: 659 + var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2; // L: 660 } else { - ++var4; + ++var4; // L: 662 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 664 + var3 += var8; // L: 665 } - } + } // L: 667 } diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java index 3a128a923f..5d7fb23347 100644 --- a/runescape-client/src/main/java/AbstractRasterProvider.java +++ b/runescape-client/src/main/java/AbstractRasterProvider.java @@ -4,51 +4,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lo") +@ObfuscatedName("lw") @Implements("AbstractRasterProvider") public abstract class AbstractRasterProvider { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("pixels") public int[] pixels; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1291852267 + intValue = 1282553935 ) @Export("width") public int width; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1133589313 + intValue = -1198737713 ) @Export("height") public int height; protected AbstractRasterProvider() { - } + } // L: 8 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-5" + descriptor = "(III)V", + garbageValue = "-1964598850" ) @Export("drawFull") public abstract void drawFull(int var1, int var2); - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1334771637" + garbageValue = "147756616" ) @Export("draw") public abstract void draw(int var1, int var2, int var3, int var4); - @ObfuscatedName("k") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "25855118" + garbageValue = "-1832212731" ) @Export("apply") public final void apply() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); - } + Rasterizer2D.Rasterizer2D_replace(this.pixels, this.width, this.height); // L: 11 + } // L: 12 } diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java index d0bcc7a67e..da4f7ff0e3 100644 --- a/runescape-client/src/main/java/AbstractSocket.java +++ b/runescape-client/src/main/java/AbstractSocket.java @@ -4,57 +4,70 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lj") +@ObfuscatedName("ln") @Implements("AbstractSocket") public abstract class AbstractSocket { protected AbstractSocket() { - } + } // L: 7 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-768493590" + garbageValue = "-147773206" ) @Export("close") public abstract void close(); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-8" + garbageValue = "-99" ) @Export("readUnsignedByte") public abstract int readUnsignedByte() throws IOException; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1942767880" + descriptor = "(B)I", + garbageValue = "12" ) @Export("available") public abstract int available() throws IOException; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1355091335" + descriptor = "(IB)Z", + garbageValue = "-78" ) @Export("isAvailable") public abstract boolean isAvailable(int var1) throws IOException; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "37" + descriptor = "([BIII)I", + garbageValue = "-1533815985" ) @Export("read") public abstract int read(byte[] var1, int var2, int var3) throws IOException; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "-105" + garbageValue = "52" ) @Export("write") public abstract void write(byte[] var1, int var2, int var3) throws IOException; + + @ObfuscatedName("hs") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1292618906" + ) + @Export("resumePauseWidget") + static void resumePauseWidget(int var0, int var1) { + PacketBufferNode var2 = Client.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); // L: 8130 + var2.packetBuffer.method5654(var1); // L: 8131 + var2.packetBuffer.method5663(var0); // L: 8132 + Client.packetWriter.addNode(var2); // L: 8133 + } // L: 8134 } diff --git a/runescape-client/src/main/java/AbstractSound.java b/runescape-client/src/main/java/AbstractSound.java index 342c7204ff..b4a6c0d323 100644 --- a/runescape-client/src/main/java/AbstractSound.java +++ b/runescape-client/src/main/java/AbstractSound.java @@ -2,13 +2,13 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dy") +@ObfuscatedName("dp") @Implements("AbstractSound") public abstract class AbstractSound extends Node { - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("position") int position; AbstractSound() { - } + } // L: 10 } diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java index 63a520a6b5..bbcebab7ee 100644 --- a/runescape-client/src/main/java/AbstractUserComparator.java +++ b/runescape-client/src/main/java/AbstractUserComparator.java @@ -1,52 +1,190 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jk") +@ObfuscatedName("jn") @Implements("AbstractUserComparator") public abstract class AbstractUserComparator implements Comparator { - @ObfuscatedName("ix") - @ObfuscatedGetter( - intValue = -1488914561 - ) - @Export("selectedItemWidget") - static int selectedItemWidget; - @ObfuscatedName("o") + @ObfuscatedName("gd") + @Export("regionLandArchives") + static byte[][] regionLandArchives; + @ObfuscatedName("k") @Export("nextComparator") Comparator nextComparator; protected AbstractUserComparator() { - } + } // L: 8 - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;S)V", - garbageValue = "-28900" + descriptor = "(Ljava/util/Comparator;B)V", + garbageValue = "-9" ) @Export("addComparator") final void addComparator(Comparator var1) { - if (this.nextComparator == null) { - this.nextComparator = var1; - } else if (this.nextComparator instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.nextComparator).addComparator(var1); + if (this.nextComparator == null) { // L: 11 + this.nextComparator = var1; // L: 12 + } else if (this.nextComparator instanceof AbstractUserComparator) { // L: 14 + ((AbstractUserComparator)this.nextComparator).addComparator(var1); // L: 15 } - } + } // L: 17 - @ObfuscatedName("a") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljf;Ljf;I)I", - garbageValue = "864234218" + descriptor = "(Ljc;Ljc;I)I", + garbageValue = "1339061941" ) @Export("compareUser") protected final int compareUser(User var1, User var2) { - return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); + return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2); // L: 20 21 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 25 } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lic;III)Llp;", + garbageValue = "-2098090850" + ) + @Export("SpriteBuffer_getSprite") + public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 96 + boolean var3; + if (var4 == null) { // L: 97 + var3 = false; // L: 98 + } else { + Occluder.SpriteBuffer_decode(var4); // L: 101 + var3 = true; // L: 102 + } + + return !var3 ? null : AttackOption.method2155(); // L: 104 105 + } + + @ObfuscatedName("jk") + @ObfuscatedSignature( + descriptor = "(Lhq;IIII)V", + garbageValue = "-1377715845" + ) + @Export("drawMinimap") + static final void drawMinimap(Widget var0, int var1, int var2, int var3) { + RouteStrategy.playPcmPlayers(); // L: 10551 + SpriteMask var4 = var0.getSpriteMask(false); // L: 10552 + if (var4 != null) { // L: 10553 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); // L: 10554 + if (Client.minimapState != 2 && Client.minimapState != 5) { // L: 10555 + int var5 = Client.camAngleY & 2047; // L: 10556 + int var6 = WorldMapLabelSize.localPlayer.x / 32 + 48; // L: 10557 + int var7 = 464 - WorldMapLabelSize.localPlayer.y / 32; // L: 10558 + ApproximateRouteStrategy.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); // L: 10559 + + int var8; + int var10; + int var17; + for (var8 = 0; var8 < Client.mapIconCount; ++var8) { // L: 10560 + var17 = Client.mapIconXs[var8] * 4 + 2 - WorldMapLabelSize.localPlayer.x / 32; // L: 10561 + var10 = Client.mapIconYs[var8] * 4 + 2 - WorldMapLabelSize.localPlayer.y / 32; // L: 10562 + HealthBar.drawSpriteOnMinimap(var1, var2, var17, var10, Client.mapIcons[var8], var4); // L: 10563 + } + + int var11; + int var12; + for (var8 = 0; var8 < 104; ++var8) { // L: 10565 + for (var17 = 0; var17 < 104; ++var17) { // L: 10566 + NodeDeque var15 = Client.groundItems[Huffman.Client_plane][var8][var17]; // L: 10567 + if (var15 != null) { // L: 10568 + var11 = var8 * 4 + 2 - WorldMapLabelSize.localPlayer.x / 32; // L: 10569 + var12 = var17 * 4 + 2 - WorldMapLabelSize.localPlayer.y / 32; // L: 10570 + HealthBar.drawSpriteOnMinimap(var1, var2, var11, var12, class235.mapDotSprites[0], var4); // L: 10571 + } + } + } + + for (var8 = 0; var8 < Client.npcCount; ++var8) { // L: 10575 + NPC var9 = Client.npcs[Client.npcIndices[var8]]; // L: 10576 + if (var9 != null && var9.isVisible()) { // L: 10577 + NPCDefinition var19 = var9.definition; // L: 10578 + if (var19 != null && var19.transforms != null) { // L: 10579 + var19 = var19.transform(); + } + + if (var19 != null && var19.drawMapDot && var19.isInteractable) { // L: 10580 + var11 = var9.x / 32 - WorldMapLabelSize.localPlayer.x / 32; // L: 10581 + var12 = var9.y / 32 - WorldMapLabelSize.localPlayer.y / 32; // L: 10582 + HealthBar.drawSpriteOnMinimap(var1, var2, var11, var12, class235.mapDotSprites[1], var4); // L: 10583 + } + } + } + + var8 = Players.Players_count; // L: 10587 + int[] var18 = Players.Players_indices; // L: 10588 + + for (var10 = 0; var10 < var8; ++var10) { // L: 10589 + Player var16 = Client.players[var18[var10]]; // L: 10590 + if (var16 != null && var16.isVisible() && !var16.isHidden && var16 != WorldMapLabelSize.localPlayer) { // L: 10591 + var12 = var16.x / 32 - WorldMapLabelSize.localPlayer.x / 32; // L: 10592 + int var13 = var16.y / 32 - WorldMapLabelSize.localPlayer.y / 32; // L: 10593 + boolean var14 = false; // L: 10594 + if (WorldMapLabelSize.localPlayer.team != 0 && var16.team != 0 && var16.team == WorldMapLabelSize.localPlayer.team) { // L: 10595 + var14 = true; + } + + if (var16.isFriend()) { // L: 10596 + HealthBar.drawSpriteOnMinimap(var1, var2, var12, var13, class235.mapDotSprites[3], var4); + } else if (var14) { // L: 10597 + HealthBar.drawSpriteOnMinimap(var1, var2, var12, var13, class235.mapDotSprites[4], var4); + } else if (var16.isClanMember()) { // L: 10598 + HealthBar.drawSpriteOnMinimap(var1, var2, var12, var13, class235.mapDotSprites[5], var4); + } else { + HealthBar.drawSpriteOnMinimap(var1, var2, var12, var13, class235.mapDotSprites[2], var4); // L: 10599 + } + } + } + + if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { // L: 10602 + if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { // L: 10603 + NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; // L: 10604 + if (var20 != null) { // L: 10605 + var11 = var20.x / 32 - WorldMapLabelSize.localPlayer.x / 32; // L: 10606 + var12 = var20.y / 32 - WorldMapLabelSize.localPlayer.y / 32; // L: 10607 + Coord.worldToMinimap(var1, var2, var11, var12, VarbitDefinition.mapMarkerSprites[1], var4); // L: 10608 + } + } + + if (Client.hintArrowType == 2) { // L: 10611 + var10 = Client.hintArrowX * 4 - WorldMapManager.baseX * 4 + 2 - WorldMapLabelSize.localPlayer.x / 32; // L: 10612 + var11 = Client.hintArrowY * 4 - WorldMapLabel.baseY * 4 + 2 - WorldMapLabelSize.localPlayer.y / 32; // L: 10613 + Coord.worldToMinimap(var1, var2, var10, var11, VarbitDefinition.mapMarkerSprites[1], var4); // L: 10614 + } + + if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { // L: 10616 + Player var21 = Client.players[Client.hintArrowPlayerIndex]; // L: 10617 + if (var21 != null) { // L: 10618 + var11 = var21.x / 32 - WorldMapLabelSize.localPlayer.x / 32; // L: 10619 + var12 = var21.y / 32 - WorldMapLabelSize.localPlayer.y / 32; // L: 10620 + Coord.worldToMinimap(var1, var2, var11, var12, VarbitDefinition.mapMarkerSprites[1], var4); // L: 10621 + } + } + } + + if (Client.destinationX != 0) { // L: 10625 + var10 = Client.destinationX * 4 + 2 - WorldMapLabelSize.localPlayer.x / 32; // L: 10626 + var11 = Client.destinationY * 4 + 2 - WorldMapLabelSize.localPlayer.y / 32; // L: 10627 + HealthBar.drawSpriteOnMinimap(var1, var2, var10, var11, VarbitDefinition.mapMarkerSprites[0], var4); // L: 10628 + } + + if (!WorldMapLabelSize.localPlayer.isHidden) { // L: 10630 + Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); + } + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 10632 + } + + Client.field883[var3] = true; // L: 10633 + } + } // L: 10634 } diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index ad79114d82..0292565045 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -1,268 +1,396 @@ -import java.awt.Component; import java.util.LinkedList; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ax") +@ObfuscatedName("an") @Implements("AbstractWorldMapData") public abstract class AbstractWorldMapData { - @ObfuscatedName("m") + @ObfuscatedName("gz") + @Export("regionMapArchives") + static byte[][] regionMapArchives; + @ObfuscatedName("hc") @ObfuscatedGetter( - intValue = 1613993877 + intValue = -1751628859 + ) + @Export("cameraZ") + static int cameraZ; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -79159629 ) @Export("regionXLow") int regionXLow; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -341048683 + intValue = 522527831 ) @Export("regionYLow") int regionYLow; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -718032253 + intValue = -2063226565 ) @Export("regionX") int regionX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -2006912863 + intValue = 480521769 ) @Export("regionY") int regionY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1970114381 + intValue = 946227363 ) @Export("minPlane") int minPlane; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -352793185 + intValue = -1771727323 ) @Export("planes") int planes; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 449340635 + intValue = 10575415 ) @Export("groupId") int groupId; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1711100227 + intValue = -466273533 ) @Export("fileId") int fileId; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("floorUnderlayIds") short[][][] floorUnderlayIds; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("floorOverlayIds") short[][][] floorOverlayIds; - @ObfuscatedName("w") - byte[][][] field185; - @ObfuscatedName("y") - byte[][][] field175; - @ObfuscatedName("c") + @ObfuscatedName("n") + byte[][][] field198; + @ObfuscatedName("d") + byte[][][] field191; + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[[[[Lak;" + descriptor = "[[[[Laa;" ) @Export("decorations") WorldMapDecoration[][][][] decorations; - @ObfuscatedName("h") - boolean field188; - @ObfuscatedName("k") - boolean field179; + @ObfuscatedName("a") + boolean field182; + @ObfuscatedName("q") + boolean field194; AbstractWorldMapData() { - this.groupId = -1; - this.fileId = -1; + this.groupId = -1; // L: 14 + this.fileId = -1; // L: 15 new LinkedList(); - this.field188 = false; - this.field179 = false; - } + this.field182 = false; + this.field194 = false; + } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1774414997" + descriptor = "(Lkf;I)V", + garbageValue = "728123848" ) @Export("readGeography") abstract void readGeography(Buffer var1); - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "923610125" + descriptor = "(B)Z", + garbageValue = "83" ) @Export("isFullyLoaded") boolean isFullyLoaded() { - return this.field188 && this.field179; + return this.field182 && this.field194; // L: 32 } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lic;S)V", - garbageValue = "19318" + descriptor = "(Lic;B)V", + garbageValue = "-109" ) @Export("loadGeography") void loadGeography(AbstractArchive var1) { - if (!this.isFullyLoaded()) { - byte[] var2 = var1.takeFile(this.groupId, this.fileId); - if (var2 != null) { - this.readGeography(new Buffer(var2)); - this.field188 = true; - this.field179 = true; + if (!this.isFullyLoaded()) { // L: 36 + byte[] var2 = var1.takeFile(this.groupId, this.fileId); // L: 37 + if (var2 != null) { // L: 38 + this.readGeography(new Buffer(var2)); // L: 39 + this.field182 = true; // L: 40 + this.field194 = true; // L: 41 } } } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1097959131" + garbageValue = "-2117739140" ) @Export("reset") void reset() { - this.floorUnderlayIds = null; - this.floorOverlayIds = null; - this.field185 = null; - this.field175 = null; - this.decorations = null; - this.field188 = false; - this.field179 = false; - } + this.floorUnderlayIds = null; // L: 46 + this.floorOverlayIds = null; // L: 47 + this.field198 = null; // L: 48 + this.field191 = null; // L: 49 + this.decorations = null; // L: 50 + this.field182 = false; // L: 51 + this.field194 = false; // L: 52 + } // L: 53 - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IILkn;I)V", - garbageValue = "929230318" + descriptor = "(IILkf;I)V", + garbageValue = "-1176902168" ) @Export("readTile") void readTile(int var1, int var2, Buffer var3) { - int var4 = var3.readUnsignedByte(); - if (var4 != 0) { - if ((var4 & 1) != 0) { - this.method319(var1, var2, var3, var4); + int var4 = var3.readUnsignedByte(); // L: 56 + if (var4 != 0) { // L: 57 + if ((var4 & 1) != 0) { // L: 60 + this.method329(var1, var2, var3, var4); // L: 61 } else { - this.method320(var1, var2, var3, var4); + this.method335(var1, var2, var3, var4); } } - } + } // L: 58 - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IILkn;II)V", - garbageValue = "1830113999" + descriptor = "(IILkf;II)V", + garbageValue = "1697201731" ) - void method319(int var1, int var2, Buffer var3, int var4) { + void method329(int var1, int var2, Buffer var3, int var4) { boolean var5 = (var4 & 2) != 0; if (var5) { this.floorOverlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); } - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); - } + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 73 + } // L: 74 - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IILkn;IB)V", - garbageValue = "73" + descriptor = "(IILkf;II)V", + garbageValue = "2061843342" ) - void method320(int var1, int var2, Buffer var3, int var4) { + void method335(int var1, int var2, Buffer var3, int var4) { int var5 = ((var4 & 24) >> 3) + 1; boolean var6 = (var4 & 2) != 0; - boolean var7 = (var4 & 4) != 0; - this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); + boolean var7 = (var4 & 4) != 0; // L: 79 + this.floorUnderlayIds[0][var1][var2] = (short)var3.readUnsignedByte(); // L: 80 int var8; int var9; int var11; - if (var6) { - var8 = var3.readUnsignedByte(); + if (var6) { // L: 81 + var8 = var3.readUnsignedByte(); // L: 82 - for (var9 = 0; var9 < var8; ++var9) { - int var10 = var3.readUnsignedByte(); - if (var10 != 0) { - this.floorOverlayIds[var9][var1][var2] = (short)var10; - var11 = var3.readUnsignedByte(); - this.field185[var9][var1][var2] = (byte)(var11 >> 2); - this.field175[var9][var1][var2] = (byte)(var11 & 3); + for (var9 = 0; var9 < var8; ++var9) { // L: 83 + int var14 = var3.readUnsignedByte(); // L: 84 + if (var14 != 0) { // L: 85 + this.floorOverlayIds[var9][var1][var2] = (short)var14; // L: 86 + var11 = var3.readUnsignedByte(); // L: 87 + this.field198[var9][var1][var2] = (byte)(var11 >> 2); // L: 88 + this.field191[var9][var1][var2] = (byte)(var11 & 3); // L: 89 } } } - if (var7) { - for (var8 = 0; var8 < var5; ++var8) { - var9 = var3.readUnsignedByte(); - if (var9 != 0) { - WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; + if (var7) { // L: 93 + for (var8 = 0; var8 < var5; ++var8) { // L: 94 + var9 = var3.readUnsignedByte(); // L: 95 + if (var9 != 0) { // L: 96 + WorldMapDecoration[] var10 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9]; // L: 99 - for (var11 = 0; var11 < var9; ++var11) { - int var12 = var3.method5843(); - int var13 = var3.readUnsignedByte(); - var14[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); + for (var11 = 0; var11 < var9; ++var11) { // L: 100 + int var12 = var3.method5634(); // L: 101 + int var13 = var3.readUnsignedByte(); // L: 102 + var10[var11] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3); // L: 103 } } } } - } + } // L: 107 - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "3" + descriptor = "(I)I", + garbageValue = "-1414029315" ) @Export("getRegionX") int getRegionX() { - return this.regionX; + return this.regionX; // L: 112 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1685122418" + ) + @Export("getRegionY") + int getRegionY() { + return this.regionY; // L: 116 + } + + @ObfuscatedName("z") + public static String method331(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16 + if (var0 % 37L == 0L) { // L: 17 + return null; + } else { + int var2 = 0; // L: 18 + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { // L: 19 20 22 + ++var2; // L: 21 + } + + StringBuilder var5 = new StringBuilder(var2); // L: 24 + + while (var0 != 0L) { // L: 25 + long var6 = var0; // L: 26 + var0 /= 37L; // L: 27 + var5.append(class298.base37Table[(int)(var6 - 37L * var0)]); // L: 28 + } + + return var5.reverse().toString(); // L: 30 + } + } else { + return null; + } } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-4" + descriptor = "(Llp;IIII)V", + garbageValue = "-224536193" ) - @Export("getRegionY") - int getRegionY() { - return this.regionY; - } + static void method353(Sprite var0, int var1, int var2, int var3) { + WorldMapRegion.WorldMapRegion_cachedSprites.put(var0, MenuAction.method2139(var1, var2, var3), var0.pixels.length * 4); // L: 42 + } // L: 43 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-1541126292" + descriptor = "(III)V", + garbageValue = "396183986" ) - static void method342(Component var0) { - var0.addMouseListener(MouseHandler.MouseHandler_instance); - var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); - var0.addFocusListener(MouseHandler.MouseHandler_instance); + @Export("changeWorldSelectSorting") + static void changeWorldSelectSorting(int var0, int var1) { + int[] var2 = new int[4]; // L: 63 + int[] var3 = new int[4]; // L: 64 + var2[0] = var0; // L: 65 + var3[0] = var1; // L: 66 + int var4 = 1; // L: 67 + + for (int var5 = 0; var5 < 4; ++var5) { // L: 68 + if (World.World_sortOption1[var5] != var0) { // L: 69 + var2[var4] = World.World_sortOption1[var5]; // L: 70 + var3[var4] = World.World_sortOption2[var5]; // L: 71 + ++var4; // L: 72 + } + } + + World.World_sortOption1 = var2; // L: 75 + World.World_sortOption2 = var3; // L: 76 + FloorDecoration.sortWorlds(AbstractByteArrayCopier.World_worlds, 0, AbstractByteArrayCopier.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 77 + } // L: 78 + + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "-1078037762" + ) + static int method351(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.LOGOUT) { // L: 3185 + Client.logoutTimer = 250; // L: 3186 + return 1; // L: 3187 + } else { + return 2; // L: 3189 + } } - @ObfuscatedName("g") + @ObfuscatedName("fc") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2015859206" + garbageValue = "1467299516" ) - public static void method343() { - HealthBarDefinition.HealthBarDefinition_cached.clear(); - HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); - } + static final void method354() { + if (Huffman.Client_plane != Client.field902) { // L: 3319 + Client.field902 = Huffman.Client_plane; // L: 3320 + int var0 = Huffman.Client_plane; // L: 3321 + int[] var1 = ApproximateRouteStrategy.sceneMinimapSprite.pixels; // L: 3323 + int var2 = var1.length; // L: 3324 - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "324919704" - ) - static final void method328() { - Object var10000 = null; - String var0 = "Your friend list is full. Max of 200 for free users, and 400 for members"; - ObjectSound.addGameMessage(30, "", var0); - } + int var3; + for (var3 = 0; var3 < var2; ++var3) { // L: 3325 + var1[var3] = 0; + } + + int var4; + int var5; + for (var3 = 1; var3 < 103; ++var3) { // L: 3326 + var4 = (103 - var3) * 2048 + 24628; // L: 3327 + + for (var5 = 1; var5 < 103; ++var5) { // L: 3328 + if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { // L: 3329 + ScriptEvent.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { // L: 3330 + ScriptEvent.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); + } + + var4 += 4; // L: 3331 + } + } + + var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); // L: 3334 + var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; // L: 3335 + ApproximateRouteStrategy.sceneMinimapSprite.setRaster(); // L: 3336 + + int var6; + for (var5 = 1; var5 < 103; ++var5) { // L: 3337 + for (var6 = 1; var6 < 103; ++var6) { // L: 3338 + if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { // L: 3339 + ChatChannel.drawObject(var0, var6, var5, var3, var4); + } + + if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { // L: 3340 + ChatChannel.drawObject(var0 + 1, var6, var5, var3, var4); + } + } + } + + Client.mapIconCount = 0; // L: 3343 + + for (var5 = 0; var5 < 104; ++var5) { // L: 3344 + for (var6 = 0; var6 < 104; ++var6) { // L: 3345 + long var7 = ScriptEvent.scene.getFloorDecorationTag(Huffman.Client_plane, var5, var6); // L: 3346 + if (0L != var7) { // L: 3347 + int var9 = UserComparator9.Entity_unpackID(var7); // L: 3348 + int var10 = MidiPcmStream.getObjectDefinition(var9).mapIconId; // L: 3349 + if (var10 >= 0) { // L: 3350 + Client.mapIcons[Client.mapIconCount] = WorldMapSection0.WorldMapElement_get(var10).getSpriteBool(false); // L: 3351 + Client.mapIconXs[Client.mapIconCount] = var5; // L: 3352 + Client.mapIconYs[Client.mapIconCount] = var6; // L: 3353 + ++Client.mapIconCount; // L: 3354 + } + } + } + } + + WorldMapSprite.rasterProvider.apply(); // L: 3359 + } + + } // L: 3362 } diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 8da4b580a0..e86f896a10 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -1,39 +1,47 @@ +import java.io.File; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("af") +@ObfuscatedName("az") @Implements("AbstractWorldMapIcon") public abstract class AbstractWorldMapIcon { - @ObfuscatedName("es") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lfa;" ) - @Export("archive17") - static Archive archive17; - @ObfuscatedName("n") + @Export("clock") + static Clock clock; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "[Lls;" + ) + @Export("worldSelectFlagSprites") + static IndexedSprite[] worldSelectFlagSprites; + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lhg;" ) @Export("coord2") public final Coord coord2; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Lhg;" ) @Export("coord1") public final Coord coord1; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -702767977 + intValue = 857445445 ) @Export("screenX") int screenX; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 2041834837 + intValue = -161924757 ) @Export("screenY") int screenY; @@ -42,171 +50,186 @@ public abstract class AbstractWorldMapIcon { descriptor = "(Lhg;Lhg;)V" ) AbstractWorldMapIcon(Coord var1, Coord var2) { - this.coord1 = var1; - this.coord2 = var2; - } + this.coord1 = var1; // L: 13 + this.coord2 = var2; // L: 14 + } // L: 15 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-1613828162" ) @Export("getElement") public abstract int getElement(); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)Lar;", - garbageValue = "35" + descriptor = "(I)Laq;", + garbageValue = "499378708" ) @Export("getLabel") abstract WorldMapLabel getLabel(); - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1804331962" + garbageValue = "182515130" ) @Export("getSubWidth") abstract int getSubWidth(); - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1265869629" + garbageValue = "-2001682063" ) @Export("getSubHeight") abstract int getSubHeight(); - @ObfuscatedName("t") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "422348755" + garbageValue = "1932387399" ) @Export("fitsScreen") boolean fitsScreen(int var1, int var2) { - if (this.elementFitsScreen(var1, var2)) { - return true; + if (this.elementFitsScreen(var1, var2)) { // L: 18 + return true; // L: 19 } else { - return this.labelFitsScreen(var1, var2); + return this.labelFitsScreen(var1, var2); // L: 21 } } - @ObfuscatedName("x") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "807957820" + garbageValue = "-446281234" ) @Export("hasValidElement") boolean hasValidElement() { return this.getElement() >= 0; } - @ObfuscatedName("ah") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "872444562" + descriptor = "(IIB)Z", + garbageValue = "-125" ) @Export("elementFitsScreen") boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; } else { - WorldMapElement var3 = Client.WorldMapElement_get(this.getElement()); - int var4 = this.getSubWidth(); - int var5 = this.getSubHeight(); + WorldMapElement var3 = WorldMapSection0.WorldMapElement_get(this.getElement()); // L: 38 + int var4 = this.getSubWidth(); // L: 39 + int var5 = this.getSubHeight(); // L: 40 switch(var3.horizontalAlignment.value) { case 0: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { - break; - } - - return false; - case 1: - if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) { - break; - } - - return false; - case 2: - if (var1 <= this.screenX - var4 || var1 > this.screenX) { + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { // L: 44 return false; } - } - - switch(var3.verticalAlignment.value) { - case 0: - if (var2 >= this.screenY && var2 < var5 + this.screenY) { - break; - } - - return false; + break; case 1: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { + if (var1 <= this.screenX - var4 || var1 > this.screenX) { // L: 54 return false; } break; case 2: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { + if (var1 < this.screenX || var1 >= var4 + this.screenX) { // L: 49 return false; } } - return true; - } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "1" - ) - @Export("labelFitsScreen") - boolean labelFitsScreen(int var1, int var2) { - WorldMapLabel var3 = this.getLabel(); - if (var3 == null) { - return false; - } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { - return var2 >= this.screenY && var2 <= var3.height + this.screenY; - } else { - return false; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-288699605" - ) - public static void method687() { - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3181 != 0) { - ArchiveDiskActionHandler.field3181 = 1; - - try { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); - } catch (InterruptedException var3) { + switch(var3.verticalAlignment.value) { // L: 58 + case 0: + if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { // L: 61 + return false; + } + break; + case 1: + if (var2 <= this.screenY - var5 || var2 > this.screenY) { // L: 66 + return false; + } + break; + case 2: + if (var2 < this.screenY || var2 >= var5 + this.screenY) { // L: 71 + return false; } } + return true; // L: 75 } } - @ObfuscatedName("fk") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-886030498" + descriptor = "(III)Z", + garbageValue = "706174732" ) - @Export("queueSoundEffect") - static void queueSoundEffect(int var0, int var1, int var2) { - if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var0; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = 0; - ++Client.soundEffectCount; + @Export("labelFitsScreen") + boolean labelFitsScreen(int var1, int var2) { + WorldMapLabel var3 = this.getLabel(); // L: 79 + if (var3 == null) { // L: 80 + return false; // L: 81 + } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { // L: 83 + return var2 >= this.screenY && var2 <= this.screenY + var3.height; // L: 84 + } else { + return false; // L: 85 } + } + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)[Lcd;", + garbageValue = "1037177959" + ) + static AttackOption[] method679() { + return new AttackOption[]{AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_hidden, AttackOption.AttackOption_dependsOnCombatLevels, AttackOption.AttackOption_alwaysRightClick}; // L: 10925 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/io/File;", + garbageValue = "379993437" + ) + @Export("getFile") + static File getFile(String var0) { + if (!FileSystem.FileSystem_hasPermissions) { // L: 22 + throw new RuntimeException(""); + } else { + File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 25 + RandomAccessFile var3 = null; // L: 26 + + try { + File var4 = new File(var2.getParent()); // L: 28 + if (!var4.exists()) { // L: 29 + throw new RuntimeException(""); + } else { + var3 = new RandomAccessFile(var2, "rw"); // L: 30 + int var5 = var3.read(); // L: 31 + var3.seek(0L); // L: 32 + var3.write(var5); // L: 33 + var3.seek(0L); // L: 34 + var3.close(); // L: 35 + FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 36 + return var2; // L: 37 + } + } catch (Exception var8) { + try { + if (var3 != null) { // L: 41 + var3.close(); // L: 42 + var3 = null; // L: 43 + } + } catch (Exception var7) { // L: 46 + } + + throw new RuntimeException(); // L: 48 + } + } + } } } diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 862346b38c..bbf41ebc7a 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -12,128 +12,128 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("my") @Implements("AccessFile") public final class AccessFile { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("file") RandomAccessFile file; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 3349439872542127423L + longValue = 3150548694811435977L ) @Export("maxSize") final long maxSize; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = 253746605088017275L + longValue = -5153103964935494605L ) @Export("offset") long offset; public AccessFile(File var1, String var2, long var3) throws IOException { - if (var3 == -1L) { + if (-1L == var3) { // L: 11 var3 = Long.MAX_VALUE; } - if (var1.length() > var3) { - var1.delete(); + if (var1.length() > var3) { // L: 12 + var1.delete(); // L: 13 } - this.file = new RandomAccessFile(var1, var2); - this.maxSize = var3; - this.offset = 0L; - int var5 = this.file.read(); - if (var5 != -1 && !var2.equals("r")) { - this.file.seek(0L); - this.file.write(var5); + this.file = new RandomAccessFile(var1, var2); // L: 15 + this.maxSize = var3; // L: 16 + this.offset = 0L; // L: 17 + int var5 = this.file.read(); // L: 18 + if (var5 != -1 && !var2.equals("r")) { // L: 19 + this.file.seek(0L); // L: 20 + this.file.write(var5); // L: 21 } - this.file.seek(0L); - } + this.file.seek(0L); // L: 23 + } // L: 24 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("seek") final void seek(long var1) throws IOException { - this.file.seek(var1); - this.offset = var1; + this.file.seek(var1); // L: 27 + this.offset = var1; // L: 28 + } // L: 29 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "1923920098" + ) + @Export("write") + public final void write(byte[] var1, int var2, int var3) throws IOException { + if (this.offset + (long)var3 > this.maxSize) { // L: 32 + this.file.seek(this.maxSize); // L: 33 + this.file.write(1); // L: 34 + throw new EOFException(); // L: 35 + } else { + this.file.write(var1, var2, var3); // L: 37 + this.offset += (long)var3; // L: 38 + } + } // L: 39 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "53" + ) + @Export("close") + public final void close() throws IOException { + this.closeSync(false); // L: 42 + } // L: 43 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-152121757" + ) + @Export("closeSync") + public final void closeSync(boolean var1) throws IOException { + if (this.file != null) { // L: 46 + if (var1) { // L: 47 + try { + this.file.getFD().sync(); // L: 49 + } catch (SyncFailedException var3) { // L: 51 + } + } + + this.file.close(); // L: 53 + this.file = null; // L: 54 + } + + } // L: 56 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)J", + garbageValue = "-78" + ) + @Export("length") + public final long length() throws IOException { + return this.file.length(); // L: 59 } @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "239881906" - ) - @Export("write") - public final void write(byte[] var1, int var2, int var3) throws IOException { - if ((long)var3 + this.offset > this.maxSize) { - this.file.seek(this.maxSize); - this.file.write(1); - throw new EOFException(); - } else { - this.file.write(var1, var2, var3); - this.offset += (long)var3; - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1767391731" - ) - @Export("close") - public final void close() throws IOException { - this.closeSync(false); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "-19" - ) - @Export("closeSync") - public final void closeSync(boolean var1) throws IOException { - if (this.file != null) { - if (var1) { - try { - this.file.getFD().sync(); - } catch (SyncFailedException var3) { - } - } - - this.file.close(); - this.file = null; - } - - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "997596889" - ) - @Export("length") - public final long length() throws IOException { - return this.file.length(); - } - - @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "([BIII)I", - garbageValue = "-1991806699" + garbageValue = "-2147147589" ) @Export("read") public final int read(byte[] var1, int var2, int var3) throws IOException { - int var4 = this.file.read(var1, var2, var3); + int var4 = this.file.read(var1, var2, var3); // L: 63 if (var4 > 0) { - this.offset += (long)var4; + this.offset += (long)var4; // L: 64 } - return var4; + return var4; // L: 65 } protected void finalize() throws Throwable { - if (this.file != null) { - System.out.println(""); - this.close(); + if (this.file != null) { // L: 69 + System.out.println(""); // L: 70 + this.close(); // L: 71 } - } + } // L: 73 } diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java index 83a7831ec7..cd9ddc641f 100644 --- a/runescape-client/src/main/java/Actor.java +++ b/runescape-client/src/main/java/Actor.java @@ -3,623 +3,985 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cc") +@ObfuscatedName("cg") @Implements("Actor") public abstract class Actor extends Entity { @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 744009553 + intValue = -2072659501 ) @Export("x") int x; - @ObfuscatedName("ax") - @ObfuscatedGetter( - intValue = 2097901447 - ) - @Export("y") - int y; - @ObfuscatedName("ag") - @ObfuscatedGetter( - intValue = 2131261511 - ) - @Export("rotation") - int rotation; - @ObfuscatedName("ab") + @ObfuscatedName("an") @Export("isWalking") boolean isWalking; @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -2038697523 + intValue = 1621996049 ) - int field967; - @ObfuscatedName("ak") + @Export("y") + int y; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -316528469 + intValue = -572229331 + ) + @Export("rotation") + int rotation; + @ObfuscatedName("au") + @ObfuscatedGetter( + intValue = -1380153545 + ) + int field1014; + @ObfuscatedName("aa") + @ObfuscatedGetter( + intValue = 1649860163 ) @Export("playerCycle") int playerCycle; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -137751655 + intValue = -1340931717 ) @Export("idleSequence") int idleSequence; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1305511341 + intValue = 1622912625 ) @Export("turnLeftSequence") int turnLeftSequence; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -513548165 + intValue = 1928797643 ) @Export("turnRightSequence") int turnRightSequence; - @ObfuscatedName("ap") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -72649199 + intValue = 214300391 ) @Export("walkSequence") int walkSequence; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 379584779 + intValue = 1491970759 ) @Export("walkBackSequence") int walkBackSequence; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 186381867 + intValue = -433468795 ) @Export("walkLeftSequence") int walkLeftSequence; - @ObfuscatedName("ac") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1749182957 + intValue = -1020521095 ) @Export("walkRightSequence") int walkRightSequence; - @ObfuscatedName("av") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -966124115 + intValue = 1963413453 ) @Export("runSequence") int runSequence; - @ObfuscatedName("af") + @ObfuscatedName("az") @Export("overheadText") String overheadText; - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("isAutoChatting") boolean isAutoChatting; - @ObfuscatedName("aa") - boolean field979; - @ObfuscatedName("aw") + @ObfuscatedName("ai") + boolean field986; + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 447977523 + intValue = 885225201 ) @Export("overheadTextCyclesRemaining") int overheadTextCyclesRemaining; - @ObfuscatedName("az") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -825187417 + intValue = 592862521 ) @Export("overheadTextColor") int overheadTextColor; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = 674699849 + intValue = 231964227 ) @Export("overheadTextEffect") int overheadTextEffect; - @ObfuscatedName("au") + @ObfuscatedName("ak") @Export("hitSplatCount") byte hitSplatCount; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @Export("hitSplatTypes") int[] hitSplatTypes; - @ObfuscatedName("bk") + @ObfuscatedName("bl") @Export("hitSplatValues") int[] hitSplatValues; - @ObfuscatedName("bh") + @ObfuscatedName("bc") @Export("hitSplatCycles") int[] hitSplatCycles; - @ObfuscatedName("bg") + @ObfuscatedName("bz") @Export("hitSplatTypes2") int[] hitSplatTypes2; - @ObfuscatedName("be") + @ObfuscatedName("bj") @Export("hitSplatValues2") int[] hitSplatValues2; - @ObfuscatedName("bf") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Ljv;" ) @Export("healthBars") IterableNodeDeque healthBars; - @ObfuscatedName("ba") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -1028152459 + intValue = -1685554577 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("bd") + @ObfuscatedName("bg") @Export("false0") boolean false0; - @ObfuscatedName("bb") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 861621789 + intValue = 171916113 ) - int field992; - @ObfuscatedName("bw") + int field1000; + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = -1977710907 + intValue = 450756931 ) @Export("movementSequence") int movementSequence; - @ObfuscatedName("bq") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1631636501 + intValue = 1637238895 ) @Export("movementFrame") int movementFrame; - @ObfuscatedName("bn") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 1589742041 + intValue = 784527629 ) @Export("movementFrameCycle") int movementFrameCycle; - @ObfuscatedName("bc") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = -1536630843 + intValue = -218661123 ) @Export("sequence") int sequence; - @ObfuscatedName("bo") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -1208509489 + intValue = 1658984867 ) @Export("sequenceFrame") int sequenceFrame; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -739438903 + intValue = -1886437137 ) @Export("sequenceFrameCycle") int sequenceFrameCycle; @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -1247625137 + intValue = 1364114839 ) @Export("sequenceDelay") int sequenceDelay; - @ObfuscatedName("bl") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 2084373007 + intValue = -1619964879 ) - int field1000; - @ObfuscatedName("bv") + int field1009; + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 2084591071 + intValue = 1569897565 ) @Export("spotAnimation") int spotAnimation; - @ObfuscatedName("bi") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = 1471011659 + intValue = -475440643 ) @Export("spotAnimationFrame") int spotAnimationFrame; - @ObfuscatedName("bz") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = 337978883 + intValue = -822724081 ) @Export("spotAnimationFrameCycle") int spotAnimationFrameCycle; - @ObfuscatedName("bu") - @ObfuscatedGetter( - intValue = 1421591937 - ) - int field987; - @ObfuscatedName("bx") - @ObfuscatedGetter( - intValue = 541486383 - ) - int field1005; - @ObfuscatedName("br") - @ObfuscatedGetter( - intValue = -558534631 - ) - int field995; - @ObfuscatedName("bs") - @ObfuscatedGetter( - intValue = -1971586345 - ) - int field1007; @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 1672081961 + intValue = 1684193507 ) - int field1008; - @ObfuscatedName("bj") + int field1013; + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = -715675955 + intValue = 1581183769 ) - int field1009; + int field1003; + @ObfuscatedName("bk") + @ObfuscatedGetter( + intValue = 1750260439 + ) + int field997; + @ObfuscatedName("bv") + @ObfuscatedGetter( + intValue = 681617707 + ) + int field1015; + @ObfuscatedName("bf") + @ObfuscatedGetter( + intValue = 653700287 + ) + int field1016; @ObfuscatedName("bt") @ObfuscatedGetter( - intValue = 1514147523 + intValue = 1078271285 ) - int field966; - @ObfuscatedName("cc") + int field1017; + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 337308087 + intValue = -1924227991 ) - int field1011; - @ObfuscatedName("cb") + int field1026; + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -1718156865 + intValue = -1759966281 ) - int field1006; - @ObfuscatedName("ch") + int field1019; + @ObfuscatedName("ca") @ObfuscatedGetter( - intValue = -249207775 + intValue = -480648449 + ) + int field1027; + @ObfuscatedName("ct") + @ObfuscatedGetter( + intValue = -1077536781 ) @Export("npcCycle") int npcCycle; - @ObfuscatedName("cw") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = 1368163093 + intValue = -446174757 ) @Export("defaultHeight") int defaultHeight; - @ObfuscatedName("cz") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = 1251205823 + intValue = -1431847965 ) @Export("orientation") int orientation; - @ObfuscatedName("cg") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = 1694854685 + intValue = -813760125 ) - int field1016; + int field1024; @ObfuscatedName("cn") @ObfuscatedGetter( - intValue = 1077718703 + intValue = -2006946605 ) - int field1017; - @ObfuscatedName("ce") + int field1025; + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = 1769461271 + intValue = -775156313 ) @Export("pathLength") int pathLength; - @ObfuscatedName("cj") + @ObfuscatedName("cm") @Export("pathX") int[] pathX; - @ObfuscatedName("ck") + @ObfuscatedName("cu") @Export("pathY") int[] pathY; - @ObfuscatedName("cv") + @ObfuscatedName("cw") @Export("pathTraversed") byte[] pathTraversed; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @ObfuscatedGetter( - intValue = -706356397 + intValue = 829057405 ) - int field1022; - @ObfuscatedName("ci") + int field1032; + @ObfuscatedName("cc") @ObfuscatedGetter( - intValue = 318153573 + intValue = 1400209301 ) - int field1023; + int field973; Actor() { - this.isWalking = false; - this.field967 = 1; - this.idleSequence = -1; - this.turnLeftSequence = -1; - this.turnRightSequence = -1; - this.walkSequence = -1; - this.walkBackSequence = -1; - this.walkLeftSequence = -1; - this.walkRightSequence = -1; - this.runSequence = -1; - this.overheadText = null; - this.field979 = false; - this.overheadTextCyclesRemaining = 100; - this.overheadTextColor = 0; - this.overheadTextEffect = 0; - this.hitSplatCount = 0; - this.hitSplatTypes = new int[4]; - this.hitSplatValues = new int[4]; - this.hitSplatCycles = new int[4]; - this.hitSplatTypes2 = new int[4]; - this.hitSplatValues2 = new int[4]; - this.healthBars = new IterableNodeDeque(); - this.targetIndex = -1; - this.false0 = false; - this.field992 = -1; - this.movementSequence = -1; - this.movementFrame = 0; - this.movementFrameCycle = 0; - this.sequence = -1; - this.sequenceFrame = 0; - this.sequenceFrameCycle = 0; - this.sequenceDelay = 0; - this.field1000 = 0; - this.spotAnimation = -1; - this.spotAnimationFrame = 0; - this.spotAnimationFrameCycle = 0; - this.npcCycle = 0; - this.defaultHeight = 200; - this.field1016 = 0; - this.field1017 = 32; - this.pathLength = 0; - this.pathX = new int[10]; - this.pathY = new int[10]; - this.pathTraversed = new byte[10]; - this.field1022 = 0; - this.field1023 = 0; - } + this.isWalking = false; // L: 13 + this.field1014 = 1; // L: 14 + this.idleSequence = -1; // L: 16 + this.turnLeftSequence = -1; // L: 17 + this.turnRightSequence = -1; // L: 18 + this.walkSequence = -1; // L: 19 + this.walkBackSequence = -1; // L: 20 + this.walkLeftSequence = -1; // L: 21 + this.walkRightSequence = -1; // L: 22 + this.runSequence = -1; // L: 23 + this.overheadText = null; // L: 24 + this.field986 = false; // L: 26 + this.overheadTextCyclesRemaining = 100; // L: 27 + this.overheadTextColor = 0; // L: 28 + this.overheadTextEffect = 0; // L: 29 + this.hitSplatCount = 0; // L: 31 + this.hitSplatTypes = new int[4]; // L: 32 + this.hitSplatValues = new int[4]; // L: 33 + this.hitSplatCycles = new int[4]; // L: 34 + this.hitSplatTypes2 = new int[4]; // L: 35 + this.hitSplatValues2 = new int[4]; // L: 36 + this.healthBars = new IterableNodeDeque(); // L: 37 + this.targetIndex = -1; // L: 38 + this.false0 = false; // L: 39 + this.field1000 = -1; // L: 40 + this.movementSequence = -1; // L: 41 + this.movementFrame = 0; // L: 42 + this.movementFrameCycle = 0; // L: 43 + this.sequence = -1; // L: 44 + this.sequenceFrame = 0; // L: 45 + this.sequenceFrameCycle = 0; // L: 46 + this.sequenceDelay = 0; // L: 47 + this.field1009 = 0; // L: 48 + this.spotAnimation = -1; // L: 49 + this.spotAnimationFrame = 0; // L: 50 + this.spotAnimationFrameCycle = 0; // L: 51 + this.npcCycle = 0; // L: 61 + this.defaultHeight = 200; // L: 62 + this.field1024 = 0; // L: 64 + this.field1025 = 32; // L: 65 + this.pathLength = 0; // L: 66 + this.pathX = new int[10]; // L: 67 + this.pathY = new int[10]; // L: 68 + this.pathTraversed = new byte[10]; // L: 69 + this.field1032 = 0; // L: 70 + this.field973 = 0; // L: 71 + } // L: 73 - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "68470795" ) @Export("isVisible") boolean isVisible() { - return false; + return false; // L: 81 } - @ObfuscatedName("bg") + @ObfuscatedName("bc") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "78" + garbageValue = "-15" ) - final void method1810() { - this.pathLength = 0; - this.field1023 = 0; - } + final void method1797() { + this.pathLength = 0; // L: 76 + this.field973 = 0; // L: 77 + } // L: 78 - @ObfuscatedName("be") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(IIIIIII)V", - garbageValue = "-1007174032" + garbageValue = "733671711" ) @Export("addHitSplat") final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; - boolean var8 = true; + boolean var7 = true; // L: 85 + boolean var8 = true; // L: 86 int var9; - for (var9 = 0; var9 < 4; ++var9) { - if (this.hitSplatCycles[var9] > var5) { + for (var9 = 0; var9 < 4; ++var9) { // L: 87 + if (this.hitSplatCycles[var9] > var5) { // L: 88 var7 = false; } else { - var8 = false; + var8 = false; // L: 89 } } - var9 = -1; - int var10 = -1; - int var11 = 0; - if (var1 >= 0) { - HitSplatDefinition var13 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var1); - HitSplatDefinition var12; - if (var13 != null) { - var12 = var13; - } else { - byte[] var14 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var1); - var13 = new HitSplatDefinition(); - if (var14 != null) { - var13.decode(new Buffer(var14)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var13, (long)var1); - var12 = var13; - } - - var10 = var12.field3373; - var11 = var12.field3364; + var9 = -1; // L: 91 + int var10 = -1; // L: 92 + int var11 = 0; // L: 93 + if (var1 >= 0) { // L: 94 + HitSplatDefinition var12 = MusicPatchNode.method3929(var1); // L: 95 + var10 = var12.field3365; // L: 96 + var11 = var12.field3356; // L: 97 } - int var15; - if (var8) { - if (var10 == -1) { + int var14; + if (var8) { // L: 99 + if (var10 == -1) { // L: 100 return; } - var9 = 0; - var15 = 0; - if (var10 == 0) { - var15 = this.hitSplatCycles[0]; - } else if (var10 == 1) { - var15 = this.hitSplatValues[0]; + var9 = 0; // L: 101 + var14 = 0; // L: 102 + if (var10 == 0) { // L: 103 + var14 = this.hitSplatCycles[0]; + } else if (var10 == 1) { // L: 104 + var14 = this.hitSplatValues[0]; } - for (int var16 = 1; var16 < 4; ++var16) { - if (var10 == 0) { - if (this.hitSplatCycles[var16] < var15) { - var9 = var16; - var15 = this.hitSplatCycles[var16]; + for (int var13 = 1; var13 < 4; ++var13) { // L: 105 + if (var10 == 0) { // L: 106 + if (this.hitSplatCycles[var13] < var14) { // L: 107 + var9 = var13; // L: 108 + var14 = this.hitSplatCycles[var13]; // L: 109 } - } else if (var10 == 1 && this.hitSplatValues[var16] < var15) { - var9 = var16; - var15 = this.hitSplatValues[var16]; + } else if (var10 == 1 && this.hitSplatValues[var13] < var14) { // L: 112 113 + var9 = var13; // L: 114 + var14 = this.hitSplatValues[var13]; // L: 115 } } - if (var10 == 1 && var15 >= var2) { + if (var10 == 1 && var14 >= var2) { // L: 119 return; } } else { - if (var7) { + if (var7) { // L: 122 this.hitSplatCount = 0; } - for (var15 = 0; var15 < 4; ++var15) { - byte var17 = this.hitSplatCount; - this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); - if (this.hitSplatCycles[var17] <= var5) { - var9 = var17; - break; + for (var14 = 0; var14 < 4; ++var14) { // L: 123 + byte var15 = this.hitSplatCount; // L: 124 + this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4); // L: 125 + if (this.hitSplatCycles[var15] <= var5) { // L: 126 + var9 = var15; // L: 127 + break; // L: 128 } } } - if (var9 >= 0) { - this.hitSplatTypes[var9] = var1; - this.hitSplatValues[var9] = var2; - this.hitSplatTypes2[var9] = var3; - this.hitSplatValues2[var9] = var4; - this.hitSplatCycles[var9] = var5 + var11 + var6; + if (var9 >= 0) { // L: 132 + this.hitSplatTypes[var9] = var1; // L: 133 + this.hitSplatValues[var9] = var2; // L: 134 + this.hitSplatTypes2[var9] = var3; // L: 135 + this.hitSplatValues2[var9] = var4; // L: 136 + this.hitSplatCycles[var9] = var5 + var11 + var6; // L: 137 } - } + } // L: 138 - @ObfuscatedName("bf") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(IIIIIII)V", - garbageValue = "-680285813" + descriptor = "(IIIIIIB)V", + garbageValue = "-47" ) @Export("addHealthBar") final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) { - HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1); - HealthBarDefinition var7; - if (var8 != null) { - var7 = var8; - } else { - byte[] var9 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var1); - var8 = new HealthBarDefinition(); - if (var9 != null) { - var8.decode(new Buffer(var9)); + HealthBarDefinition var7 = class204.method3780(var1); // L: 141 + HealthBar var8 = null; // L: 142 + HealthBar var9 = null; // L: 143 + int var10 = var7.int2; // L: 144 + int var11 = 0; // L: 145 + + HealthBar var12; + for (var12 = (HealthBar)this.healthBars.last(); var12 != null; var12 = (HealthBar)this.healthBars.previous()) { // L: 146 + ++var11; // L: 147 + if (var12.definition.field3314 == var7.field3314) { // L: 148 + var12.put(var2 + var4, var5, var6, var3); // L: 149 + return; // L: 150 } - HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1); - var7 = var8; - } - - var8 = var7; - HealthBar var14 = null; - HealthBar var10 = null; - int var11 = var7.int2; - int var12 = 0; - - HealthBar var13; - for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) { - ++var12; - if (var13.definition.field3312 == var8.field3312) { - var13.put(var2 + var4, var5, var6, var3); - return; + if (var12.definition.int1 <= var7.int1) { // L: 152 + var8 = var12; } - if (var13.definition.int1 <= var8.int1) { - var14 = var13; - } - - if (var13.definition.int2 > var11) { - var10 = var13; - var11 = var13.definition.int2; + if (var12.definition.int2 > var10) { // L: 153 + var9 = var12; // L: 154 + var10 = var12.definition.int2; // L: 155 } } - if (var10 != null || var12 < 4) { - var13 = new HealthBar(var8); - if (var14 == null) { - this.healthBars.addLast(var13); + if (var9 != null || var11 < 4) { // L: 158 + var12 = new HealthBar(var7); // L: 159 + if (var8 == null) { // L: 160 + this.healthBars.addLast(var12); } else { - IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14); + IterableNodeDeque.IterableNodeDeque_addBefore(var12, var8); // L: 161 } - var13.put(var2 + var4, var5, var6, var3); - if (var12 >= 4) { - var10.remove(); + var12.put(var2 + var4, var5, var6, var3); // L: 162 + if (var11 >= 4) { // L: 163 + var9.remove(); } } - } + } // L: 164 - @ObfuscatedName("ba") + @ObfuscatedName("bh") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "43" + garbageValue = "-28" ) @Export("removeHealthBar") final void removeHealthBar(int var1) { - HealthBarDefinition var2 = LoginPacket.method3745(var1); + HealthBarDefinition var2 = class204.method3780(var1); // L: 167 - for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { - if (var2 == var3.definition) { - var3.remove(); - return; + for (HealthBar var3 = (HealthBar)this.healthBars.last(); var3 != null; var3 = (HealthBar)this.healthBars.previous()) { // L: 168 + if (var2 == var3.definition) { // L: 169 + var3.remove(); // L: 170 + return; // L: 171 } } - } + } // L: 174 - @ObfuscatedName("n") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lch;Lch;IZI)I", - garbageValue = "-1172543926" + descriptor = "(I)V", + garbageValue = "-1035211538" ) - @Export("compareWorlds") - static int compareWorlds(World var0, World var1, int var2, boolean var3) { - if (var2 == 1) { - int var4 = var0.population; - int var5 = var1.population; - if (!var3) { - if (var4 == -1) { - var4 = 2001; - } + public static void method1810() { + ObjectDefinition.ObjectDefinition_cached.clear(); // L: 416 + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); // L: 417 + ObjectDefinition.ObjectDefinition_cachedEntities.clear(); // L: 418 + ObjectDefinition.ObjectDefinition_cachedModels.clear(); // L: 419 + } // L: 420 - if (var5 == -1) { - var5 = 2001; - } - } - - return var4 - var5; - } else if (var2 == 2) { - return var0.location - var1.location; - } else if (var2 == 3) { - if (var0.activity.equals("-")) { - if (var1.activity.equals("-")) { - return 0; - } else { - return var3 ? -1 : 1; - } - } else if (var1.activity.equals("-")) { - return var3 ? 1 : -1; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "736101233" + ) + static int method1798(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.FRIEND_COUNT) { // L: 1913 + if (class60.friendSystem.field1099 == 0) { // L: 1914 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -2; + } else if (class60.friendSystem.field1099 == 1) { // L: 1915 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; } else { - return var0.activity.compareTo(var1.activity); + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class60.friendSystem.friendsList.getSize(); // L: 1916 } - } else if (var2 == 4) { - return var0.method1841() ? (var1.method1841() ? 0 : 1) : (var1.method1841() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1874() ? (var1.method1874() ? 0 : 1) : (var1.method1874() ? -1 : 0); - } else if (var2 == 6) { - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + + return 1; // L: 1917 } else { - return var0.id - var1.id; + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1920 + if (class60.friendSystem.method1972() && var3 >= 0 && var3 < class60.friendSystem.friendsList.getSize()) { // L: 1921 + Friend var8 = (Friend)class60.friendSystem.friendsList.get(var3); // L: 1922 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var8.getName(); // L: 1923 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var8.getPreviousName(); // L: 1924 + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1927 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1928 + } + + return 1; // L: 1930 + } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1933 + if (class60.friendSystem.method1972() && var3 >= 0 && var3 < class60.friendSystem.friendsList.getSize()) { // L: 1934 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class60.friendSystem.friendsList.get(var3)).world; // L: 1935 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1937 + } + + return 1; // L: 1938 + } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1941 + if (class60.friendSystem.method1972() && var3 >= 0 && var3 < class60.friendSystem.friendsList.getSize()) { // L: 1942 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)class60.friendSystem.friendsList.get(var3)).rank; // L: 1943 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1945 + } + + return 1; // L: 1946 + } else { + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1949 + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1950 + class279.method5092(var5, var6); // L: 1951 + return 1; // L: 1952 + } else if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1955 + class60.friendSystem.addFriend(var5); // L: 1956 + return 1; // L: 1957 + } else if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1960 + class60.friendSystem.removeFriend(var5); // L: 1961 + return 1; // L: 1962 + } else if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1965 + class60.friendSystem.addIgnore(var5); // L: 1966 + return 1; // L: 1967 + } else if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1970 + class60.friendSystem.removeIgnore(var5); // L: 1971 + return 1; // L: 1972 + } else if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1975 + var5 = SecureRandomCallable.method1202(var5); // L: 1976 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class60.friendSystem.isFriended(new Username(var5, WorldMapAreaData.loginType), false) ? 1 : 0; // L: 1977 + return 1; // L: 1978 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (Entity.clanChat != null) { // L: 1981 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Entity.clanChat.name; // L: 1982 + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1984 + } + + return 1; // L: 1985 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (Entity.clanChat != null) { // L: 1988 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Entity.clanChat.getSize(); // L: 1989 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1991 + } + + return 1; // L: 1992 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1995 + if (Entity.clanChat != null && var3 < Entity.clanChat.getSize()) { // L: 1996 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Entity.clanChat.get(var3).getUsername().getName(); // L: 1997 + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1999 + } + + return 1; // L: 2000 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2003 + if (Entity.clanChat != null && var3 < Entity.clanChat.getSize()) { // L: 2004 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Entity.clanChat.get(var3)).getWorld(); // L: 2005 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2007 + } + + return 1; // L: 2008 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2011 + if (Entity.clanChat != null && var3 < Entity.clanChat.getSize()) { // L: 2012 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ((Buddy)Entity.clanChat.get(var3)).rank; // L: 2013 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2015 + } + + return 1; // L: 2016 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Entity.clanChat != null ? Entity.clanChat.minKick : 0; // L: 2019 + return 1; // L: 2020 + } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2023 + Frames.clanKickUser(var5); // L: 2024 + return 1; // L: 2025 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Entity.clanChat != null ? Entity.clanChat.rank * 996591213 * 253506405 : 0; // L: 2028 + return 1; // L: 2029 + } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2032 + MusicPatchNode.Clan_joinChat(var5); // L: 2033 + return 1; // L: 2034 + } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + AbstractByteArrayCopier.Clan_leaveChat(); // L: 2037 + return 1; // L: 2038 + } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!class60.friendSystem.method1972()) { // L: 2041 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class60.friendSystem.ignoreList.getSize(); // L: 2042 + } + + return 1; // L: 2043 + } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2046 + if (class60.friendSystem.method1972() && var3 >= 0 && var3 < class60.friendSystem.ignoreList.getSize()) { // L: 2047 + Ignored var4 = (Ignored)class60.friendSystem.ignoreList.get(var3); // L: 2048 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.getName(); // L: 2049 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.getPreviousName(); // L: 2050 + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2053 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2054 + } + + return 1; // L: 2056 + } else if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2059 + var5 = SecureRandomCallable.method1202(var5); // L: 2060 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class60.friendSystem.isIgnored(new Username(var5, WorldMapAreaData.loginType)) ? 1 : 0; // L: 2061 + return 1; // L: 2062 + } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2065 + if (Entity.clanChat != null && var3 < Entity.clanChat.getSize() && Entity.clanChat.get(var3).getUsername().equals(WorldMapLabelSize.localPlayer.username)) { // L: 2066 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2067 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2069 + } + + return 1; // L: 2070 + } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (Entity.clanChat != null && Entity.clanChat.owner != null) { // L: 2073 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Entity.clanChat.owner; // L: 2074 + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2076 + } + + return 1; // L: 2077 + } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2080 + if (Entity.clanChat != null && var3 < Entity.clanChat.getSize() && ((ClanMate)Entity.clanChat.get(var3)).isFriend()) { // L: 2081 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2082 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2084 + } + + return 1; // L: 2085 + } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { + if (var0 == 3628) { + class60.friendSystem.friendsList.removeComparator(); // L: 2096 + return 1; // L: 2097 + } else { + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2100 + class60.friendSystem.friendsList.addComparator(new UserComparator1(var7)); // L: 2101 + return 1; // L: 2102 + } else if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2105 + class60.friendSystem.friendsList.addComparator(new UserComparator2(var7)); // L: 2106 + return 1; // L: 2107 + } else if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2110 + class60.friendSystem.friendsList.addComparator(new UserComparator3(var7)); // L: 2111 + return 1; // L: 2112 + } else if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2115 + class60.friendSystem.friendsList.addComparator(new UserComparator4(var7)); // L: 2116 + return 1; // L: 2117 + } else if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2120 + class60.friendSystem.friendsList.addComparator(new UserComparator5(var7)); // L: 2121 + return 1; // L: 2122 + } else if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2125 + class60.friendSystem.friendsList.addComparator(new UserComparator6(var7)); // L: 2126 + return 1; // L: 2127 + } else if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2130 + class60.friendSystem.friendsList.addComparator(new UserComparator7(var7)); // L: 2131 + return 1; // L: 2132 + } else if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2135 + class60.friendSystem.friendsList.addComparator(new UserComparator8(var7)); // L: 2136 + return 1; // L: 2137 + } else if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2140 + class60.friendSystem.friendsList.addComparator(new UserComparator9(var7)); // L: 2141 + return 1; // L: 2142 + } else if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2145 + class60.friendSystem.friendsList.addComparator(new UserComparator10(var7)); // L: 2146 + return 1; // L: 2147 + } else if (var0 == 3639) { + class60.friendSystem.friendsList.sort(); // L: 2150 + return 1; // L: 2151 + } else if (var0 == 3640) { + class60.friendSystem.ignoreList.removeComparator(); // L: 2154 + return 1; // L: 2155 + } else if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2158 + class60.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); // L: 2159 + return 1; // L: 2160 + } else if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2163 + class60.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); // L: 2164 + return 1; // L: 2165 + } else if (var0 == 3643) { + class60.friendSystem.ignoreList.sort(); // L: 2168 + return 1; // L: 2169 + } else if (var0 == 3644) { + if (Entity.clanChat != null) { // L: 2172 + Entity.clanChat.removeComparator(); // L: 2173 + } + + return 1; // L: 2175 + } else if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2178 + if (Entity.clanChat != null) { // L: 2179 + Entity.clanChat.addComparator(new UserComparator1(var7)); // L: 2180 + } + + return 1; // L: 2182 + } else if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2185 + if (Entity.clanChat != null) { // L: 2186 + Entity.clanChat.addComparator(new UserComparator2(var7)); // L: 2187 + } + + return 1; // L: 2189 + } else if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2192 + if (Entity.clanChat != null) { // L: 2193 + Entity.clanChat.addComparator(new UserComparator3(var7)); // L: 2194 + } + + return 1; // L: 2196 + } else if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2199 + if (Entity.clanChat != null) { // L: 2200 + Entity.clanChat.addComparator(new UserComparator4(var7)); // L: 2201 + } + + return 1; // L: 2203 + } else if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2206 + if (Entity.clanChat != null) { // L: 2207 + Entity.clanChat.addComparator(new UserComparator5(var7)); // L: 2208 + } + + return 1; // L: 2210 + } else if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2213 + if (Entity.clanChat != null) { // L: 2214 + Entity.clanChat.addComparator(new UserComparator6(var7)); // L: 2215 + } + + return 1; // L: 2217 + } else if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2220 + if (Entity.clanChat != null) { // L: 2221 + Entity.clanChat.addComparator(new UserComparator7(var7)); // L: 2222 + } + + return 1; // L: 2224 + } else if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2227 + if (Entity.clanChat != null) { // L: 2228 + Entity.clanChat.addComparator(new UserComparator8(var7)); // L: 2229 + } + + return 1; // L: 2231 + } else if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2234 + if (Entity.clanChat != null) { // L: 2235 + Entity.clanChat.addComparator(new UserComparator9(var7)); // L: 2236 + } + + return 1; // L: 2238 + } else if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2241 + if (Entity.clanChat != null) { // L: 2242 + Entity.clanChat.addComparator(new UserComparator10(var7)); // L: 2243 + } + + return 1; // L: 2245 + } else if (var0 == 3655) { + if (Entity.clanChat != null) { // L: 2248 + Entity.clanChat.sort(); // L: 2249 + } + + return 1; // L: 2251 + } else if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2254 + class60.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); // L: 2255 + return 1; // L: 2256 + } else if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2259 + if (Entity.clanChat != null) { // L: 2260 + Entity.clanChat.addComparator(new BuddyRankComparator(var7)); // L: 2261 + } + + return 1; // L: 2263 + } else { + return 2; // L: 2265 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2088 + if (Entity.clanChat != null && var3 < Entity.clanChat.getSize() && ((ClanMate)Entity.clanChat.get(var3)).isIgnored()) { // L: 2089 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 2090 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2092 + } + + return 1; // L: 2093 + } + } } } - @ObfuscatedName("aj") + @ObfuscatedName("fx") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "46" + descriptor = "(B)V", + garbageValue = "-48" ) - static int method1822(byte[] var0, int var1, int var2) { - int var3 = -1; + static final void method1805() { + class2.method41(); // L: 2529 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); // L: 2531 + KitDefinition.KitDefinition_cached.clear(); // L: 2534 + method1810(); // L: 2536 + NPCDefinition.NpcDefinition_cached.clear(); // L: 2538 + NPCDefinition.NpcDefinition_cachedModels.clear(); // L: 2539 + GameObject.method3412(); // L: 2541 + SequenceDefinition.SequenceDefinition_cached.clear(); // L: 2543 + SequenceDefinition.SequenceDefinition_cachedFrames.clear(); // L: 2544 + SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); // L: 2547 + SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); // L: 2548 + NetSocket.method3626(); // L: 2550 + GrandExchangeEvents.method143(); // L: 2551 + HitSplatDefinition.HitSplatDefinition_cached.clear(); // L: 2553 + HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); // L: 2554 + HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); // L: 2555 + HealthBarDefinition.HealthBarDefinition_cached.clear(); // L: 2558 + HealthBarDefinition.HealthBarDefinition_cachedSprites.clear(); // L: 2559 + ArchiveDiskAction.method4233(); // L: 2561 + CollisionMap.method3653(); // L: 2562 + Varps.method4066(); // L: 2563 + PlayerAppearance.PlayerAppearance_cachedModels.clear(); // L: 2565 + SecureRandomCallable.method1203(); // L: 2567 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2568 + Script.Script_cached.clear(); // L: 2569 + class182.archive0.clearFiles(); // L: 2570 + Client.archive1.clearFiles(); // L: 2571 + WorldMapID.archive3.clearFiles(); // L: 2572 + GrandExchangeOfferUnitPriceComparator.archive4.clearFiles(); // L: 2573 + WorldMapLabel.archive5.clearFiles(); // L: 2574 + CollisionMap.archive6.clearFiles(); // L: 2575 + WorldMapSection1.archive7.clearFiles(); // L: 2576 + Huffman.archive8.clearFiles(); // L: 2577 + UrlRequester.archive9.clearFiles(); // L: 2578 + Occluder.archive10.clearFiles(); // L: 2579 + GrandExchangeEvent.archive11.clearFiles(); // L: 2580 + ApproximateRouteStrategy.archive12.clearFiles(); // L: 2581 + } // L: 2582 + + @ObfuscatedName("fa") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-1341362245" + ) + @Export("drawLoadingMessage") + static final void drawLoadingMessage(String var0, boolean var1) { + if (Client.showLoadingMessages) { // L: 3963 + byte var2 = 4; // L: 3964 + int var3 = var2 + 6; // L: 3965 + int var4 = var2 + 6; // L: 3966 + int var5 = ItemDefinition.fontPlain12.lineWidth(var0, 250); // L: 3967 + int var6 = ItemDefinition.fontPlain12.lineCount(var0, 250) * 13; // L: 3968 + Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var2 + var6, 0); // L: 3969 + Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var2 + var5, var2 + var2 + var6, 16777215); // L: 3970 + ItemDefinition.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); // L: 3971 + int var7 = var3 - var2; // L: 3972 + int var8 = var4 - var2; // L: 3973 + int var9 = var5 + var2 + var2; // L: 3974 + int var10 = var2 + var6 + var2; // L: 3975 + + for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) { // L: 3977 + if (Client.rootWidgetXs[var11] + Client.rootWidgetWidths[var11] > var7 && Client.rootWidgetXs[var11] < var7 + var9 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var8 + var10) { // L: 3978 + Client.field882[var11] = true; + } + } + + if (var1) { // L: 3981 + WorldMapSprite.rasterProvider.drawFull(0, 0); // L: 3982 + } else { + HealthBarUpdate.method1817(var3, var4, var5, var6); // L: 3985 + } - for (int var4 = var1; var4 < var2; ++var4) { - var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; } - - var3 = ~var3; - return var3; - } + } // L: 3987 } diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index 05bd56c3fc..652aa2bc94 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -6,127 +6,127 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("es") @Implements("Animation") public class Animation { - @ObfuscatedName("m") - static int[] field1664; - @ObfuscatedName("o") - static int[] field1661; - @ObfuscatedName("q") - static int[] field1662; - @ObfuscatedName("j") - static int[] field1663; - @ObfuscatedName("p") + @ObfuscatedName("z") + static int[] field1659; + @ObfuscatedName("k") + static int[] field1658; + @ObfuscatedName("s") + static int[] field1667; + @ObfuscatedName("t") + static int[] field1660; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ler;" + descriptor = "Leh;" ) @Export("skeleton") Skeleton skeleton; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("transformCount") int transformCount; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("transformSkeletonLabels") int[] transformSkeletonLabels; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("transformXs") int[] transformXs; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("transformYs") int[] transformYs; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("transformZs") int[] transformZs; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("hasAlphaTransform") boolean hasAlphaTransform; static { - field1664 = new int[500]; - field1661 = new int[500]; - field1662 = new int[500]; - field1663 = new int[500]; + field1659 = new int[500]; // L: 8 + field1658 = new int[500]; // L: 9 + field1667 = new int[500]; // L: 10 + field1660 = new int[500]; // L: 11 } @ObfuscatedSignature( - descriptor = "([BLer;)V" + descriptor = "([BLeh;)V" ) Animation(byte[] var1, Skeleton var2) { - this.skeleton = null; - this.transformCount = -1; - this.hasAlphaTransform = false; - this.skeleton = var2; - Buffer var3 = new Buffer(var1); - Buffer var4 = new Buffer(var1); - var3.offset = 2; - int var5 = var3.readUnsignedByte(); - int var6 = -1; - int var7 = 0; - var4.offset = var5 + var3.offset; + this.skeleton = null; // L: 12 + this.transformCount = -1; // L: 13 + this.hasAlphaTransform = false; // L: 18 + this.skeleton = var2; // L: 21 + Buffer var3 = new Buffer(var1); // L: 22 + Buffer var4 = new Buffer(var1); // L: 23 + var3.offset = 2; // L: 24 + int var5 = var3.readUnsignedByte(); // L: 25 + int var6 = -1; // L: 26 + int var7 = 0; // L: 27 + var4.offset = var5 + var3.offset; // L: 28 int var8; - for (var8 = 0; var8 < var5; ++var8) { - int var9 = var3.readUnsignedByte(); - if (var9 > 0) { - if (this.skeleton.transformTypes[var8] != 0) { - for (int var10 = var8 - 1; var10 > var6; --var10) { - if (this.skeleton.transformTypes[var10] == 0) { - field1664[var7] = var10; - field1661[var7] = 0; - field1662[var7] = 0; - field1663[var7] = 0; - ++var7; + for (var8 = 0; var8 < var5; ++var8) { // L: 29 + int var9 = var3.readUnsignedByte(); // L: 30 + if (var9 > 0) { // L: 31 + if (this.skeleton.transformTypes[var8] != 0) { // L: 32 + for (int var10 = var8 - 1; var10 > var6; --var10) { // L: 33 + if (this.skeleton.transformTypes[var10] == 0) { // L: 34 + field1659[var7] = var10; // L: 35 + field1658[var7] = 0; // L: 36 + field1667[var7] = 0; // L: 37 + field1660[var7] = 0; // L: 38 + ++var7; // L: 39 break; } } } - field1664[var7] = var8; - short var11 = 0; - if (this.skeleton.transformTypes[var8] == 3) { + field1659[var7] = var8; // L: 44 + short var11 = 0; // L: 45 + if (this.skeleton.transformTypes[var8] == 3) { // L: 46 var11 = 128; } - if ((var9 & 1) != 0) { - field1661[var7] = var4.readShortSmart(); + if ((var9 & 1) != 0) { // L: 47 + field1658[var7] = var4.readShortSmart(); } else { - field1661[var7] = var11; + field1658[var7] = var11; // L: 48 } - if ((var9 & 2) != 0) { - field1662[var7] = var4.readShortSmart(); + if ((var9 & 2) != 0) { // L: 49 + field1667[var7] = var4.readShortSmart(); } else { - field1662[var7] = var11; + field1667[var7] = var11; // L: 50 } - if ((var9 & 4) != 0) { - field1663[var7] = var4.readShortSmart(); + if ((var9 & 4) != 0) { // L: 51 + field1660[var7] = var4.readShortSmart(); } else { - field1663[var7] = var11; + field1660[var7] = var11; // L: 52 } - var6 = var8; - ++var7; - if (this.skeleton.transformTypes[var8] == 5) { + var6 = var8; // L: 53 + ++var7; // L: 54 + if (this.skeleton.transformTypes[var8] == 5) { // L: 55 this.hasAlphaTransform = true; } } } - if (var1.length != var4.offset) { - throw new RuntimeException(); + if (var1.length != var4.offset) { // L: 58 + throw new RuntimeException(); // L: 59 } else { - this.transformCount = var7; - this.transformSkeletonLabels = new int[var7]; - this.transformXs = new int[var7]; - this.transformYs = new int[var7]; - this.transformZs = new int[var7]; + this.transformCount = var7; // L: 61 + this.transformSkeletonLabels = new int[var7]; // L: 62 + this.transformXs = new int[var7]; // L: 63 + this.transformYs = new int[var7]; // L: 64 + this.transformZs = new int[var7]; // L: 65 - for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field1664[var8]; - this.transformXs[var8] = field1661[var8]; - this.transformYs[var8] = field1662[var8]; - this.transformZs[var8] = field1663[var8]; + for (var8 = 0; var8 < var7; ++var8) { // L: 66 + this.transformSkeletonLabels[var8] = field1659[var8]; // L: 67 + this.transformXs[var8] = field1658[var8]; // L: 68 + this.transformYs[var8] = field1667[var8]; // L: 69 + this.transformZs[var8] = field1660[var8]; // L: 70 } } - } + } // L: 72 } diff --git a/runescape-client/src/main/java/ApproximateRouteStrategy.java b/runescape-client/src/main/java/ApproximateRouteStrategy.java index 1a2430dfae..261de77933 100644 --- a/runescape-client/src/main/java/ApproximateRouteStrategy.java +++ b/runescape-client/src/main/java/ApproximateRouteStrategy.java @@ -1,189 +1,164 @@ +import java.awt.FontMetrics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bs") +@ObfuscatedName("bv") @Implements("ApproximateRouteStrategy") public class ApproximateRouteStrategy extends RouteStrategy { - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 955958433 + @ObfuscatedName("qm") + @ObfuscatedSignature( + descriptor = "Llp;" ) - static int field630; - @ObfuscatedName("lp") - @ObfuscatedGetter( - intValue = -2033733379 + @Export("sceneMinimapSprite") + static Sprite sceneMinimapSprite; + @ObfuscatedName("an") + @Export("loginScreenFontMetrics") + static FontMetrics loginScreenFontMetrics; + @ObfuscatedName("dp") + @ObfuscatedSignature( + descriptor = "Liw;" ) - @Export("menuHeight") - static int menuHeight; + @Export("archive12") + static Archive archive12; ApproximateRouteStrategy() { - } + } // L: 10971 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIILfz;I)Z", - garbageValue = "-1966963917" + descriptor = "(IIILft;I)Z", + garbageValue = "-1274441547" ) @Export("hasArrived") protected boolean hasArrived(int var1, int var2, int var3, CollisionMap var4) { - return var2 == super.approxDestinationX && var3 == super.approxDestinationY; + return var2 == super.approxDestinationX && var3 == super.approxDestinationY; // L: 10974 } - @ObfuscatedName("ha") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lby;IIBI)V", - garbageValue = "-549376931" + descriptor = "(B)[Lix;", + garbageValue = "64" ) - static final void method1284(Player var0, int var1, int var2, byte var3) { - int var4 = var0.pathX[0]; - int var5 = var0.pathY[0]; - int var6 = var0.transformedSize(); - if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { - if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { - int var7 = Login.method2235(var4, var5, var0.transformedSize(), class52.method877(var1, var2), Client.collisionMaps[var0.plane], true, Client.field947, Client.field948); - if (var7 >= 1) { - for (int var8 = 0; var8 < var7 - 1; ++var8) { - var0.method1302(Client.field947[var8], Client.field948[var8], var3); + @Export("PlayerType_values") + public static PlayerType[] PlayerType_values() { + return new PlayerType[]{PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_playerModerator, PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal, PlayerType.field3131}; // L: 20 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "-1823919909" + ) + static int method1274(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.CC_CREATE) { // L: 430 + Interpreter.Interpreter_intStackSize -= 3; // L: 431 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 432 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 433 + int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 434 + if (var4 == 0) { // L: 435 + throw new RuntimeException(); // L: 436 + } else { + Widget var6 = TileItem.getWidget(var9); // L: 438 + if (var6.children == null) { // L: 439 + var6.children = new Widget[var11 + 1]; + } + + if (var6.children.length <= var11) { // L: 440 + Widget[] var7 = new Widget[var11 + 1]; // L: 441 + + for (int var8 = 0; var8 < var6.children.length; ++var8) { // L: 442 + var7[var8] = var6.children[var8]; } + var6.children = var7; // L: 443 + } + + if (var11 > 0 && var6.children[var11 - 1] == null) { // L: 445 + throw new RuntimeException("" + (var11 - 1)); + } else { + Widget var12 = new Widget(); // L: 446 + var12.type = var4; // L: 447 + var12.parentId = var12.id = var6.id; // L: 448 + var12.childIndex = var11; // L: 449 + var12.isIf3 = true; // L: 450 + var6.children[var11] = var12; // L: 451 + if (var2) { // L: 452 + Canvas.field438 = var12; + } else { + class3.field12 = var12; // L: 453 + } + + class52.invalidateWidget(var6); // L: 454 + return 1; // L: 455 } } - } - } - - @ObfuscatedName("hc") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", - garbageValue = "-63" - ) - @Export("insertMenuItem") - static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { - if (!Client.isMenuOpen) { - if (Client.menuOptionsCount < 500) { - Client.menuActions[Client.menuOptionsCount] = var0; - Client.menuTargets[Client.menuOptionsCount] = var1; - Client.menuOpcodes[Client.menuOptionsCount] = var2; - Client.menuIdentifiers[Client.menuOptionsCount] = var3; - Client.menuArguments1[Client.menuOptionsCount] = var4; - Client.menuArguments2[Client.menuOptionsCount] = var5; - Client.menuShiftClick[Client.menuOptionsCount] = var6; - ++Client.menuOptionsCount; - } - - } - } - - @ObfuscatedName("id") - @ObfuscatedSignature( - descriptor = "(Ljz;IIII)V", - garbageValue = "1974138271" - ) - @Export("addNpcToMenu") - static final void addNpcToMenu(NPCDefinition npcDef, int npcIdx, int sceneX, int sceneY) { - if (Client.menuOptionsCount < 400) { - if (npcDef.transforms != null) { - npcDef = npcDef.transform(); - } - - if (npcDef != null) { - if (npcDef.isInteractable) { - if (!npcDef.isFollower || Client.followerIndex == npcIdx) { - String npcName = npcDef.name; - if (npcDef.combatLevel != 0) { - npcName = npcName + Canvas.getColorForCombatDifference(npcDef.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + npcDef.combatLevel + ")"; - } - - if (npcDef.isFollower && Client.followerOpsLowPriority) { - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + npcName, 1003, npcIdx, sceneX, sceneY); - } - - if (Client.isItemSelected == 1) { - ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16776960) + npcName, 7, npcIdx, sceneX, sceneY); - } else if (Client.isSpellSelected) { - if ((WorldMapSprite.selectedSpellFlags & 2) == 2) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16776960) + npcName, 8, npcIdx, sceneX, sceneY); - } + } else { + Widget var3; + if (var0 == ScriptOpcodes.CC_DELETE) { // L: 457 + var3 = var2 ? Canvas.field438 : class3.field12; // L: 458 + Widget var10 = TileItem.getWidget(var3.id); // L: 459 + var10.children[var3.childIndex] = null; // L: 460 + class52.invalidateWidget(var10); // L: 461 + return 1; // L: 462 + } else if (var0 == ScriptOpcodes.CC_DELETEALL) { // L: 464 + var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 465 + var3.children = null; // L: 466 + class52.invalidateWidget(var3); // L: 467 + return 1; // L: 468 + } else if (var0 != ScriptOpcodes.CC_FIND) { // L: 470 + if (var0 == ScriptOpcodes.IF_FIND) { // L: 483 + var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 484 + if (var3 != null) { // L: 485 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 486 + if (var2) { // L: 487 + Canvas.field438 = var3; } else { - int flwrOffset = npcDef.isFollower && Client.followerOpsLowPriority ? 2000 : 0; - String[] actions = npcDef.actions; - int i; - int opcode; - if (actions != null) { - for (i = 4; i >= 0; --i) { - if (actions[i] != null && !actions[i].equalsIgnoreCase("Attack")) { - opcode = 0; - if (i == 0) { - opcode = flwrOffset + 9; - } - - if (i == 1) { - opcode = flwrOffset + 10; - } - - if (i == 2) { - opcode = flwrOffset + 11; - } - - if (i == 3) { - opcode = flwrOffset + 12; - } - - if (i == 4) { - opcode = flwrOffset + 13; - } - - ScriptEvent.insertMenuItemNoShift(actions[i], ItemContainer.colorStartTag(16776960) + npcName, opcode, npcIdx, sceneX, sceneY); - } - } - } - - if (actions != null) { - for (i = 4; i >= 0; --i) { - if (actions[i] != null && actions[i].equalsIgnoreCase("Attack")) { - short atkOffset = 0; - if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { - if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && npcDef.combatLevel > class60.localPlayer.combatLevel) { - atkOffset = 2000; - } - - opcode = 0; - if (i == 0) { - opcode = atkOffset + 9; - } - - if (i == 1) { - opcode = atkOffset + 10; - } - - if (i == 2) { - opcode = atkOffset + 11; - } - - if (i == 3) { - opcode = atkOffset + 12; - } - - if (i == 4) { - opcode = atkOffset + 13; - } - - ScriptEvent.insertMenuItemNoShift(actions[i], ItemContainer.colorStartTag(16776960) + npcName, opcode, npcIdx, sceneX, sceneY); - } - } - } - } - - if (!npcDef.isFollower || !Client.followerOpsLowPriority) { - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16776960) + npcName, 1003, npcIdx, sceneX, sceneY); - } + class3.field12 = var3; // L: 488 } - + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 490 } + + return 1; // L: 491 + } else { + return 2; // L: 493 } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 471 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 472 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 473 + Widget var5 = SecureRandomCallable.getWidgetChild(var9, var4); // L: 474 + if (var5 != null && var4 != -1) { // L: 475 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 476 + if (var2) { // L: 477 + Canvas.field438 = var5; + } else { + class3.field12 = var5; // L: 478 + } + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 480 + } + + return 1; // L: 481 } } } + + @ObfuscatedName("ia") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "1053633300" + ) + static String method1273(int var0) { + if (var0 < 0) { // L: 8283 + return ""; + } else { + return Client.menuTargets[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargets[var0] : Client.menuActions[var0]; // L: 8284 8285 + } + } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 8fdbd4d3cd..1d2a060c1c 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -5,384 +5,616 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ig") +@ObfuscatedName("iw") @Implements("Archive") public class Archive extends AbstractArchive { @ObfuscatedName("ao") @Export("Archive_crc") static CRC32 Archive_crc; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llz;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llz;" ) @Export("masterDisk") ArchiveDisk masterDisk; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1429609403 + intValue = -1943179967 ) @Export("index") int index; - @ObfuscatedName("f") - volatile boolean field3189; - @ObfuscatedName("ah") - boolean field3191; - @ObfuscatedName("ai") + @ObfuscatedName("e") + volatile boolean field3185; + @ObfuscatedName("ab") + boolean field3186; + @ObfuscatedName("ag") @Export("validGroups") volatile boolean[] validGroups; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1541564901 + intValue = 865644011 ) @Export("indexCrc") int indexCrc; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1294218015 + intValue = -193414103 ) @Export("indexVersion") int indexVersion; - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = -973433081 + intValue = 196080105 ) - int field3196; + int field3191; static { - Archive_crc = new CRC32(); + Archive_crc = new CRC32(); // L: 17 } @ObfuscatedSignature( - descriptor = "(Llp;Llp;IZZZ)V" + descriptor = "(Llz;Llz;IZZZ)V" ) public Archive(ArchiveDisk var1, ArchiveDisk var2, int var3, boolean var4, boolean var5, boolean var6) { - super(var4, var5); - this.field3189 = false; - this.field3191 = false; - this.field3196 = -1; - this.archiveDisk = var1; - this.masterDisk = var2; - this.index = var3; - this.field3191 = var6; - MusicPatchNode.method3968(this, this.index); - } + super(var4, var5); // L: 23 + this.field3185 = false; // L: 14 + this.field3186 = false; // L: 15 + this.field3191 = -1; // L: 20 + this.archiveDisk = var1; // L: 24 + this.masterDisk = var2; // L: 25 + this.index = var3; // L: 26 + this.field3186 = var6; // L: 27 + Widget.method4174(this, this.index); // L: 28 + } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "479482423" + garbageValue = "176946518" ) @Export("loadRegionFromGroup") void loadRegionFromGroup(int var1) { - int var2 = this.index; - long var3 = (long)((var2 << 16) + var1); - NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3); - if (var5 != null) { - NetCache.NetCache_pendingWritesQueue.addLast(var5); - } - + SecureRandomCallable.method1204(this.index, var1); } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "-1350822089" + garbageValue = "-21407020" ) @Export("groupLoadPercent") int groupLoadPercent(int var1) { - if (super.groups[var1] != null) { - return 100; - } else if (this.validGroups[var1]) { + if (super.groups[var1] != null) { // L: 200 return 100; } else { - int var3 = this.index; - long var4 = (long)((var3 << 16) + var1); - int var2; - if (PlayerType.NetCache_currentResponse != null && PlayerType.NetCache_currentResponse.key == var4) { - var2 = CollisionMap.NetCache_responseArchiveBuffer.offset * 99 / (CollisionMap.NetCache_responseArchiveBuffer.array.length - PlayerType.NetCache_currentResponse.padding) + 1; - } else { - var2 = 0; - } - - return var2; + return this.validGroups[var1] ? 100 : World.method1845(this.index, var1); // L: 201 202 } } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1560066319" + garbageValue = "450530880" ) @Export("loadGroup") void loadGroup(int var1) { - if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { - WorldMapCacheName.method688(var1, this.archiveDisk, this); + if (this.archiveDisk != null && this.validGroups != null && this.validGroups[var1]) { // L: 48 + ArchiveDisk var2 = this.archiveDisk; // L: 49 + byte[] var4 = null; // L: 52 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 53 + for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 54 + if (var6.key == (long)var1 && var2 == var6.archiveDisk && var6.type == 0) { // L: 55 + var4 = var6.data; // L: 56 + break; // L: 57 + } + } + } + + if (var4 != null) { // L: 61 + this.load(var2, var1, var4, true); // L: 62 + } else { + byte[] var5 = var2.read(var1); // L: 65 + this.load(var2, var1, var5, true); // L: 66 + } } else { - WorldMapEvent.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); + Varps.requestNetFile(this, this.index, var1, super.groupCrcs[var1], (byte)2, true); // L: 69 } - } + } // L: 70 - @ObfuscatedName("dr") + @ObfuscatedName("cy") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "6460755" + garbageValue = "-1735619365" ) - public boolean method4456() { - return this.field3189; + public boolean method4340() { + return this.field3185; // L: 32 } - @ObfuscatedName("di") + @ObfuscatedName("cb") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1538719165" + garbageValue = "-121154638" ) @Export("percentage") public int percentage() { - if (this.field3189) { + if (this.field3185) { // L: 36 return 100; - } else if (super.groups != null) { + } else if (super.groups != null) { // L: 37 return 99; } else { - int var2 = this.index; - long var3 = (long)(var2 + 16711680); - int var1; - if (PlayerType.NetCache_currentResponse != null && PlayerType.NetCache_currentResponse.key == var3) { - var1 = CollisionMap.NetCache_responseArchiveBuffer.offset * 99 / (CollisionMap.NetCache_responseArchiveBuffer.array.length - PlayerType.NetCache_currentResponse.padding) + 1; - } else { - var1 = 0; + int var1 = World.method1845(255, this.index); // L: 38 + if (var1 >= 100) { // L: 39 + var1 = 99; } - int var5 = var1; - if (var1 >= 100) { - var5 = 99; - } - - return var5; + return var1; // L: 40 } } - @ObfuscatedName("dp") + @ObfuscatedName("cl") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1870441691" + garbageValue = "1573806265" ) @Export("loadIndex") - public void loadIndex(int var1, int var2) { - this.indexCrc = var1; - this.indexVersion = var2; - if (this.masterDisk != null) { - WorldMapCacheName.method688(this.index, this.masterDisk, this); + void loadIndex(int var1, int var2) { + this.indexCrc = var1; // L: 73 + this.indexVersion = var2; // L: 74 + if (this.masterDisk != null) { // L: 75 + int var3 = this.index; // L: 76 + ArchiveDisk var4 = this.masterDisk; // L: 77 + byte[] var6 = null; // L: 80 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 81 + for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { // L: 82 + if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) { // L: 83 + var6 = var8.data; // L: 84 + break; // L: 85 + } + } + } + + if (var6 != null) { // L: 89 + this.load(var4, var3, var6, true); // L: 90 + } else { + byte[] var7 = var4.read(var3); // L: 93 + this.load(var4, var3, var7, true); // L: 94 + } } else { - WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); + Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 97 } - } + } // L: 98 - @ObfuscatedName("dc") + @ObfuscatedName("dx") @ObfuscatedSignature( - descriptor = "(I[BZZI)V", - garbageValue = "-1362503762" + descriptor = "(I[BZZB)V", + garbageValue = "-85" ) @Export("write") - public void write(int var1, byte[] var2, boolean var3, boolean var4) { - if (var3) { - if (this.field3189) { - throw new RuntimeException(); + void write(int var1, byte[] var2, boolean var3, boolean var4) { + if (var3) { // L: 101 + if (this.field3185) { // L: 102 + throw new RuntimeException(); // L: 103 } - if (this.masterDisk != null) { - SecureRandomFuture.method2270(this.index, var2, this.masterDisk); + if (this.masterDisk != null) { // L: 105 + Calendar.method4039(this.index, var2, this.masterDisk); } - this.decodeIndex(var2); - this.loadAllLocal(); + this.decodeIndex(var2); // L: 106 + this.loadAllLocal(); // L: 107 } else { - var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); - var2[var2.length - 1] = (byte)super.groupVersions[var1]; - if (this.archiveDisk != null) { - SecureRandomFuture.method2270(var1, var2, this.archiveDisk); - this.validGroups[var1] = true; + var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8); // L: 110 + var2[var2.length - 1] = (byte)super.groupVersions[var1]; // L: 111 + if (this.archiveDisk != null) { // L: 112 + ArchiveDisk var5 = this.archiveDisk; // L: 113 + ArchiveDiskAction var6 = new ArchiveDiskAction(); // L: 115 + var6.type = 0; // L: 116 + var6.key = (long)var1; // L: 117 + var6.data = var2; // L: 118 + var6.archiveDisk = var5; // L: 119 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 120 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var6); // L: 121 + } // L: 122 + + WorldMapArea.method415(); // L: 123 + this.validGroups[var1] = true; // L: 125 } - if (var4) { - super.groups[var1] = MenuAction.method2169(var2, false); + if (var4) { // L: 127 + super.groups[var1] = MenuAction.method2140(var2, false); } } - } + } // L: 129 - @ObfuscatedName("dt") + @ObfuscatedName("dq") @ObfuscatedSignature( - descriptor = "(Llp;I[BZI)V", - garbageValue = "416222280" + descriptor = "(Llz;I[BZI)V", + garbageValue = "-2086018580" ) @Export("load") void load(ArchiveDisk var1, int var2, byte[] var3, boolean var4) { int var5; - if (var1 == this.masterDisk) { - if (this.field3189) { - throw new RuntimeException(); + if (var1 == this.masterDisk) { // L: 132 + if (this.field3185) { // L: 133 + throw new RuntimeException(); // L: 134 } - if (var3 == null) { - WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; + if (var3 == null) { // L: 136 + Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 137 + return; // L: 138 } - Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length); - var5 = (int)Archive_crc.getValue(); - if (var5 != this.indexCrc) { - WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; + Archive_crc.reset(); // L: 140 + Archive_crc.update(var3, 0, var3.length); // L: 141 + var5 = (int)Archive_crc.getValue(); // L: 142 + if (var5 != this.indexCrc) { // L: 143 + Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 144 + return; // L: 145 } - Buffer var11 = new Buffer(Coord.decompressBytes(var3)); - int var12 = var11.readUnsignedByte(); - if (var12 != 5 && var12 != 6) { - throw new RuntimeException(var12 + "," + this.index + "," + var2); + Buffer var9 = new Buffer(DevicePcmPlayerProvider.decompressBytes(var3)); // L: 147 + int var7 = var9.readUnsignedByte(); // L: 148 + if (var7 != 5 && var7 != 6) { // L: 149 + throw new RuntimeException(var7 + "," + this.index + "," + var2); } - int var8 = 0; - if (var12 >= 6) { - var8 = var11.readInt(); + int var8 = 0; // L: 150 + if (var7 >= 6) { // L: 151 + var8 = var9.readInt(); } - if (var8 != this.indexVersion) { - WorldMapEvent.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); - return; + if (var8 != this.indexVersion) { // L: 152 + Varps.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true); // L: 153 + return; // L: 154 } - this.decodeIndex(var3); - this.loadAllLocal(); + this.decodeIndex(var3); // L: 156 + this.loadAllLocal(); // L: 157 } else { - if (!var4 && var2 == this.field3196) { - this.field3189 = true; + if (!var4 && var2 == this.field3191) { // L: 160 + this.field3185 = true; // L: 161 } - if (var3 == null || var3.length <= 2) { - this.validGroups[var2] = false; - if (this.field3191 || var4) { - WorldMapEvent.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + if (var3 == null || var3.length <= 2) { // L: 163 + this.validGroups[var2] = false; // L: 164 + if (this.field3186 || var4) { // L: 165 + Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; + return; // L: 166 } - Archive_crc.reset(); - Archive_crc.update(var3, 0, var3.length - 2); - var5 = (int)Archive_crc.getValue(); - int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); - if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { - this.validGroups[var2] = false; - if (this.field3191 || var4) { - WorldMapEvent.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); + Archive_crc.reset(); // L: 168 + Archive_crc.update(var3, 0, var3.length - 2); // L: 169 + var5 = (int)Archive_crc.getValue(); // L: 170 + int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255); // L: 171 + if (var5 != super.groupCrcs[var2] || var6 != super.groupVersions[var2]) { // L: 172 + this.validGroups[var2] = false; // L: 173 + if (this.field3186 || var4) { // L: 174 + Varps.requestNetFile(this, this.index, var2, super.groupCrcs[var2], (byte)2, var4); } - return; + return; // L: 175 } - this.validGroups[var2] = true; - if (var4) { - Object[] var7 = super.groups; - Object var9; - if (var3 == null) { - var9 = null; - } else if (var3.length > 136) { - DirectByteArrayCopier var10 = new DirectByteArrayCopier(); - var10.set(var3); - var9 = var10; - } else { - var9 = var3; - } - - var7[var2] = var9; + this.validGroups[var2] = true; // L: 177 + if (var4) { // L: 178 + super.groups[var2] = MenuAction.method2140(var3, false); } } - } + } // L: 180 - @ObfuscatedName("ds") + @ObfuscatedName("dv") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1106038504" + garbageValue = "-1665634170" ) @Export("loadAllLocal") void loadAllLocal() { - this.validGroups = new boolean[super.groups.length]; + this.validGroups = new boolean[super.groups.length]; // L: 183 int var1; - for (var1 = 0; var1 < this.validGroups.length; ++var1) { + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 184 this.validGroups[var1] = false; } - if (this.archiveDisk == null) { - this.field3189 = true; + if (this.archiveDisk == null) { // L: 185 + this.field3185 = true; // L: 186 } else { - this.field3196 = -1; + this.field3191 = -1; // L: 189 - for (var1 = 0; var1 < this.validGroups.length; ++var1) { - if (super.fileCounts[var1] > 0) { - class228.method4262(var1, this.archiveDisk, this); - this.field3196 = var1; + for (var1 = 0; var1 < this.validGroups.length; ++var1) { // L: 190 + if (super.fileCounts[var1] > 0) { // L: 191 + FaceNormal.method3388(var1, this.archiveDisk, this); // L: 192 + this.field3191 = var1; // L: 193 } } - if (this.field3196 == -1) { - this.field3189 = true; + if (this.field3191 == -1) { // L: 196 + this.field3185 = true; } } - } + } // L: 187 197 - @ObfuscatedName("dg") + @ObfuscatedName("dh") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "1634778176" + garbageValue = "1146197798" ) - public boolean method4460(int var1) { - return this.validGroups[var1]; + public boolean method4349(int var1) { + return this.validGroups[var1]; // L: 206 } - @ObfuscatedName("do") + @ObfuscatedName("dd") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-587516749" + garbageValue = "1915493362" ) - public boolean method4452(int var1) { - return this.getGroupFileIds(var1) != null; + public boolean method4350(int var1) { + return this.getGroupFileIds(var1) != null; // L: 210 } - @ObfuscatedName("dn") + @ObfuscatedName("db") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1037828577" + descriptor = "(B)I", + garbageValue = "-18" ) @Export("loadPercent") public int loadPercent() { - int var1 = 0; - int var2 = 0; + int var1 = 0; // L: 214 + int var2 = 0; // L: 215 int var3; - for (var3 = 0; var3 < super.groups.length; ++var3) { - if (super.fileCounts[var3] > 0) { - var1 += 100; - var2 += this.groupLoadPercent(var3); + for (var3 = 0; var3 < super.groups.length; ++var3) { // L: 216 + if (super.fileCounts[var3] > 0) { // L: 217 + var1 += 100; // L: 218 + var2 += this.groupLoadPercent(var3); // L: 219 } } - if (var1 == 0) { + if (var1 == 0) { // L: 222 return 100; } else { - var3 = var2 * 100 / var1; - return var3; + var3 = var2 * 100 / var1; // L: 223 + return var3; // L: 224 } } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(S)Lgb;", + garbageValue = "-18940" + ) + public static PacketBufferNode method4385() { + PacketBufferNode var0 = ItemContainer.method1226(); // L: 42 + var0.clientPacket = null; // L: 43 + var0.clientPacketLength = 0; // L: 44 + var0.packetBuffer = new PacketBuffer(5000); // L: 45 + return var0; // L: 46 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "961891121" + ) + public static boolean method4386(int var0) { + return (var0 >> 20 & 1) != 0; // L: 21 + } + + @ObfuscatedName("hx") + @ObfuscatedSignature( + descriptor = "(Lky;I)V", + garbageValue = "2129310615" + ) + static final void method4357(PacketBuffer var0) { + for (int var1 = 0; var1 < Client.field702; ++var1) { // L: 6858 + int var2 = Client.field721[var1]; // L: 6859 + NPC var3 = Client.npcs[var2]; // L: 6860 + int var4 = var0.readUnsignedByte(); // L: 6861 + int var5; + int var6; + int var7; + int var8; + if ((var4 & 128) != 0) { // L: 6862 + var5 = var0.method5639(); // L: 6863 + int var9; + int var10; + int var11; + if (var5 > 0) { // L: 6864 + for (var6 = 0; var6 < var5; ++var6) { // L: 6865 + var8 = -1; // L: 6867 + var9 = -1; // L: 6868 + var10 = -1; // L: 6869 + var7 = var0.readUShortSmart(); // L: 6870 + if (var7 == 32767) { // L: 6871 + var7 = var0.readUShortSmart(); // L: 6872 + var9 = var0.readUShortSmart(); // L: 6873 + var8 = var0.readUShortSmart(); // L: 6874 + var10 = var0.readUShortSmart(); // L: 6875 + } else if (var7 != 32766) { // L: 6877 + var9 = var0.readUShortSmart(); // L: 6878 + } else { + var7 = -1; // L: 6880 + } + + var11 = var0.readUShortSmart(); // L: 6881 + var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); // L: 6882 + } + } + + var6 = var0.readUnsignedByte(); // L: 6885 + if (var6 > 0) { // L: 6886 + for (var7 = 0; var7 < var6; ++var7) { // L: 6887 + var8 = var0.readUShortSmart(); // L: 6888 + var9 = var0.readUShortSmart(); // L: 6889 + if (var9 != 32767) { // L: 6890 + var10 = var0.readUShortSmart(); // L: 6891 + var11 = var0.method5612(); // L: 6892 + int var12 = var9 > 0 ? var0.method5639() : var11; // L: 6893 + var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); // L: 6894 + } else { + var3.removeHealthBar(var8); // L: 6896 + } + } + } + } + + if ((var4 & 16) != 0) { // L: 6900 + var3.targetIndex = var0.method5656(); // L: 6901 + if (var3.targetIndex == 65535) { // L: 6902 + var3.targetIndex = -1; + } + } + + if ((var4 & 8) != 0) { // L: 6904 + var3.field997 = var0.method5650(); // L: 6905 + var3.field1016 = var0.method5730(); // L: 6906 + var3.field1015 = var0.method5649(); // L: 6907 + var3.field1017 = var0.method5649(); // L: 6908 + var3.field1026 = var0.method5657() + Client.cycle; // L: 6909 + var3.field1019 = var0.method5657() + Client.cycle; // L: 6910 + var3.field1027 = var0.readUnsignedShort(); // L: 6911 + var3.pathLength = 1; // L: 6912 + var3.field973 = 0; // L: 6913 + var3.field997 += var3.pathX[0]; // L: 6914 + var3.field1016 += var3.pathY[0]; // L: 6915 + var3.field1015 += var3.pathX[0]; // L: 6916 + var3.field1017 += var3.pathY[0]; // L: 6917 + } + + if ((var4 & 2) != 0) { // L: 6919 + var3.definition = Skeleton.getNpcDefinition(var0.readUnsignedShort()); // L: 6920 + var3.field1014 = var3.definition.size; // L: 6921 + var3.field1025 = var3.definition.rotation; // L: 6922 + var3.walkSequence = var3.definition.walkSequence; // L: 6923 + var3.walkBackSequence = var3.definition.walkBackSequence; // L: 6924 + var3.walkLeftSequence = var3.definition.walkLeftSequence; // L: 6925 + var3.walkRightSequence = var3.definition.walkRightSequence; // L: 6926 + var3.idleSequence = var3.definition.idleSequence; // L: 6927 + var3.turnLeftSequence = var3.definition.turnLeftSequence; // L: 6928 + var3.turnRightSequence = var3.definition.turnRightSequence; // L: 6929 + } + + if ((var4 & 4) != 0) { // L: 6931 + var5 = var0.readUnsignedShort(); // L: 6932 + if (var5 == 65535) { // L: 6933 + var5 = -1; + } + + var6 = var0.method5639(); // L: 6934 + if (var5 == var3.sequence && var5 != -1) { // L: 6935 + var7 = WorldMapRegion.SequenceDefinition_get(var5).field3535; // L: 6936 + if (var7 == 1) { // L: 6937 + var3.sequenceFrame = 0; // L: 6938 + var3.sequenceFrameCycle = 0; // L: 6939 + var3.sequenceDelay = var6; // L: 6940 + var3.field1009 = 0; // L: 6941 + } + + if (var7 == 2) { // L: 6943 + var3.field1009 = 0; // L: 6944 + } + } else if (var5 == -1 || var3.sequence == -1 || WorldMapRegion.SequenceDefinition_get(var5).field3537 >= WorldMapRegion.SequenceDefinition_get(var3.sequence).field3537) { // L: 6947 + var3.sequence = var5; // L: 6948 + var3.sequenceFrame = 0; // L: 6949 + var3.sequenceFrameCycle = 0; // L: 6950 + var3.sequenceDelay = var6; // L: 6951 + var3.field1009 = 0; // L: 6952 + var3.field973 = var3.pathLength; // L: 6953 + } + } + + if ((var4 & 1) != 0) { // L: 6957 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 6958 + var3.overheadTextCyclesRemaining = 100; // L: 6959 + } + + if ((var4 & 32) != 0) { // L: 6961 + var3.spotAnimation = var0.method5655(); // L: 6962 + var5 = var0.method5678(); // L: 6963 + var3.field1003 = var5 >> 16; // L: 6964 + var3.field1013 = (var5 & 65535) + Client.cycle; // L: 6965 + var3.spotAnimationFrame = 0; // L: 6966 + var3.spotAnimationFrameCycle = 0; // L: 6967 + if (var3.field1013 > Client.cycle) { // L: 6968 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 6969 + var3.spotAnimation = -1; + } + } + + if ((var4 & 64) != 0) { // L: 6971 + var5 = var0.method5656(); // L: 6972 + var6 = var0.method5655(); // L: 6973 + var7 = var3.x - (var5 - WorldMapManager.baseX - WorldMapManager.baseX) * 64; // L: 6974 + var8 = var3.y - (var6 - WorldMapLabel.baseY - WorldMapLabel.baseY) * 64; // L: 6975 + if (var7 != 0 || var8 != 0) { // L: 6976 + var3.field1000 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; + } + } + } + + } // L: 6979 + + @ObfuscatedName("hc") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "-1501250507" + ) + static void method4383(int var0, String var1) { + int var2 = Players.Players_count; // L: 8057 + int[] var3 = Players.Players_indices; // L: 8058 + boolean var4 = false; // L: 8059 + Username var5 = new Username(var1, WorldMapAreaData.loginType); // L: 8060 + + for (int var6 = 0; var6 < var2; ++var6) { // L: 8061 + Player var7 = Client.players[var3[var6]]; // L: 8062 + if (var7 != null && var7 != WorldMapLabelSize.localPlayer && var7.username != null && var7.username.equals(var5)) { // L: 8063 + PacketBufferNode var8; + if (var0 == 1) { // L: 8064 + var8 = Client.getPacketBufferNode(ClientPacket.field2320, Client.packetWriter.isaacCipher); // L: 8066 + var8.packetBuffer.method5665(var3[var6]); // L: 8067 + var8.packetBuffer.method5644(0); // L: 8068 + Client.packetWriter.addNode(var8); // L: 8069 + } else if (var0 == 4) { // L: 8071 + var8 = Client.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); // L: 8073 + var8.packetBuffer.method5653(var3[var6]); // L: 8074 + var8.packetBuffer.writeIntME(0); // L: 8075 + Client.packetWriter.addNode(var8); // L: 8076 + } else if (var0 == 6) { // L: 8078 + var8 = Client.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); // L: 8080 + var8.packetBuffer.method5665(var3[var6]); // L: 8081 + var8.packetBuffer.writeIntME(0); // L: 8082 + Client.packetWriter.addNode(var8); // L: 8083 + } else if (var0 == 7) { // L: 8085 + var8 = Client.getPacketBufferNode(ClientPacket.field2343, Client.packetWriter.isaacCipher); // L: 8087 + var8.packetBuffer.writeIntME(0); // L: 8088 + var8.packetBuffer.method5654(var3[var6]); // L: 8089 + Client.packetWriter.addNode(var8); // L: 8090 + } + + var4 = true; // L: 8092 + break; + } + } + + if (!var4) { // L: 8096 + WorldMapRectangle.addGameMessage(4, "", "Unable to find " + var1); + } + + } // L: 8097 } diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index 64cee0d812..b9557bc50c 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -6,334 +6,341 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lp") +@ObfuscatedName("lz") @Implements("ArchiveDisk") public final class ArchiveDisk { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("ArchiveDisk_buffer") static byte[] ArchiveDisk_buffer; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmz;" ) @Export("datFile") BufferedFile datFile; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmz;" ) @Export("idxFile") BufferedFile idxFile; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -114633759 + intValue = 728284557 ) @Export("archive") int archive; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1458452341 + intValue = -669464675 ) @Export("maxEntrySize") int maxEntrySize; static { - ArchiveDisk_buffer = new byte[520]; + ArchiveDisk_buffer = new byte[520]; // L: 7 } @ObfuscatedSignature( - descriptor = "(ILmn;Lmn;I)V" + descriptor = "(ILmz;Lmz;I)V" ) public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) { - this.datFile = null; - this.idxFile = null; - this.maxEntrySize = 65000; - this.archive = var1; - this.datFile = var2; - this.idxFile = var3; - this.maxEntrySize = var4; - } + this.datFile = null; // L: 8 + this.idxFile = null; // L: 9 + this.maxEntrySize = 65000; // L: 11 + this.archive = var1; // L: 14 + this.datFile = var2; // L: 15 + this.idxFile = var3; // L: 16 + this.maxEntrySize = var4; // L: 17 + } // L: 18 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)[B", - garbageValue = "475820078" + garbageValue = "881928186" ) @Export("read") public byte[] read(int var1) { - synchronized(this.datFile) { + synchronized(this.datFile) { // L: 21 try { Object var10000; - if (this.idxFile.length() < (long)(var1 * 6 + 6)) { + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { // L: 23 var10000 = null; return (byte[])var10000; } else { - this.idxFile.seek((long)(var1 * 6)); - this.idxFile.read(ArchiveDisk_buffer, 0, 6); - int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); - int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); - if (var3 < 0 || var3 > this.maxEntrySize) { + this.idxFile.seek((long)(var1 * 6)); // L: 24 + this.idxFile.read(ArchiveDisk_buffer, 0, 6); // L: 25 + int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); // L: 26 + int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 27 + if (var3 < 0 || var3 > this.maxEntrySize) { // L: 28 var10000 = null; return (byte[])var10000; - } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { + } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { // L: 29 var10000 = null; return (byte[])var10000; } else { - byte[] var5 = new byte[var3]; - int var6 = 0; - int var7 = 0; + byte[] var5 = new byte[var3]; // L: 30 + int var6 = 0; // L: 31 - while (var6 < var3) { - if (var4 == 0) { + for (int var7 = 0; var6 < var3; ++var7) { // L: 32 33 65 + if (var4 == 0) { // L: 34 var10000 = null; return (byte[])var10000; } - this.datFile.seek(520L * (long)var4); - int var8 = var3 - var6; + this.datFile.seek((long)var4 * 520L); // L: 35 + int var8 = var3 - var6; // L: 36 int var9; int var10; int var11; int var12; byte var13; - if (var1 > 65535) { - if (var8 > 510) { + if (var1 > 65535) { // L: 42 + if (var8 > 510) { // L: 43 var8 = 510; } - var13 = 10; - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); - var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); - var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); - var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); - var12 = ArchiveDisk_buffer[9] & 255; + var13 = 10; // L: 44 + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 45 + var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 46 + var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 47 + var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); // L: 48 + var12 = ArchiveDisk_buffer[9] & 255; // L: 49 } else { - if (var8 > 512) { + if (var8 > 512) { // L: 52 var8 = 512; } - var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); - var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); - var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); - var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); - var12 = ArchiveDisk_buffer[7] & 255; + var13 = 8; // L: 53 + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); // L: 54 + var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 55 + var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 56 + var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 57 + var12 = ArchiveDisk_buffer[7] & 255; // L: 58 } - if (var9 == var1 && var7 == var10 && var12 == this.archive) { - if (var11 >= 0 && (long)var11 <= this.datFile.length() / 520L) { - int var14 = var8 + var13; - - for (int var15 = var13; var15 < var14; ++var15) { - var5[var6++] = ArchiveDisk_buffer[var15]; - } - - var4 = var11; - ++var7; - continue; - } - + if (var9 != var1 || var7 != var10 || var12 != this.archive) { // L: 60 var10000 = null; return (byte[])var10000; } - var10000 = null; - return (byte[])var10000; + if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { // L: 61 + var10000 = null; + return (byte[])var10000; + } + + int var14 = var13 + var8; // L: 62 + + for (int var15 = var13; var15 < var14; ++var15) { // L: 63 + var5[var6++] = ArchiveDisk_buffer[var15]; + } + + var4 = var11; // L: 64 } byte[] var20 = var5; - return var20; + return var20; // L: 67 } } - } catch (IOException var18) { - return null; + } catch (IOException var18) { // L: 69 + return null; // L: 70 } } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I[BIB)Z", - garbageValue = "3" + descriptor = "(I[BII)Z", + garbageValue = "749770493" ) @Export("write") public boolean write(int var1, byte[] var2, int var3) { - synchronized(this.datFile) { - if (var3 >= 0 && var3 <= this.maxEntrySize) { - boolean var5 = this.write0(var1, var2, var3, true); - if (!var5) { + synchronized(this.datFile) { // L: 76 + if (var3 >= 0 && var3 <= this.maxEntrySize) { // L: 77 + boolean var5 = this.write0(var1, var2, var3, true); // L: 80 + if (!var5) { // L: 81 var5 = this.write0(var1, var2, var3, false); } - return var5; + return var5; // L: 82 } else { - throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); + throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); // L: 78 } } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I[BIZS)Z", - garbageValue = "21116" + descriptor = "(I[BIZB)Z", + garbageValue = "-74" ) @Export("write0") boolean write0(int var1, byte[] var2, int var3, boolean var4) { - synchronized(this.datFile) { + synchronized(this.datFile) { // L: 87 try { int var6; boolean var10000; - if (var4) { - if (this.idxFile.length() < (long)(var1 * 6 + 6)) { + if (var4) { // L: 90 + if (this.idxFile.length() < (long)(var1 * 6 + 6)) { // L: 91 var10000 = false; return var10000; } - this.idxFile.seek((long)(var1 * 6)); - this.idxFile.read(ArchiveDisk_buffer, 0, 6); - var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); - if (var6 <= 0 || (long)var6 > this.datFile.length() / 520L) { + this.idxFile.seek((long)(var1 * 6)); // L: 92 + this.idxFile.read(ArchiveDisk_buffer, 0, 6); // L: 93 + var6 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 94 + if (var6 <= 0 || (long)var6 > this.datFile.length() / 520L) { // L: 95 var10000 = false; return var10000; } } else { - var6 = (int)((this.datFile.length() + 519L) / 520L); - if (var6 == 0) { + var6 = (int)((this.datFile.length() + 519L) / 520L); // L: 98 + if (var6 == 0) { // L: 99 var6 = 1; } } - ArchiveDisk_buffer[0] = (byte)(var3 >> 16); - ArchiveDisk_buffer[1] = (byte)(var3 >> 8); - ArchiveDisk_buffer[2] = (byte)var3; - ArchiveDisk_buffer[3] = (byte)(var6 >> 16); - ArchiveDisk_buffer[4] = (byte)(var6 >> 8); - ArchiveDisk_buffer[5] = (byte)var6; - this.idxFile.seek((long)(var1 * 6)); - this.idxFile.write(ArchiveDisk_buffer, 0, 6); - int var7 = 0; - int var8 = 0; + ArchiveDisk_buffer[0] = (byte)(var3 >> 16); // L: 101 + ArchiveDisk_buffer[1] = (byte)(var3 >> 8); // L: 102 + ArchiveDisk_buffer[2] = (byte)var3; // L: 103 + ArchiveDisk_buffer[3] = (byte)(var6 >> 16); // L: 104 + ArchiveDisk_buffer[4] = (byte)(var6 >> 8); // L: 105 + ArchiveDisk_buffer[5] = (byte)var6; // L: 106 + this.idxFile.seek((long)(var1 * 6)); // L: 107 + this.idxFile.write(ArchiveDisk_buffer, 0, 6); // L: 108 + int var7 = 0; // L: 109 + int var8 = 0; // L: 110 while (true) { - if (var7 < var3) { - label170: { - int var9 = 0; + if (var7 < var3) { // L: 111 + label171: { + int var9 = 0; // L: 112 int var10; - if (var4) { - this.datFile.seek(520L * (long)var6); + if (var4) { // L: 113 + this.datFile.seek(520L * (long)var6); // L: 114 int var11; int var12; - if (var1 > 65535) { + if (var1 > 65535) { // L: 118 try { - this.datFile.read(ArchiveDisk_buffer, 0, 10); - } catch (EOFException var17) { - break label170; + this.datFile.read(ArchiveDisk_buffer, 0, 10); // L: 120 + } catch (EOFException var17) { // L: 122 + break label171; // L: 123 } - var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); - var11 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); - var9 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); - var12 = ArchiveDisk_buffer[9] & 255; + var10 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 125 + var11 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); // L: 126 + var9 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); // L: 127 + var12 = ArchiveDisk_buffer[9] & 255; // L: 128 } else { try { - this.datFile.read(ArchiveDisk_buffer, 0, 8); - } catch (EOFException var16) { - break label170; + this.datFile.read(ArchiveDisk_buffer, 0, 8); // L: 132 + } catch (EOFException var16) { // L: 134 + break label171; // L: 135 } - var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); - var11 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); - var9 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); - var12 = ArchiveDisk_buffer[7] & 255; + var10 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); // L: 137 + var11 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); // L: 138 + var9 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); // L: 139 + var12 = ArchiveDisk_buffer[7] & 255; // L: 140 } - if (var10 != var1 || var8 != var11 || var12 != this.archive) { + if (var10 != var1 || var8 != var11 || var12 != this.archive) { // L: 142 var10000 = false; return var10000; } - if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) { + if (var9 < 0 || (long)var9 > this.datFile.length() / 520L) { // L: 143 var10000 = false; return var10000; } } - if (var9 == 0) { - var4 = false; - var9 = (int)((this.datFile.length() + 519L) / 520L); - if (var9 == 0) { + if (var9 == 0) { // L: 145 + var4 = false; // L: 146 + var9 = (int)((this.datFile.length() + 519L) / 520L); // L: 147 + if (var9 == 0) { // L: 148 ++var9; } - if (var9 == var6) { + if (var6 == var9) { // L: 149 ++var9; } } - if (var1 > 65535) { - if (var3 - var7 <= 510) { + if (var1 > 65535) { // L: 151 + if (var3 - var7 <= 510) { // L: 152 var9 = 0; } - ArchiveDisk_buffer[0] = (byte)(var1 >> 24); - ArchiveDisk_buffer[1] = (byte)(var1 >> 16); - ArchiveDisk_buffer[2] = (byte)(var1 >> 8); - ArchiveDisk_buffer[3] = (byte)var1; - ArchiveDisk_buffer[4] = (byte)(var8 >> 8); - ArchiveDisk_buffer[5] = (byte)var8; - ArchiveDisk_buffer[6] = (byte)(var9 >> 16); - ArchiveDisk_buffer[7] = (byte)(var9 >> 8); - ArchiveDisk_buffer[8] = (byte)var9; - ArchiveDisk_buffer[9] = (byte)this.archive; - this.datFile.seek((long)var6 * 520L); - this.datFile.write(ArchiveDisk_buffer, 0, 10); - var10 = var3 - var7; - if (var10 > 510) { + ArchiveDisk_buffer[0] = (byte)(var1 >> 24); // L: 153 + ArchiveDisk_buffer[1] = (byte)(var1 >> 16); // L: 154 + ArchiveDisk_buffer[2] = (byte)(var1 >> 8); // L: 155 + ArchiveDisk_buffer[3] = (byte)var1; // L: 156 + ArchiveDisk_buffer[4] = (byte)(var8 >> 8); // L: 157 + ArchiveDisk_buffer[5] = (byte)var8; // L: 158 + ArchiveDisk_buffer[6] = (byte)(var9 >> 16); // L: 159 + ArchiveDisk_buffer[7] = (byte)(var9 >> 8); // L: 160 + ArchiveDisk_buffer[8] = (byte)var9; // L: 161 + ArchiveDisk_buffer[9] = (byte)this.archive; // L: 162 + this.datFile.seek(520L * (long)var6); // L: 163 + this.datFile.write(ArchiveDisk_buffer, 0, 10); // L: 164 + var10 = var3 - var7; // L: 165 + if (var10 > 510) { // L: 166 var10 = 510; } - this.datFile.write(var2, var7, var10); - var7 += var10; + this.datFile.write(var2, var7, var10); // L: 167 + var7 += var10; // L: 168 } else { - if (var3 - var7 <= 512) { + if (var3 - var7 <= 512) { // L: 171 var9 = 0; } - ArchiveDisk_buffer[0] = (byte)(var1 >> 8); - ArchiveDisk_buffer[1] = (byte)var1; - ArchiveDisk_buffer[2] = (byte)(var8 >> 8); - ArchiveDisk_buffer[3] = (byte)var8; - ArchiveDisk_buffer[4] = (byte)(var9 >> 16); - ArchiveDisk_buffer[5] = (byte)(var9 >> 8); - ArchiveDisk_buffer[6] = (byte)var9; - ArchiveDisk_buffer[7] = (byte)this.archive; - this.datFile.seek(520L * (long)var6); - this.datFile.write(ArchiveDisk_buffer, 0, 8); - var10 = var3 - var7; - if (var10 > 512) { + ArchiveDisk_buffer[0] = (byte)(var1 >> 8); // L: 172 + ArchiveDisk_buffer[1] = (byte)var1; // L: 173 + ArchiveDisk_buffer[2] = (byte)(var8 >> 8); // L: 174 + ArchiveDisk_buffer[3] = (byte)var8; // L: 175 + ArchiveDisk_buffer[4] = (byte)(var9 >> 16); // L: 176 + ArchiveDisk_buffer[5] = (byte)(var9 >> 8); // L: 177 + ArchiveDisk_buffer[6] = (byte)var9; // L: 178 + ArchiveDisk_buffer[7] = (byte)this.archive; // L: 179 + this.datFile.seek(520L * (long)var6); // L: 180 + this.datFile.write(ArchiveDisk_buffer, 0, 8); // L: 181 + var10 = var3 - var7; // L: 182 + if (var10 > 512) { // L: 183 var10 = 512; } - this.datFile.write(var2, var7, var10); - var7 += var10; + this.datFile.write(var2, var7, var10); // L: 184 + var7 += var10; // L: 185 } - var6 = var9; - ++var8; - continue; + var6 = var9; // L: 187 + ++var8; // L: 188 + continue; // L: 189 } } - var10000 = true; + var10000 = true; // L: 190 return var10000; } - } catch (IOException var18) { - return false; + } catch (IOException var18) { // L: 192 + return false; // L: 193 } } } public String toString() { - return "" + this.archive; + return "" + this.archive; // L: 198 + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IIIIB)I", + garbageValue = "-60" + ) + static final int method5991(int var0, int var1, int var2, int var3) { + int var4 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var2 * 1024 / var3] >> 1; // L: 844 + return ((65536 - var4) * var0 >> 16) + (var4 * var1 >> 16); // L: 845 } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index 8da6094a02..12aaa9ef65 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -3,163 +3,207 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("in") +@ObfuscatedName("ig") @Implements("ArchiveDiskAction") public class ArchiveDiskAction extends Node { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -947897909 + intValue = 1337486671 ) @Export("type") int type; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("data") byte[] data; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llp;" + descriptor = "Llz;" ) @Export("archiveDisk") ArchiveDisk archiveDisk; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Liw;" ) @Export("archive") Archive archive; ArchiveDiskAction() { - } + } // L: 12 - @ObfuscatedName("p") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Lkb;II)Z", - garbageValue = "-1045128194" + descriptor = "(I)V", + garbageValue = "-1294779949" ) - @Export("updateExternalPlayer") - static boolean updateExternalPlayer(PacketBuffer var0, int var1) { - int var2 = var0.readBits(2); - int var3; - int var4; - int var7; - int var8; - int var9; - int var10; - if (var2 == 0) { - if (var0.readBits(1) != 0) { - updateExternalPlayer(var0, var1); - } + public static void method4233() { + StructDefinition.StructDefinition_cached.clear(); // L: 71 + } // L: 72 - var3 = var0.readBits(13); - var4 = var0.readBits(13); - boolean var12 = var0.readBits(1) == 1; - if (var12) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } - - if (Client.players[var1] != null) { - throw new RuntimeException(); - } else { - Player var6 = Client.players[var1] = new Player(); - var6.index = var1; - if (Players.field1279[var1] != null) { - var6.read(Players.field1279[var1]); - } - - var6.orientation = Players.Players_orientations[var1]; - var6.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var6.pathTraversed[0] = Players.field1278[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - class182.baseX, (var10 << 13) + var4 - SecureRandomFuture.baseY); - var6.field659 = false; - return true; - } - } else if (var2 == 1) { - var3 = var0.readBits(2); - var4 = Players.Players_regions[var1]; - Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); - return false; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "-1420745273" + ) + static int method4231(int var0, Script var1, boolean var2) { + int var6; + if (var0 == ScriptOpcodes.OC_NAME) { // L: 2736 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2737 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6).name; // L: 2738 + return 1; // L: 2739 } else { - int var5; - int var11; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var11 = Players.Players_regions[var1]; - var7 = (var11 >> 28) + var4 & 3; - var8 = var11 >> 14 & 255; - var9 = var11 & 255; - if (var5 == 0) { - --var8; - --var9; + int var4; + ItemDefinition var5; + if (var0 == ScriptOpcodes.OC_OP) { // L: 2741 + Interpreter.Interpreter_intStackSize -= 2; // L: 2742 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2743 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2744 + var5 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2745 + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { // L: 2746 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2747 } - if (var5 == 1) { - --var9; + return 1; // L: 2748 + } else if (var0 == ScriptOpcodes.OC_IOP) { // L: 2750 + Interpreter.Interpreter_intStackSize -= 2; // L: 2751 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2752 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2753 + var5 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2754 + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { // L: 2755 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2756 } - if (var5 == 2) { - ++var8; - --var9; - } - - if (var5 == 3) { - --var8; - } - - if (var5 == 4) { - ++var8; - } - - if (var5 == 5) { - --var8; - ++var9; - } - - if (var5 == 6) { - ++var9; - } - - if (var5 == 7) { - ++var8; - ++var9; - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); - return false; + return 1; // L: 2757 + } else if (var0 == ScriptOpcodes.OC_COST) { // L: 2759 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2760 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6).price; // L: 2761 + return 1; // L: 2762 + } else if (var0 == ScriptOpcodes.OC_STACKABLE) { // L: 2764 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2765 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6).isStackable == 1 ? 1 : 0; // L: 2766 + return 1; // L: 2767 } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var11 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var11 + var7 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; + ItemDefinition var7; + if (var0 == ScriptOpcodes.OC_CERT) { // L: 2769 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2770 + var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2771 + if (var7.noteTemplate == -1 && var7.note >= 0) { // L: 2772 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2773 + } + + return 1; // L: 2774 + } else if (var0 == ScriptOpcodes.OC_UNCERT) { // L: 2776 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2777 + var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2778 + if (var7.noteTemplate >= 0 && var7.note >= 0) { // L: 2779 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.note; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2780 + } + + return 1; // L: 2781 + } else if (var0 == ScriptOpcodes.OC_MEMBERS) { // L: 2783 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2784 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6).isMembersOnly ? 1 : 0; // L: 2785 + return 1; // L: 2786 + } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { // L: 2788 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2789 + var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2790 + if (var7.placeholderTemplate == -1 && var7.placeholder >= 0) { // L: 2791 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2792 + } + + return 1; // L: 2793 + } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { // L: 2795 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2796 + var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 2797 + if (var7.placeholderTemplate >= 0 && var7.placeholder >= 0) { // L: 2798 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.placeholder; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6; // L: 2799 + } + + return 1; // L: 2800 + } else if (var0 == ScriptOpcodes.OC_FIND) { // L: 2802 + String var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2803 + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2804 + findItemDefinitions(var3, var4 == 1); // L: 2805 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class204.foundItemIdCount; // L: 2806 + return 1; // L: 2807 + } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { // L: 2809 + if (var0 == ScriptOpcodes.OC_FINDRESET) { // L: 2814 + ScriptEvent.foundItemIndex = 0; // L: 2815 + return 1; // L: 2816 + } else { + return 2; // L: 2818 + } + } else { + if (Messages.foundItemIds != null && ScriptEvent.foundItemIndex < class204.foundItemIdCount) { // L: 2810 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Messages.foundItemIds[++ScriptEvent.foundItemIndex - 1] & '\uffff'; // L: 2811 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } + + return 1; // L: 2812 + } } } } - @ObfuscatedName("js") + @ObfuscatedName("kb") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-418956614" + descriptor = "(Ljava/lang/String;ZI)V", + garbageValue = "-1075762777" ) - static boolean method4302(int var0) { - for (int var1 = 0; var1 < Client.field894; ++var1) { - if (Client.field896[var1] == var0) { - return true; + @Export("findItemDefinitions") + static void findItemDefinitions(String var0, boolean var1) { + var0 = var0.toLowerCase(); // L: 10783 + short[] var2 = new short[16]; // L: 10784 + int var3 = 0; // L: 10785 + + for (int var4 = 0; var4 < class227.ItemDefinition_fileCount; ++var4) { // L: 10786 + ItemDefinition var9 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var4); // L: 10787 + if ((!var1 || var9.isTradable) && var9.noteTemplate == -1 && var9.name.toLowerCase().indexOf(var0) != -1) { // L: 10788 10789 10790 + if (var3 >= 250) { // L: 10791 + class204.foundItemIdCount = -1; // L: 10792 + Messages.foundItemIds = null; // L: 10793 + return; // L: 10794 + } + + if (var3 >= var2.length) { // L: 10796 + short[] var6 = new short[var2.length * 2]; // L: 10797 + + for (int var7 = 0; var7 < var3; ++var7) { // L: 10798 + var6[var7] = var2[var7]; + } + + var2 = var6; // L: 10799 + } + + var2[var3++] = (short)var4; // L: 10801 } } - return false; - } + Messages.foundItemIds = var2; // L: 10803 + ScriptEvent.foundItemIndex = 0; // L: 10804 + class204.foundItemIdCount = var3; // L: 10805 + String[] var8 = new String[class204.foundItemIdCount]; // L: 10806 + + for (int var5 = 0; var5 < class204.foundItemIdCount; ++var5) { // L: 10807 + var8[var5] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var2[var5]).name; + } + + short[] var10 = Messages.foundItemIds; // L: 10808 + class69.sortItemsByName(var8, var10, 0, var8.length - 1); // L: 10810 + } // L: 10812 } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index 9c25cc3e40..42df45e833 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -7,34 +7,37 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ip") @Implements("ArchiveDiskActionHandler") public class ArchiveDiskActionHandler implements Runnable { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("ArchiveDiskActionHandler_requestQueue") static NodeDeque ArchiveDiskActionHandler_requestQueue; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("ArchiveDiskActionHandler_responseQueue") static NodeDeque ArchiveDiskActionHandler_responseQueue; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 608159891 + intValue = 1967146285 ) - static int field3181; - @ObfuscatedName("j") + public static int field3179; + @ObfuscatedName("i") @Export("ArchiveDiskActionHandler_lock") - static Object ArchiveDiskActionHandler_lock; - @ObfuscatedName("p") - @Export("ArchiveDiskActionHandler_thread") - static Thread ArchiveDiskActionHandler_thread; + public static Object ArchiveDiskActionHandler_lock; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + @Export("worldSelectRightSprite") + static IndexedSprite worldSelectRightSprite; static { - ArchiveDiskActionHandler_requestQueue = new NodeDeque(); - ArchiveDiskActionHandler_responseQueue = new NodeDeque(); - field3181 = 0; + ArchiveDiskActionHandler_requestQueue = new NodeDeque(); // L: 9 + ArchiveDiskActionHandler_responseQueue = new NodeDeque(); // L: 10 + field3179 = 0; ArchiveDiskActionHandler_lock = new Object(); } @@ -45,147 +48,95 @@ public class ArchiveDiskActionHandler implements Runnable { try { while (true) { ArchiveDiskAction var1; - synchronized(ArchiveDiskActionHandler_requestQueue) { - var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); - } + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 68 + var1 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last(); // L: 69 + } // L: 70 - if (var1 != null) { - if (var1.type == 0) { - var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); - synchronized(ArchiveDiskActionHandler_requestQueue) { - var1.remove(); - } - } else if (var1.type == 1) { - var1.data = var1.archiveDisk.read((int)var1.key); - synchronized(ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler_responseQueue.addFirst(var1); - } + if (var1 != null) { // L: 71 + if (var1.type == 0) { // L: 72 + var1.archiveDisk.write((int)var1.key, var1.data, var1.data.length); // L: 73 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 74 + var1.remove(); // L: 75 + } // L: 76 + } else if (var1.type == 1) { // L: 78 + var1.data = var1.archiveDisk.read((int)var1.key); // L: 79 + synchronized(ArchiveDiskActionHandler_requestQueue) { // L: 80 + ArchiveDiskActionHandler_responseQueue.addFirst(var1); // L: 81 + } // L: 82 } - synchronized(ArchiveDiskActionHandler_lock) { - if (field3181 <= 1) { - field3181 = 0; - ArchiveDiskActionHandler_lock.notifyAll(); - return; + synchronized(ArchiveDiskActionHandler_lock) { // L: 84 + if (field3179 <= 1) { // L: 85 + field3179 = 0; // L: 86 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 87 + return; // L: 88 } - field3181 = 600; + field3179 = 600; // L: 90 } } else { - SpriteMask.sleepExact(99L); - SpriteMask.sleepExact(1L); - synchronized(ArchiveDiskActionHandler_lock) { - if (field3181 <= 1) { - field3181 = 0; - ArchiveDiskActionHandler_lock.notifyAll(); - return; + class227.sleepExact(100L); // L: 94 + synchronized(ArchiveDiskActionHandler_lock) { // L: 95 + if (field3179 <= 1) { // L: 96 + field3179 = 0; // L: 97 + ArchiveDiskActionHandler_lock.notifyAll(); // L: 98 + return; // L: 99 } - --field3181; + --field3179; // L: 101 } } } - } catch (Exception var13) { - class197.RunException_sendStackTrace((String)null, var13); + } catch (Exception var13) { // L: 106 + Decimator.RunException_sendStackTrace((String)null, var13); // L: 107 } - } + } // L: 109 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lic;Lic;I)I", - garbageValue = "-1395527740" + descriptor = "(Lic;Lic;IZI)Lef;", + garbageValue = "2091199656" ) - static int method4429(AbstractArchive var0, AbstractArchive var1) { - int var2 = 0; - if (var0.tryLoadFileByNames("title.jpg", "")) { - ++var2; - } + public static Frames method4337(AbstractArchive var0, AbstractArchive var1, int var2, boolean var3) { + boolean var4 = true; // L: 11 + int[] var5 = var0.getGroupFileIds(var2); // L: 12 - if (var1.tryLoadFileByNames("logo", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("logo_deadman_mode", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("logo_seasonal_mode", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("titlebox", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("titlebutton", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("runes", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("title_mute", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) { - ++var2; - } - - if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) { - ++var2; - } - - var1.tryLoadFileByNames("sl_back", ""); - var1.tryLoadFileByNames("sl_flags", ""); - var1.tryLoadFileByNames("sl_arrows", ""); - var1.tryLoadFileByNames("sl_stars", ""); - var1.tryLoadFileByNames("sl_button", ""); - return var2; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "8" - ) - @Export("isWorldMapEvent") - public static boolean isWorldMapEvent(int var0) { - return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; - } - - @ObfuscatedName("fh") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZB)V", - garbageValue = "-20" - ) - @Export("drawLoadingMessage") - static final void drawLoadingMessage(String var0, boolean var1) { - if (Client.showLoadingMessages) { - byte var2 = 4; - int var3 = var2 + 6; - int var4 = var2 + 6; - int var5 = MusicPatchNode2.fontPlain12.lineWidth(var0, 250); - int var6 = MusicPatchNode2.fontPlain12.lineCount(var0, 250) * 13; - Rasterizer2D.Rasterizer2D_fillRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var6 + var2, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var2 + var5 + var2, var2 + var6 + var2, 16777215); - MusicPatchNode2.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0); - class1.method7(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6); - if (var1) { - ArchiveLoader.rasterProvider.drawFull(0, 0); + for (int var6 = 0; var6 < var5.length; ++var6) { // L: 13 + byte[] var7 = var0.getFile(var2, var5[var6]); // L: 14 + if (var7 == null) { // L: 15 + var4 = false; // L: 16 } else { - WorldMapData_0.method243(var3, var4, var5, var6); - } + int var8 = (var7[0] & 255) << 8 | var7[1] & 255; // L: 19 + byte[] var9; + if (var3) { // L: 21 + var9 = var1.getFile(0, var8); + } else { + var9 = var1.getFile(var8, 0); // L: 22 + } + if (var9 == null) { // L: 23 + var4 = false; + } + } } + + if (!var4) { // L: 25 + return null; + } else { + try { + return new Frames(var0, var1, var2, var3); // L: 27 + } catch (Exception var11) { // L: 29 + return null; // L: 30 + } + } + } + + @ObfuscatedName("iv") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "46" + ) + static final String method4338(int var0) { + return var0 < 999999999 ? Integer.toString(var0) : "*"; // L: 9327 9328 } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index 36d8b74be6..cf48c60c4e 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -3,204 +3,100 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bl") +@ObfuscatedName("bd") @Implements("ArchiveLoader") public class ArchiveLoader { - @ObfuscatedName("sm") - @ObfuscatedGetter( - intValue = -1707200579 - ) - @Export("foundItemIndex") - static int foundItemIndex; - @ObfuscatedName("x") - @Export("userHomeDirectory") - static String userHomeDirectory; - @ObfuscatedName("an") + @ObfuscatedName("hx") @ObfuscatedSignature( - descriptor = "Llo;" + descriptor = "[Llp;" ) - @Export("rasterProvider") - public static AbstractRasterProvider rasterProvider; - @ObfuscatedName("dw") - @Export("mouseCam") - static boolean mouseCam; - @ObfuscatedName("fy") + @Export("crossSprites") + static Sprite[] crossSprites; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lfa;" - ) - @Export("socketTask") - static Task socketTask; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Liw;" ) @Export("archive") final Archive archive; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1705798073 + intValue = -412619053 ) @Export("groupCount") final int groupCount; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 607937277 + intValue = 486257523 ) @Export("loadedCount") int loadedCount; @ObfuscatedSignature( - descriptor = "(Lig;Ljava/lang/String;)V" + descriptor = "(Liw;Ljava/lang/String;)V" ) ArchiveLoader(Archive var1, String var2) { - this.loadedCount = 0; - this.archive = var1; - this.groupCount = var1.getGroupCount(); - } + this.loadedCount = 0; // L: 9 + this.archive = var1; // L: 12 + this.groupCount = var1.getGroupCount(); // L: 13 + } // L: 14 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1314527591" + garbageValue = "-1957084823" ) @Export("isLoaded") boolean isLoaded() { - this.loadedCount = 0; + this.loadedCount = 0; // L: 17 - for (int var1 = 0; var1 < this.groupCount; ++var1) { - if (!this.archive.method4452(var1) || this.archive.method4460(var1)) { - ++this.loadedCount; + for (int var1 = 0; var1 < this.groupCount; ++var1) { // L: 18 + if (!this.archive.method4350(var1) || this.archive.method4349(var1)) { + ++this.loadedCount; // L: 19 } } - return this.loadedCount >= this.groupCount; + return this.loadedCount >= this.groupCount; // L: 21 } - @ObfuscatedName("q") + @ObfuscatedName("fp") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1299326622" + descriptor = "(I)V", + garbageValue = "2074712023" ) - static int method1212(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; - } else if (var1 == -1) { - return 0; + static final void method1208() { + if (Client.logoutTimer > 0) { // L: 2585 + ViewportMouse.logOut(); // L: 2586 } else { - int var3 = 0; - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; - } - } - - return var3; + Client.timer.method5098(); // L: 2589 + CollisionMap.updateGameState(40); // L: 2590 + MouseHandler.field508 = Client.packetWriter.getSocket(); // L: 2591 + Client.packetWriter.removeSocket(); // L: 2592 } - } + } // L: 2587 2593 - @ObfuscatedName("j") + @ObfuscatedName("gp") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "677134031" + descriptor = "(IIII)I", + garbageValue = "-513803575" ) - static int method1213(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.CC_CREATE) { - UrlRequester.Interpreter_intStackSize -= 3; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - if (var4 == 0) { - throw new RuntimeException(); - } else { - Widget var6 = WorldMapSprite.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var5 + 1]; - } - - if (var6.children.length <= var5) { - Widget[] var7 = new Widget[var5 + 1]; - - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } - - var6.children = var7; - } - - if (var5 > 0 && var6.children[var5 - 1] == null) { - throw new RuntimeException("" + (var5 - 1)); - } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var5; - var12.isIf3 = true; - var6.children[var5] = var12; - if (var2) { - KeyHandler.field407 = var12; - } else { - SecureRandomCallable.field544 = var12; - } - - class234.invalidateWidget(var6); - return 1; - } + @Export("getTileHeight") + static final int getTileHeight(int var0, int var1, int var2) { + int var3 = var0 >> 7; // L: 4975 + int var4 = var1 >> 7; // L: 4976 + if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { // L: 4977 + int var5 = var2; // L: 4978 + if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 4979 + var5 = var2 + 1; } + + int var6 = var0 & 127; // L: 4980 + int var7 = var1 & 127; // L: 4981 + int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; // L: 4982 + int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 >> 7; // L: 4983 + return var8 * (128 - var7) + var9 * var7 >> 7; // L: 4984 } else { - Widget var9; - if (var0 == ScriptOpcodes.CC_DELETE) { - var9 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - Widget var10 = WorldMapSprite.getWidget(var9.id); - var10.children[var9.childIndex] = null; - class234.invalidateWidget(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var9 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - var9.children = null; - class234.invalidateWidget(var9); - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var9 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; - if (var2) { - KeyHandler.field407 = var9; - } else { - SecureRandomCallable.field544 = var9; - } - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Widget var11 = WorldMapLabelSize.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; - if (var2) { - KeyHandler.field407 = var11; - } else { - SecureRandomCallable.field544 = var11; - } - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } + return 0; } } } diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java index bfc5cad5e7..de7a3fd398 100644 --- a/runescape-client/src/main/java/AttackOption.java +++ b/runescape-client/src/main/java/AttackOption.java @@ -1,3 +1,4 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -5,211 +6,136 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("co") +@ObfuscatedName("cd") @Implements("AttackOption") public enum AttackOption implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcd;" ) @Export("AttackOption_dependsOnCombatLevels") AttackOption_dependsOnCombatLevels(0), - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcd;" ) @Export("AttackOption_alwaysRightClick") AttackOption_alwaysRightClick(1), - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcd;" ) @Export("AttackOption_leftClickWhereAvailable") AttackOption_leftClickWhereAvailable(2), - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcd;" ) @Export("AttackOption_hidden") AttackOption_hidden(3); - @ObfuscatedName("of") - @ObfuscatedSignature( - descriptor = "Lcy;" - ) - @Export("varcs") - static Varcs varcs; - @ObfuscatedName("hj") - @ObfuscatedSignature( - descriptor = "[Llz;" - ) - @Export("mapDotSprites") - static Sprite[] mapDotSprites; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -942694603 + intValue = 1798928251 ) @Export("id") final int id; AttackOption(int var3) { - this.id = var3; + this.id = var3; // L: 10929 + } // L: 10930 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "385513888" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 10933 } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-995092303" + descriptor = "(I)Llp;", + garbageValue = "-1998919890" ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; + static Sprite method2155() { + Sprite var0 = new Sprite(); // L: 199 + var0.width = class335.SpriteBuffer_spriteWidth; // L: 200 + var0.height = class335.SpriteBuffer_spriteHeight; // L: 201 + var0.xOffset = Username.SpriteBuffer_xOffsets[0]; // L: 202 + var0.yOffset = class335.SpriteBuffer_yOffsets[0]; // L: 203 + var0.subWidth = class335.SpriteBuffer_spriteWidths[0]; // L: 204 + var0.subHeight = class335.SpriteBuffer_spriteHeights[0]; // L: 205 + int var1 = var0.subWidth * var0.subHeight; // L: 206 + byte[] var2 = class92.SpriteBuffer_pixels[0]; // L: 207 + var0.pixels = new int[var1]; // L: 208 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 209 + var0.pixels[var3] = TaskHandler.SpriteBuffer_spritePalette[var2[var3] & 255]; + } + + Username.SpriteBuffer_xOffsets = null; // L: 211 + class335.SpriteBuffer_yOffsets = null; // L: 212 + class335.SpriteBuffer_spriteWidths = null; // L: 213 + class335.SpriteBuffer_spriteHeights = null; // L: 214 + TaskHandler.SpriteBuffer_spritePalette = null; // L: 215 + class92.SpriteBuffer_pixels = null; // L: 216 + return var0; // L: 218 } - @ObfuscatedName("a") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Llh;", - garbageValue = "-1275433341" + descriptor = "(ILcy;ZI)I", + garbageValue = "1687533627" ) - public static IndexedSprite method2173() { - IndexedSprite var0 = new IndexedSprite(); - var0.width = class335.SpriteBuffer_spriteWidth; - var0.height = UserComparator8.SpriteBuffer_spriteHeight; - var0.xOffset = class335.SpriteBuffer_xOffsets[0]; - var0.yOffset = NPC.SpriteBuffer_yOffsets[0]; - var0.subWidth = class335.SpriteBuffer_spriteWidths[0]; - var0.subHeight = class335.SpriteBuffer_spriteHeights[0]; - var0.palette = class335.SpriteBuffer_spritePalette; - var0.pixels = ItemDefinition.SpriteBuffer_pixels[0]; - GrandExchangeEvent.method158(); - return var0; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-37" - ) - public static void method2181() { - SequenceDefinition.SequenceDefinition_cached.clear(); - SequenceDefinition.SequenceDefinition_cachedFrames.clear(); - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(ILcs;ZB)I", - garbageValue = "-99" - ) - static int method2180(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { - UrlRequester.Interpreter_intStackSize -= 2; - Client.field727 = (short)GrandExchangeOffer.method176(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]); - if (Client.field727 <= 0) { - Client.field727 = 256; - } - - Client.field924 = (short)GrandExchangeOffer.method176(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); - if (Client.field924 <= 0) { - Client.field924 = 256; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { - UrlRequester.Interpreter_intStackSize -= 2; - Client.zoomHeight = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - if (Client.zoomHeight <= 0) { - Client.zoomHeight = 256; - } - - Client.zoomWidth = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - if (Client.zoomWidth <= 0) { - Client.zoomWidth = 320; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { - UrlRequester.Interpreter_intStackSize -= 4; - Client.field927 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - if (Client.field927 <= 0) { - Client.field927 = 1; - } - - Client.field928 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - if (Client.field928 <= 0) { - Client.field928 = 32767; - } else if (Client.field928 < Client.field927) { - Client.field928 = Client.field927; - } - - Client.field685 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - if (Client.field685 <= 0) { - Client.field685 = 1; - } - - Client.field861 = (short)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; - if (Client.field861 <= 0) { - Client.field861 = 32767; - } else if (Client.field861 < Client.field685) { - Client.field861 = Client.field685; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { - if (Client.viewportWidget != null) { - WorldMapID.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.viewportWidth; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.viewportHeight; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.zoomHeight; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.zoomWidth; - return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection0.method295(Client.field727); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection0.method295(Client.field924); - return 1; - } else if (var0 == 6220) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6221) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 6222) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Varcs.canvasWidth; - return 1; - } else if (var0 == 6223) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class52.canvasHeight; - return 1; + static int method2152(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Canvas.field438 : class3.field12; // L: 1010 + if (var0 == ScriptOpcodes.CC_GETX) { // L: 1011 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1012 + return 1; // L: 1013 + } else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1015 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1016 + return 1; // L: 1017 + } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1019 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1020 + return 1; // L: 1021 + } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1023 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1024 + return 1; // L: 1025 + } else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1027 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1028 + return 1; // L: 1029 + } else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1031 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1032 + return 1; // L: 1033 } else { - return 2; + return 2; // L: 1035 } } - @ObfuscatedName("ho") + @ObfuscatedName("gl") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-113" + descriptor = "(ZI)V", + garbageValue = "1971905807" ) - @Export("selectSpell") - static void selectSpell(int var0, int var1, int var2, int var3) { - Widget var4 = WorldMapLabelSize.getWidgetChild(var0, var1); - if (var4 != null && var4.onTargetEnter != null) { - ScriptEvent var5 = new ScriptEvent(); - var5.widget = var4; - var5.args = var4.onTargetEnter; - InterfaceParent.runScriptEvent(var5); - } + static final void method2154(boolean var0) { + RouteStrategy.playPcmPlayers(); // L: 5164 + ++Client.packetWriter.pendingWrites; // L: 5165 + if (Client.packetWriter.pendingWrites >= 50 || var0) { // L: 5166 + Client.packetWriter.pendingWrites = 0; // L: 5167 + if (!Client.field713 && Client.packetWriter.getSocket() != null) { // L: 5168 + PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); // L: 5170 + Client.packetWriter.addNode(var1); // L: 5171 - Client.field830 = var3; - Client.isSpellSelected = true; - ItemContainer.selectedSpellWidget = var0; - Client.selectedSpellChildIndex = var1; - WorldMapSprite.selectedSpellFlags = var2; - class234.invalidateWidget(var4); - } + try { + Client.packetWriter.flush(); // L: 5173 + } catch (IOException var3) { // L: 5175 + Client.field713 = true; // L: 5176 + } + } + + } + } // L: 5179 } diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 64b1499ede..6793b5502d 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -3,157 +3,157 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("da") +@ObfuscatedName("du") @Implements("AudioFilter") public class AudioFilter { - @ObfuscatedName("g") - static float[][] field1510; - @ObfuscatedName("n") + @ObfuscatedName("o") + static float[][] field1512; + @ObfuscatedName("x") @Export("coefficients") static int[][] coefficients; - @ObfuscatedName("u") - static float field1507; - @ObfuscatedName("a") + @ObfuscatedName("w") + static float field1514; + @ObfuscatedName("g") @Export("forwardMultiplier") static int forwardMultiplier; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("pairs") int[] pairs; - @ObfuscatedName("q") - int[][][] field1516; - @ObfuscatedName("j") - int[][][] field1508; - @ObfuscatedName("p") - int[] field1509; + @ObfuscatedName("s") + int[][][] field1509; + @ObfuscatedName("t") + int[][][] field1510; + @ObfuscatedName("i") + int[] field1511; static { - field1510 = new float[2][8]; - coefficients = new int[2][8]; + field1512 = new float[2][8]; // L: 13 + coefficients = new int[2][8]; // L: 14 } AudioFilter() { - this.pairs = new int[2]; - this.field1516 = new int[2][2][4]; - this.field1508 = new int[2][2][4]; - this.field1509 = new int[2]; + this.pairs = new int[2]; // L: 8 + this.field1509 = new int[2][2][4]; // L: 10 + this.field1510 = new int[2][2][4]; // L: 11 + this.field1511 = new int[2]; // L: 12 + } // L: 21 + + @ObfuscatedName("z") + float method2806(int var1, int var2, float var3) { + float var4 = (float)this.field1510[var1][0][var2] + var3 * (float)(this.field1510[var1][1][var2] - this.field1510[var1][0][var2]); // L: 24 + var4 *= 0.0015258789F; // L: 25 + return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); // L: 26 } - @ObfuscatedName("m") - float method2830(int var1, int var2, float var3) { - float var4 = (float)this.field1508[var1][0][var2] + var3 * (float)(this.field1508[var1][1][var2] - this.field1508[var1][0][var2]); - var4 *= 0.0015258789F; - return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F)); + @ObfuscatedName("s") + float method2813(int var1, int var2, float var3) { + float var4 = (float)this.field1509[var1][0][var2] + var3 * (float)(this.field1509[var1][1][var2] - this.field1509[var1][0][var2]); // L: 35 + var4 *= 1.2207031E-4F; // L: 36 + return normalize(var4); // L: 37 } - @ObfuscatedName("q") - float method2825(int var1, int var2, float var3) { - float var4 = (float)this.field1516[var1][0][var2] + var3 * (float)(this.field1516[var1][1][var2] - this.field1516[var1][0][var2]); - var4 *= 1.2207031E-4F; - return normalize(var4); - } - - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("compute") int compute(int var1, float var2) { float var3; - if (var1 == 0) { - var3 = (float)this.field1509[0] + (float)(this.field1509[1] - this.field1509[0]) * var2; - var3 *= 0.0030517578F; - field1507 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); - forwardMultiplier = (int)(field1507 * 65536.0F); + if (var1 == 0) { // L: 41 + var3 = (float)this.field1511[0] + (float)(this.field1511[1] - this.field1511[0]) * var2; // L: 42 + var3 *= 0.0030517578F; // L: 43 + field1514 = (float)Math.pow(0.1D, (double)(var3 / 20.0F)); // L: 44 + forwardMultiplier = (int)(field1514 * 65536.0F); // L: 45 } - if (this.pairs[var1] == 0) { + if (this.pairs[var1] == 0) { // L: 47 return 0; } else { - var3 = this.method2830(var1, 0, var2); - field1510[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2825(var1, 0, var2)); - field1510[var1][1] = var3 * var3; + var3 = this.method2806(var1, 0, var2); // L: 48 + field1512[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2813(var1, 0, var2)); // L: 49 + field1512[var1][1] = var3 * var3; // L: 50 float[] var10000; int var4; - for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method2830(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2825(var1, var4, var2)); - float var6 = var3 * var3; - field1510[var1][var4 * 2 + 1] = field1510[var1][var4 * 2 - 1] * var6; - field1510[var1][var4 * 2] = field1510[var1][var4 * 2 - 1] * var5 + field1510[var1][var4 * 2 - 2] * var6; + for (var4 = 1; var4 < this.pairs[var1]; ++var4) { // L: 51 + var3 = this.method2806(var1, var4, var2); // L: 52 + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2813(var1, var4, var2)); // L: 53 + float var6 = var3 * var3; // L: 54 + field1512[var1][var4 * 2 + 1] = field1512[var1][var4 * 2 - 1] * var6; // L: 55 + field1512[var1][var4 * 2] = field1512[var1][var4 * 2 - 1] * var5 + field1512[var1][var4 * 2 - 2] * var6; // L: 56 - for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field1510[var1]; - var10000[var7] += field1510[var1][var7 - 1] * var5 + field1510[var1][var7 - 2] * var6; + for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { // L: 57 + var10000 = field1512[var1]; + var10000[var7] += field1512[var1][var7 - 1] * var5 + field1512[var1][var7 - 2] * var6; } - var10000 = field1510[var1]; - var10000[1] += field1510[var1][0] * var5 + var6; - var10000 = field1510[var1]; + var10000 = field1512[var1]; // L: 58 + var10000[1] += field1512[var1][0] * var5 + var6; + var10000 = field1512[var1]; // L: 59 var10000[0] += var5; } - if (var1 == 0) { + if (var1 == 0) { // L: 61 for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field1510[0]; - var10000[var4] *= field1507; + var10000 = field1512[0]; + var10000[var4] *= field1514; } } - for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field1510[var1][var4] * 65536.0F); + for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { // L: 62 + coefficients[var1][var4] = (int)(field1512[var1][var4] * 65536.0F); } - return this.pairs[var1] * 2; + return this.pairs[var1] * 2; // L: 63 } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkn;Lds;)V" + descriptor = "(Lkf;Ldw;)V" ) - final void method2829(Buffer var1, SoundEnvelope var2) { - int var3 = var1.readUnsignedByte(); - this.pairs[0] = var3 >> 4; - this.pairs[1] = var3 & 15; - if (var3 != 0) { - this.field1509[0] = var1.readUnsignedShort(); - this.field1509[1] = var1.readUnsignedShort(); - int var4 = var1.readUnsignedByte(); + final void method2809(Buffer var1, SoundEnvelope var2) { + int var3 = var1.readUnsignedByte(); // L: 67 + this.pairs[0] = var3 >> 4; // L: 68 + this.pairs[1] = var3 & 15; // L: 69 + if (var3 != 0) { // L: 70 + this.field1511[0] = var1.readUnsignedShort(); // L: 71 + this.field1511[1] = var1.readUnsignedShort(); // L: 72 + int var7 = var1.readUnsignedByte(); // L: 73 int var5; int var6; - for (var5 = 0; var5 < 2; ++var5) { - for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - this.field1516[var5][0][var6] = var1.readUnsignedShort(); - this.field1508[var5][0][var6] = var1.readUnsignedShort(); + for (var5 = 0; var5 < 2; ++var5) { // L: 74 + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 75 + this.field1509[var5][0][var6] = var1.readUnsignedShort(); // L: 76 + this.field1510[var5][0][var6] = var1.readUnsignedShort(); // L: 77 } } - for (var5 = 0; var5 < 2; ++var5) { - for (var6 = 0; var6 < this.pairs[var5]; ++var6) { - if ((var4 & 1 << var5 * 4 << var6) != 0) { - this.field1516[var5][1][var6] = var1.readUnsignedShort(); - this.field1508[var5][1][var6] = var1.readUnsignedShort(); + for (var5 = 0; var5 < 2; ++var5) { // L: 80 + for (var6 = 0; var6 < this.pairs[var5]; ++var6) { // L: 81 + if ((var7 & 1 << var5 * 4 << var6) != 0) { // L: 82 + this.field1509[var5][1][var6] = var1.readUnsignedShort(); // L: 83 + this.field1510[var5][1][var6] = var1.readUnsignedShort(); // L: 84 } else { - this.field1516[var5][1][var6] = this.field1516[var5][0][var6]; - this.field1508[var5][1][var6] = this.field1508[var5][0][var6]; + this.field1509[var5][1][var6] = this.field1509[var5][0][var6]; // L: 87 + this.field1510[var5][1][var6] = this.field1510[var5][0][var6]; // L: 88 } } } - if (var4 != 0 || this.field1509[1] != this.field1509[0]) { + if (var7 != 0 || this.field1511[1] != this.field1511[0]) { // L: 92 var2.decodeSegments(var1); } } else { - int[] var7 = this.field1509; - this.field1509[1] = 0; - var7[0] = 0; + int[] var4 = this.field1511; // L: 95 + this.field1511[1] = 0; // L: 96 + var4[0] = 0; // L: 97 } - } + } // L: 99 - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("normalize") static float normalize(float var0) { - float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); - return var1 * 3.1415927F / 11025.0F; + float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0); // L: 30 + return var1 * 3.1415927F / 11025.0F; // L: 31 } } diff --git a/runescape-client/src/main/java/BZip2Decompressor.java b/runescape-client/src/main/java/BZip2Decompressor.java index 16883750cf..7d3dbe20a3 100644 --- a/runescape-client/src/main/java/BZip2Decompressor.java +++ b/runescape-client/src/main/java/BZip2Decompressor.java @@ -3,638 +3,638 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ly") +@ObfuscatedName("ll") @Implements("BZip2Decompressor") public final class BZip2Decompressor { - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Llk;" + descriptor = "Lli;" ) @Export("BZip2Decompressor_state") static BZip2State BZip2Decompressor_state; static { - BZip2Decompressor_state = new BZip2State(); + BZip2Decompressor_state = new BZip2State(); // L: 13 } - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("BZip2Decompressor_decompress") public static int BZip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) { - synchronized(BZip2Decompressor_state) { - BZip2Decompressor_state.inputArray = var2; - BZip2Decompressor_state.nextByte = var4; - BZip2Decompressor_state.outputArray = var0; - BZip2Decompressor_state.next_out = 0; - BZip2Decompressor_state.outputLength = var1; - BZip2Decompressor_state.bsLive = 0; - BZip2Decompressor_state.bsBuff = 0; - BZip2Decompressor_state.nextBit_unused = 0; - BZip2Decompressor_state.field3783 = 0; - BZip2Decompressor_decompress(BZip2Decompressor_state); - var1 -= BZip2Decompressor_state.outputLength; - BZip2Decompressor_state.inputArray = null; - BZip2Decompressor_state.outputArray = null; - return var1; + synchronized(BZip2Decompressor_state) { // L: 20 + BZip2Decompressor_state.inputArray = var2; // L: 21 + BZip2Decompressor_state.nextByte = var4; // L: 22 + BZip2Decompressor_state.outputArray = var0; // L: 23 + BZip2Decompressor_state.next_out = 0; // L: 24 + BZip2Decompressor_state.outputLength = var1; // L: 25 + BZip2Decompressor_state.bsLive = 0; // L: 26 + BZip2Decompressor_state.bsBuff = 0; // L: 27 + BZip2Decompressor_state.nextBit_unused = 0; // L: 28 + BZip2Decompressor_state.field3759 = 0; // L: 29 + BZip2Decompressor_decompress(BZip2Decompressor_state); // L: 30 + var1 -= BZip2Decompressor_state.outputLength; // L: 31 + BZip2Decompressor_state.inputArray = null; // L: 32 + BZip2Decompressor_state.outputArray = null; // L: 33 + return var1; // L: 34 } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Llk;)V" + descriptor = "(Lli;)V" ) - static void method6004(BZip2State var0) { - byte var2 = var0.out_char; - int var3 = var0.su_rNToGo; - int var4 = var0.nblocks_used; - int var5 = var0.su_ch2; - int[] var6 = KitDefinition.BZip2Decompressor_block; - int var7 = var0.field3779; - byte[] var8 = var0.outputArray; - int var9 = var0.next_out; - int var10 = var0.outputLength; - int var12 = var0.field3766 + 1; + static void method5902(BZip2State var0) { + byte var2 = var0.out_char; // L: 40 + int var3 = var0.su_rNToGo; // L: 41 + int var4 = var0.nblocks_used; // L: 42 + int var5 = var0.su_ch2; // L: 43 + int[] var6 = HealthBar.BZip2Decompressor_block; // L: 44 + int var7 = var0.field3766; // L: 45 + byte[] var8 = var0.outputArray; // L: 46 + int var9 = var0.next_out; // L: 47 + int var10 = var0.outputLength; // L: 48 + int var12 = var0.field3770 + 1; // L: 50 - label61: + label70: while (true) { - if (var3 > 0) { + if (var3 > 0) { // L: 53 while (true) { - if (var10 == 0) { - break label61; + if (var10 == 0) { // L: 55 + break label70; } - if (var3 == 1) { - if (var10 == 0) { - var3 = 1; - break label61; + if (var3 == 1) { // L: 56 + if (var10 == 0) { // L: 62 + var3 = 1; // L: 63 + break label70; } - var8[var9] = var2; - ++var9; - --var10; + var8[var9] = var2; // L: 66 + ++var9; // L: 67 + --var10; // L: 68 break; } - var8[var9] = var2; - --var3; - ++var9; - --var10; + var8[var9] = var2; // L: 57 + --var3; // L: 58 + ++var9; // L: 59 + --var10; // L: 60 } } - while (var4 != var12) { - var2 = (byte)var5; - var7 = var6[var7]; - byte var1 = (byte)var7; - var7 >>= 8; - ++var4; - if (var1 != var5) { - var5 = var1; - if (var10 == 0) { - var3 = 1; - break label61; + while (var4 != var12) { // L: 71 + var2 = (byte)var5; // L: 75 + var7 = var6[var7]; // L: 76 + byte var1 = (byte)var7; // L: 77 + var7 >>= 8; // L: 78 + ++var4; // L: 79 + if (var1 != var5) { // L: 80 + var5 = var1; // L: 81 + if (var10 == 0) { // L: 82 + var3 = 1; // L: 83 + break label70; // L: 84 } - var8[var9] = var2; - ++var9; - --var10; + var8[var9] = var2; // L: 86 + ++var9; // L: 87 + --var10; // L: 88 } else { - if (var4 != var12) { - var3 = 2; - var7 = var6[var7]; - var1 = (byte)var7; - var7 >>= 8; - ++var4; - if (var4 != var12) { - if (var1 != var5) { - var5 = var1; + if (var4 != var12) { // L: 91 + var3 = 2; // L: 103 + var7 = var6[var7]; // L: 104 + var1 = (byte)var7; // L: 105 + var7 >>= 8; // L: 106 + ++var4; // L: 107 + if (var4 != var12) { // L: 108 + if (var1 != var5) { // L: 109 + var5 = var1; // L: 110 } else { - var3 = 3; - var7 = var6[var7]; - var1 = (byte)var7; - var7 >>= 8; - ++var4; - if (var4 != var12) { - if (var1 != var5) { - var5 = var1; + var3 = 3; // L: 113 + var7 = var6[var7]; // L: 114 + var1 = (byte)var7; // L: 115 + var7 >>= 8; // L: 116 + ++var4; // L: 117 + if (var4 != var12) { // L: 118 + if (var1 != var5) { // L: 119 + var5 = var1; // L: 120 } else { - var7 = var6[var7]; - var1 = (byte)var7; - var7 >>= 8; - ++var4; - var3 = (var1 & 255) + 4; - var7 = var6[var7]; - var5 = (byte)var7; - var7 >>= 8; - ++var4; + var7 = var6[var7]; // L: 123 + var1 = (byte)var7; // L: 124 + var7 >>= 8; // L: 125 + ++var4; // L: 126 + var3 = (var1 & 255) + 4; // L: 127 + var7 = var6[var7]; // L: 128 + var5 = (byte)var7; // L: 129 + var7 >>= 8; // L: 130 + ++var4; // L: 131 } } } } - continue label61; + continue label70; } - if (var10 == 0) { - var3 = 1; - break label61; + if (var10 == 0) { // L: 92 + var3 = 1; // L: 93 + break label70; // L: 94 } - var8[var9] = var2; - ++var9; - --var10; + var8[var9] = var2; // L: 96 + ++var9; // L: 97 + --var10; // L: 98 } } - var3 = 0; - break; + var3 = 0; // L: 72 + break; // L: 73 } - int var13 = var0.field3783; - var0.field3783 += var10 - var10; - if (var0.field3783 < var13) { + int var13 = var0.field3759; // L: 133 + var0.field3759 += var10 - var10; // L: 134 + if (var0.field3759 < var13) { // L: 135 } - var0.out_char = var2; - var0.su_rNToGo = var3; - var0.nblocks_used = var4; - var0.su_ch2 = var5; - KitDefinition.BZip2Decompressor_block = var6; - var0.field3779 = var7; - var0.outputArray = var8; - var0.next_out = var9; - var0.outputLength = var10; - } + var0.out_char = var2; // L: 136 + var0.su_rNToGo = var3; // L: 137 + var0.nblocks_used = var4; // L: 138 + var0.su_ch2 = var5; // L: 139 + HealthBar.BZip2Decompressor_block = var6; // L: 140 + var0.field3766 = var7; // L: 141 + var0.outputArray = var8; // L: 142 + var0.next_out = var9; // L: 143 + var0.outputLength = var10; // L: 144 + } // L: 145 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Llk;)V" + descriptor = "(Lli;)V" ) @Export("BZip2Decompressor_decompress") static void BZip2Decompressor_decompress(BZip2State var0) { - boolean var4 = false; - boolean var5 = false; - boolean var6 = false; - boolean var7 = false; - boolean var8 = false; - boolean var9 = false; - boolean var10 = false; - boolean var11 = false; - boolean var12 = false; - boolean var13 = false; - boolean var14 = false; - boolean var15 = false; - boolean var16 = false; - boolean var17 = false; - boolean var18 = false; - boolean var19 = false; - boolean var20 = false; - boolean var21 = false; - int var22 = 0; - int[] var23 = null; - int[] var24 = null; - int[] var25 = null; - var0.blockSize100k = -425931053; - if (KitDefinition.BZip2Decompressor_block == null) { - KitDefinition.BZip2Decompressor_block = new int[var0.blockSize100k * -2058061088]; + boolean var4 = false; // L: 151 + boolean var5 = false; // L: 152 + boolean var6 = false; // L: 153 + boolean var7 = false; // L: 154 + boolean var8 = false; // L: 155 + boolean var9 = false; // L: 156 + boolean var10 = false; // L: 157 + boolean var11 = false; // L: 158 + boolean var12 = false; // L: 159 + boolean var13 = false; // L: 160 + boolean var14 = false; // L: 161 + boolean var15 = false; // L: 162 + boolean var16 = false; // L: 163 + boolean var17 = false; // L: 164 + boolean var18 = false; // L: 165 + boolean var19 = false; // L: 166 + boolean var20 = false; // L: 167 + boolean var21 = false; // L: 168 + int var22 = 0; // L: 169 + int[] var23 = null; // L: 170 + int[] var24 = null; // L: 171 + int[] var25 = null; // L: 172 + var0.blockSize100k = 171518257; // L: 173 + if (HealthBar.BZip2Decompressor_block == null) { // L: 174 + HealthBar.BZip2Decompressor_block = new int[var0.blockSize100k * 122833056]; } - boolean var26 = true; + boolean var26 = true; // L: 175 while (true) { while (var26) { - byte var1 = BZip2Decompressor_readNextByte(var0); - if (var1 == 23) { + byte var1 = BZip2Decompressor_readNextByte(var0); // L: 177 + if (var1 == 23) { // L: 178 return; } - var1 = BZip2Decompressor_readNextByte(var0); - var1 = BZip2Decompressor_readNextByte(var0); - var1 = BZip2Decompressor_readNextByte(var0); - var1 = BZip2Decompressor_readNextByte(var0); - var1 = BZip2Decompressor_readNextByte(var0); - var1 = BZip2Decompressor_readNextByte(var0); - var1 = BZip2Decompressor_readNextByte(var0); - var1 = BZip2Decompressor_readNextByte(var0); - var1 = BZip2Decompressor_readNextByte(var0); - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 != 0) { + var1 = BZip2Decompressor_readNextByte(var0); // L: 179 + var1 = BZip2Decompressor_readNextByte(var0); // L: 180 + var1 = BZip2Decompressor_readNextByte(var0); // L: 181 + var1 = BZip2Decompressor_readNextByte(var0); // L: 182 + var1 = BZip2Decompressor_readNextByte(var0); // L: 183 + var1 = BZip2Decompressor_readNextByte(var0); // L: 184 + var1 = BZip2Decompressor_readNextByte(var0); // L: 185 + var1 = BZip2Decompressor_readNextByte(var0); // L: 186 + var1 = BZip2Decompressor_readNextByte(var0); // L: 187 + var1 = BZip2Decompressor_readNextBit(var0); // L: 188 + if (var1 != 0) { // L: 189 } - var0.originalPointer = 0; - var1 = BZip2Decompressor_readNextByte(var0); - var0.originalPointer = var0.originalPointer << 8 | var1 & 255; - var1 = BZip2Decompressor_readNextByte(var0); - var0.originalPointer = var0.originalPointer << 8 | var1 & 255; - var1 = BZip2Decompressor_readNextByte(var0); - var0.originalPointer = var0.originalPointer << 8 | var1 & 255; + var0.originalPointer = 0; // L: 191 + var1 = BZip2Decompressor_readNextByte(var0); // L: 192 + var0.originalPointer = var0.originalPointer << 8 | var1 & 255; // L: 193 + var1 = BZip2Decompressor_readNextByte(var0); // L: 194 + var0.originalPointer = var0.originalPointer << 8 | var1 & 255; // L: 195 + var1 = BZip2Decompressor_readNextByte(var0); // L: 196 + var0.originalPointer = var0.originalPointer << 8 | var1 & 255; // L: 197 int var36; - for (var36 = 0; var36 < 16; ++var36) { - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 1) { + for (var36 = 0; var36 < 16; ++var36) { // L: 198 + var1 = BZip2Decompressor_readNextBit(var0); // L: 199 + if (var1 == 1) { // L: 200 var0.inUse16[var36] = true; } else { - var0.inUse16[var36] = false; + var0.inUse16[var36] = false; // L: 201 } } - for (var36 = 0; var36 < 256; ++var36) { + for (var36 = 0; var36 < 256; ++var36) { // L: 203 var0.inUse[var36] = false; } int var37; - for (var36 = 0; var36 < 16; ++var36) { - if (var0.inUse16[var36]) { - for (var37 = 0; var37 < 16; ++var37) { - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 1) { + for (var36 = 0; var36 < 16; ++var36) { // L: 204 + if (var0.inUse16[var36]) { // L: 205 + for (var37 = 0; var37 < 16; ++var37) { // L: 206 + var1 = BZip2Decompressor_readNextBit(var0); // L: 207 + if (var1 == 1) { // L: 208 var0.inUse[var37 + var36 * 16] = true; } } } } - makeMaps(var0); - int var39 = var0.nInUse + 2; - int var40 = BZip2Decompressor_readBits(3, var0); - int var41 = BZip2Decompressor_readBits(15, var0); + makeMaps(var0); // L: 212 + int var39 = var0.nInUse + 2; // L: 213 + int var40 = BZip2Decompressor_readBits(3, var0); // L: 214 + int var41 = BZip2Decompressor_readBits(15, var0); // L: 215 - for (var36 = 0; var36 < var41; ++var36) { - var37 = 0; + for (var36 = 0; var36 < var41; ++var36) { // L: 216 + var37 = 0; // L: 217 while (true) { - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 0) { - var0.selectorMtf[var36] = (byte)var37; + var1 = BZip2Decompressor_readNextBit(var0); // L: 219 + if (var1 == 0) { // L: 220 + var0.selectorMtf[var36] = (byte)var37; // L: 223 break; } - ++var37; + ++var37; // L: 221 } } - byte[] var27 = new byte[6]; + byte[] var27 = new byte[6]; // L: 226 byte var29; - for (var29 = 0; var29 < var40; var27[var29] = var29++) { + for (var29 = 0; var29 < var40; var27[var29] = var29++) { // L: 229 } - for (var36 = 0; var36 < var41; ++var36) { - var29 = var0.selectorMtf[var36]; + for (var36 = 0; var36 < var41; ++var36) { // L: 230 + var29 = var0.selectorMtf[var36]; // L: 231 byte var28; - for (var28 = var27[var29]; var29 > 0; --var29) { - var27[var29] = var27[var29 - 1]; + for (var28 = var27[var29]; var29 > 0; --var29) { // L: 232 233 235 + var27[var29] = var27[var29 - 1]; // L: 234 } - var27[0] = var28; - var0.selector[var36] = var28; + var27[0] = var28; // L: 237 + var0.selector[var36] = var28; // L: 238 } int var38; - for (var38 = 0; var38 < var40; ++var38) { - int var50 = BZip2Decompressor_readBits(5, var0); + for (var38 = 0; var38 < var40; ++var38) { // L: 241 + int var50 = BZip2Decompressor_readBits(5, var0); // L: 242 - for (var36 = 0; var36 < var39; ++var36) { + for (var36 = 0; var36 < var39; ++var36) { // L: 243 while (true) { - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 0) { - var0.temp_charArray2d[var38][var36] = (byte)var50; + var1 = BZip2Decompressor_readNextBit(var0); // L: 245 + if (var1 == 0) { // L: 246 + var0.temp_charArray2d[var38][var36] = (byte)var50; // L: 251 break; } - var1 = BZip2Decompressor_readNextBit(var0); - if (var1 == 0) { + var1 = BZip2Decompressor_readNextBit(var0); // L: 247 + if (var1 == 0) { // L: 248 ++var50; } else { - --var50; + --var50; // L: 249 } } } } - for (var38 = 0; var38 < var40; ++var38) { - byte var2 = 32; - byte var3 = 0; + for (var38 = 0; var38 < var40; ++var38) { // L: 254 + byte var2 = 32; // L: 255 + byte var3 = 0; // L: 256 - for (var36 = 0; var36 < var39; ++var36) { - if (var0.temp_charArray2d[var38][var36] > var3) { + for (var36 = 0; var36 < var39; ++var36) { // L: 257 + if (var0.temp_charArray2d[var38][var36] > var3) { // L: 258 var3 = var0.temp_charArray2d[var38][var36]; } - if (var0.temp_charArray2d[var38][var36] < var2) { + if (var0.temp_charArray2d[var38][var36] < var2) { // L: 259 var2 = var0.temp_charArray2d[var38][var36]; } } - BZip2Decompressor_createHuffmanTables(var0.limit[var38], var0.base[var38], var0.perm[var38], var0.temp_charArray2d[var38], var2, var3, var39); - var0.minLens[var38] = var2; + BZip2Decompressor_createHuffmanTables(var0.limit[var38], var0.base[var38], var0.perm[var38], var0.temp_charArray2d[var38], var2, var3, var39); // L: 261 + var0.minLens[var38] = var2; // L: 262 } - int var42 = var0.nInUse + 1; - int var43 = -1; - byte var44 = 0; + int var42 = var0.nInUse + 1; // L: 264 + int var43 = -1; // L: 265 + byte var44 = 0; // L: 266 - for (var36 = 0; var36 <= 255; ++var36) { + for (var36 = 0; var36 <= 255; ++var36) { // L: 267 var0.unzftab[var36] = 0; } - int var56 = 4095; + int var56 = 4095; // L: 272 int var35; int var55; - for (var35 = 15; var35 >= 0; --var35) { - for (var55 = 15; var55 >= 0; --var55) { - var0.ll8[var56] = (byte)(var55 + var35 * 16); - --var56; + for (var35 = 15; var35 >= 0; --var35) { // L: 273 + for (var55 = 15; var55 >= 0; --var55) { // L: 274 + var0.ll8[var56] = (byte)(var55 + var35 * 16); // L: 275 + --var56; // L: 276 } - var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; + var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; // L: 278 } - int var47 = 0; + int var47 = 0; // L: 281 byte var54; - if (var44 == 0) { - ++var43; - var44 = 50; - var54 = var0.selector[var43]; - var22 = var0.minLens[var54]; - var23 = var0.limit[var54]; - var25 = var0.perm[var54]; - var24 = var0.base[var54]; + if (var44 == 0) { // L: 282 + ++var43; // L: 283 + var44 = 50; // L: 284 + var54 = var0.selector[var43]; // L: 285 + var22 = var0.minLens[var54]; // L: 286 + var23 = var0.limit[var54]; // L: 287 + var25 = var0.perm[var54]; // L: 288 + var24 = var0.base[var54]; // L: 289 } - int var45 = var44 - 1; - int var51 = var22; + int var45 = var44 - 1; // L: 291 + int var51 = var22; // L: 292 int var52; byte var53; - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { - ++var51; - var53 = BZip2Decompressor_readNextBit(var0); + for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { // L: 293 295 298 + ++var51; // L: 296 + var53 = BZip2Decompressor_readNextBit(var0); // L: 297 } - int var46 = var25[var52 - var24[var51]]; + int var46 = var25[var52 - var24[var51]]; // L: 300 while (true) { int[] var10000; int var10002; - while (var46 != var42) { - if (var46 != 0 && var46 != 1) { - int var33 = var46 - 1; + while (var46 != var42) { // L: 302 + if (var46 != 0 && var46 != 1) { // L: 303 + int var33 = var46 - 1; // L: 349 int var30; - if (var33 < 16) { - var30 = var0.getAndMoveToFrontDecode_yy[0]; + if (var33 < 16) { // L: 350 + var30 = var0.getAndMoveToFrontDecode_yy[0]; // L: 351 - for (var1 = var0.ll8[var30 + var33]; var33 > 3; var33 -= 4) { - int var34 = var30 + var33; - var0.ll8[var34] = var0.ll8[var34 - 1]; - var0.ll8[var34 - 1] = var0.ll8[var34 - 2]; - var0.ll8[var34 - 2] = var0.ll8[var34 - 3]; - var0.ll8[var34 - 3] = var0.ll8[var34 - 4]; + for (var1 = var0.ll8[var30 + var33]; var33 > 3; var33 -= 4) { // L: 352 353 359 + int var34 = var30 + var33; // L: 354 + var0.ll8[var34] = var0.ll8[var34 - 1]; // L: 355 + var0.ll8[var34 - 1] = var0.ll8[var34 - 2]; // L: 356 + var0.ll8[var34 - 2] = var0.ll8[var34 - 3]; // L: 357 + var0.ll8[var34 - 3] = var0.ll8[var34 - 4]; // L: 358 } - while (var33 > 0) { - var0.ll8[var30 + var33] = var0.ll8[var30 + var33 - 1]; - --var33; + while (var33 > 0) { // L: 361 + var0.ll8[var30 + var33] = var0.ll8[var30 + var33 - 1]; // L: 362 + --var33; // L: 363 } - var0.ll8[var30] = var1; + var0.ll8[var30] = var1; // L: 365 } else { - int var31 = var33 / 16; - int var32 = var33 % 16; - var30 = var0.getAndMoveToFrontDecode_yy[var31] + var32; + int var31 = var33 / 16; // L: 368 + int var32 = var33 % 16; // L: 369 + var30 = var0.getAndMoveToFrontDecode_yy[var31] + var32; // L: 370 - for (var1 = var0.ll8[var30]; var30 > var0.getAndMoveToFrontDecode_yy[var31]; --var30) { - var0.ll8[var30] = var0.ll8[var30 - 1]; + for (var1 = var0.ll8[var30]; var30 > var0.getAndMoveToFrontDecode_yy[var31]; --var30) { // L: 371 372 374 + var0.ll8[var30] = var0.ll8[var30 - 1]; // L: 373 } - for (var10002 = var0.getAndMoveToFrontDecode_yy[var31]++; var31 > 0; --var31) { - var10002 = var0.getAndMoveToFrontDecode_yy[var31]--; - var0.ll8[var0.getAndMoveToFrontDecode_yy[var31]] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var31 - 1] + 16 - 1]; + for (var10002 = var0.getAndMoveToFrontDecode_yy[var31]++; var31 > 0; --var31) { // L: 376 377 380 + var10002 = var0.getAndMoveToFrontDecode_yy[var31]--; // L: 378 + var0.ll8[var0.getAndMoveToFrontDecode_yy[var31]] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var31 - 1] + 16 - 1]; // L: 379 } - var10002 = var0.getAndMoveToFrontDecode_yy[0]--; - var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] = var1; - if (var0.getAndMoveToFrontDecode_yy[0] == 0) { - var56 = 4095; + var10002 = var0.getAndMoveToFrontDecode_yy[0]--; // L: 382 + var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] = var1; // L: 383 + if (var0.getAndMoveToFrontDecode_yy[0] == 0) { // L: 384 + var56 = 4095; // L: 385 - for (var35 = 15; var35 >= 0; --var35) { - for (var55 = 15; var55 >= 0; --var55) { - var0.ll8[var56] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var35] + var55]; - --var56; + for (var35 = 15; var35 >= 0; --var35) { // L: 386 + for (var55 = 15; var55 >= 0; --var55) { // L: 387 + var0.ll8[var56] = var0.ll8[var0.getAndMoveToFrontDecode_yy[var35] + var55]; // L: 388 + --var56; // L: 389 } - var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; + var0.getAndMoveToFrontDecode_yy[var35] = var56 + 1; // L: 391 } } } - var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; - KitDefinition.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; - ++var47; - if (var45 == 0) { - ++var43; - var45 = 50; - var54 = var0.selector[var43]; - var22 = var0.minLens[var54]; - var23 = var0.limit[var54]; - var25 = var0.perm[var54]; - var24 = var0.base[var54]; + var10002 = var0.unzftab[var0.seqToUnseq[var1 & 255] & 255]++; // L: 396 + HealthBar.BZip2Decompressor_block[var47] = var0.seqToUnseq[var1 & 255] & 255; // L: 397 + ++var47; // L: 398 + if (var45 == 0) { // L: 399 + ++var43; // L: 400 + var45 = 50; // L: 401 + var54 = var0.selector[var43]; // L: 402 + var22 = var0.minLens[var54]; // L: 403 + var23 = var0.limit[var54]; // L: 404 + var25 = var0.perm[var54]; // L: 405 + var24 = var0.base[var54]; // L: 406 } - --var45; - var51 = var22; + --var45; // L: 408 + var51 = var22; // L: 409 - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { - ++var51; - var53 = BZip2Decompressor_readNextBit(var0); + for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { // L: 410 412 415 + ++var51; // L: 413 + var53 = BZip2Decompressor_readNextBit(var0); // L: 414 } - var46 = var25[var52 - var24[var51]]; + var46 = var25[var52 - var24[var51]]; // L: 417 } else { - int var48 = -1; - int var49 = 1; + int var48 = -1; // L: 304 + int var49 = 1; // L: 305 do { - if (var46 == 0) { + if (var46 == 0) { // L: 307 var48 += var49; - } else if (var46 == 1) { + } else if (var46 == 1) { // L: 308 var48 += var49 * 2; } - var49 *= 2; - if (var45 == 0) { - ++var43; - var45 = 50; - var54 = var0.selector[var43]; - var22 = var0.minLens[var54]; - var23 = var0.limit[var54]; - var25 = var0.perm[var54]; - var24 = var0.base[var54]; + var49 *= 2; // L: 309 + if (var45 == 0) { // L: 310 + ++var43; // L: 311 + var45 = 50; // L: 312 + var54 = var0.selector[var43]; // L: 313 + var22 = var0.minLens[var54]; // L: 314 + var23 = var0.limit[var54]; // L: 315 + var25 = var0.perm[var54]; // L: 316 + var24 = var0.base[var54]; // L: 317 } - --var45; - var51 = var22; + --var45; // L: 319 + var51 = var22; // L: 320 - for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { - ++var51; - var53 = BZip2Decompressor_readNextBit(var0); + for (var52 = BZip2Decompressor_readBits(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) { // L: 321 323 326 + ++var51; // L: 324 + var53 = BZip2Decompressor_readNextBit(var0); // L: 325 } - var46 = var25[var52 - var24[var51]]; - } while(var46 == 0 || var46 == 1); + var46 = var25[var52 - var24[var51]]; // L: 328 + } while(var46 == 0 || var46 == 1); // L: 329 - ++var48; - var1 = var0.seqToUnseq[var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] & 255]; - var10000 = var0.unzftab; + ++var48; // L: 330 + var1 = var0.seqToUnseq[var0.ll8[var0.getAndMoveToFrontDecode_yy[0]] & 255]; // L: 331 + var10000 = var0.unzftab; // L: 332 - for (var10000[var1 & 255] += var48; var48 > 0; --var48) { - KitDefinition.BZip2Decompressor_block[var47] = var1 & 255; - ++var47; + for (var10000[var1 & 255] += var48; var48 > 0; --var48) { // L: 333 336 + HealthBar.BZip2Decompressor_block[var47] = var1 & 255; // L: 334 + ++var47; // L: 335 } } } - var0.su_rNToGo = 0; - var0.out_char = 0; - var0.cftab[0] = 0; + var0.su_rNToGo = 0; // L: 421 + var0.out_char = 0; // L: 422 + var0.cftab[0] = 0; // L: 423 - for (var36 = 1; var36 <= 256; ++var36) { + for (var36 = 1; var36 <= 256; ++var36) { // L: 424 var0.cftab[var36] = var0.unzftab[var36 - 1]; } - for (var36 = 1; var36 <= 256; ++var36) { + for (var36 = 1; var36 <= 256; ++var36) { // L: 425 var10000 = var0.cftab; var10000[var36] += var0.cftab[var36 - 1]; } - for (var36 = 0; var36 < var47; ++var36) { - var1 = (byte)(KitDefinition.BZip2Decompressor_block[var36] & 255); - var10000 = KitDefinition.BZip2Decompressor_block; + for (var36 = 0; var36 < var47; ++var36) { // L: 426 + var1 = (byte)(HealthBar.BZip2Decompressor_block[var36] & 255); // L: 427 + var10000 = HealthBar.BZip2Decompressor_block; // L: 428 int var10001 = var0.cftab[var1 & 255]; var10000[var10001] |= var36 << 8; - var10002 = var0.cftab[var1 & 255]++; + var10002 = var0.cftab[var1 & 255]++; // L: 429 } - var0.field3779 = KitDefinition.BZip2Decompressor_block[var0.originalPointer] >> 8; - var0.nblocks_used = 0; - var0.field3779 = KitDefinition.BZip2Decompressor_block[var0.field3779]; - var0.su_ch2 = (byte)(var0.field3779 & 255); - var0.field3779 >>= 8; - ++var0.nblocks_used; - var0.field3766 = var47; - method6004(var0); - if (var0.field3766 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { + var0.field3766 = HealthBar.BZip2Decompressor_block[var0.originalPointer] >> 8; // L: 431 + var0.nblocks_used = 0; // L: 432 + var0.field3766 = HealthBar.BZip2Decompressor_block[var0.field3766]; // L: 433 + var0.su_ch2 = (byte)(var0.field3766 & 255); // L: 434 + var0.field3766 >>= 8; // L: 436 + ++var0.nblocks_used; // L: 437 + var0.field3770 = var47; // L: 438 + method5902(var0); // L: 439 + if (var0.field3770 + 1 == var0.nblocks_used && var0.su_rNToGo == 0) { // L: 440 var26 = true; break; } - var26 = false; + var26 = false; // L: 441 break; } } - return; + return; // L: 443 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Llk;)B" + descriptor = "(Lli;)B" ) @Export("BZip2Decompressor_readNextByte") static byte BZip2Decompressor_readNextByte(BZip2State var0) { - return (byte)BZip2Decompressor_readBits(8, var0); + return (byte)BZip2Decompressor_readBits(8, var0); // L: 447 } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Llk;)B" + descriptor = "(Lli;)B" ) @Export("BZip2Decompressor_readNextBit") static byte BZip2Decompressor_readNextBit(BZip2State var0) { - return (byte)BZip2Decompressor_readBits(1, var0); + return (byte)BZip2Decompressor_readBits(1, var0); // L: 451 } - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILlk;)I" + descriptor = "(ILli;)I" ) @Export("BZip2Decompressor_readBits") static int BZip2Decompressor_readBits(int var0, BZip2State var1) { - while (var1.bsLive < var0) { - var1.bsBuff = var1.bsBuff << 8 | var1.inputArray[var1.nextByte] & 255; - var1.bsLive += 8; - ++var1.nextByte; - ++var1.nextBit_unused; - if (var1.nextBit_unused == 0) { + while (var1.bsLive < var0) { // L: 456 + var1.bsBuff = var1.bsBuff << 8 | var1.inputArray[var1.nextByte] & 255; // L: 462 + var1.bsLive += 8; // L: 463 + ++var1.nextByte; // L: 464 + ++var1.nextBit_unused; // L: 465 + if (var1.nextBit_unused == 0) { // L: 466 } } - int var2 = var1.bsBuff >> var1.bsLive - var0 & (1 << var0) - 1; - var1.bsLive -= var0; - return var2; + int var2 = var1.bsBuff >> var1.bsLive - var0 & (1 << var0) - 1; // L: 458 + var1.bsLive -= var0; // L: 459 + return var2; // L: 460 } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Llk;)V" + descriptor = "(Lli;)V" ) @Export("makeMaps") static void makeMaps(BZip2State var0) { - var0.nInUse = 0; + var0.nInUse = 0; // L: 472 - for (int var1 = 0; var1 < 256; ++var1) { - if (var0.inUse[var1]) { - var0.seqToUnseq[var0.nInUse] = (byte)var1; - ++var0.nInUse; + for (int var1 = 0; var1 < 256; ++var1) { // L: 473 + if (var0.inUse[var1]) { // L: 474 + var0.seqToUnseq[var0.nInUse] = (byte)var1; // L: 475 + ++var0.nInUse; // L: 476 } } - } + } // L: 479 - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("BZip2Decompressor_createHuffmanTables") static void BZip2Decompressor_createHuffmanTables(int[] var0, int[] var1, int[] var2, byte[] var3, int var4, int var5, int var6) { - int var7 = 0; + int var7 = 0; // L: 486 int var8; - for (var8 = var4; var8 <= var5; ++var8) { - for (int var9 = 0; var9 < var6; ++var9) { - if (var8 == var3[var9]) { - var2[var7] = var9; - ++var7; + for (var8 = var4; var8 <= var5; ++var8) { // L: 487 + for (int var9 = 0; var9 < var6; ++var9) { // L: 488 + if (var8 == var3[var9]) { // L: 489 + var2[var7] = var9; // L: 490 + ++var7; // L: 491 } } } - for (var8 = 0; var8 < 23; ++var8) { + for (var8 = 0; var8 < 23; ++var8) { // L: 495 var1[var8] = 0; } - for (var8 = 0; var8 < var6; ++var8) { + for (var8 = 0; var8 < var6; ++var8) { // L: 496 ++var1[var3[var8] + 1]; } - for (var8 = 1; var8 < 23; ++var8) { + for (var8 = 1; var8 < 23; ++var8) { // L: 497 var1[var8] += var1[var8 - 1]; } - for (var8 = 0; var8 < 23; ++var8) { + for (var8 = 0; var8 < 23; ++var8) { // L: 498 var0[var8] = 0; } - int var10 = 0; + int var10 = 0; // L: 499 - for (var8 = var4; var8 <= var5; ++var8) { - var10 += var1[var8 + 1] - var1[var8]; - var0[var8] = var10 - 1; - var10 <<= 1; + for (var8 = var4; var8 <= var5; ++var8) { // L: 500 + var10 += var1[var8 + 1] - var1[var8]; // L: 501 + var0[var8] = var10 - 1; // L: 502 + var10 <<= 1; // L: 503 } - for (var8 = var4 + 1; var8 <= var5; ++var8) { - var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8]; + for (var8 = var4 + 1; var8 <= var5; ++var8) { // L: 505 + var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8]; // L: 506 } - } + } // L: 508 } diff --git a/runescape-client/src/main/java/BZip2State.java b/runescape-client/src/main/java/BZip2State.java index 2539cdd831..095e866e56 100644 --- a/runescape-client/src/main/java/BZip2State.java +++ b/runescape-client/src/main/java/BZip2State.java @@ -2,121 +2,123 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lk") +@ObfuscatedName("li") @Implements("BZip2State") public final class BZip2State { - @ObfuscatedName("m") - final int field3750; - @ObfuscatedName("o") + @ObfuscatedName("bn") + @Export("worldListURL") + static String worldListURL; + @ObfuscatedName("z") + final int field3754; + @ObfuscatedName("k") + final int field3748; + @ObfuscatedName("s") final int field3784; - @ObfuscatedName("q") - final int field3749; - @ObfuscatedName("j") - final int field3755; - @ObfuscatedName("p") + @ObfuscatedName("t") + final int field3772; + @ObfuscatedName("i") final int field3751; - @ObfuscatedName("g") - final int field3752; - @ObfuscatedName("n") + @ObfuscatedName("o") + final int field3760; + @ObfuscatedName("x") @Export("inputArray") byte[] inputArray; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 2048322099 + intValue = 839419927 ) @Export("nextByte") int nextByte; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2079551029 + intValue = 128200733 ) @Export("nextBit_unused") int nextBit_unused; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("outputArray") byte[] outputArray; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -521485937 + intValue = -181699619 ) @Export("next_out") int next_out; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -962372007 + intValue = 36041791 ) @Export("outputLength") int outputLength; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1091946921 - ) - int field3783; @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = -332448629 + ) + int field3759; + @ObfuscatedName("a") @Export("out_char") byte out_char; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -475619831 + intValue = -1965134077 ) @Export("su_rNToGo") int su_rNToGo; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 37444239 + intValue = -807361971 ) @Export("bsBuff") int bsBuff; - @ObfuscatedName("s") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 590709617 + intValue = 705369625 ) @Export("bsLive") int bsLive; - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("blockSize100k") int blockSize100k; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1631921855 + intValue = 1211957325 ) @Export("originalPointer") int originalPointer; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 755758005 + intValue = 586928333 ) - int field3779; - @ObfuscatedName("l") + int field3766; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1026760725 + intValue = 25295989 ) @Export("su_ch2") int su_ch2; - @ObfuscatedName("t") + @ObfuscatedName("u") @Export("unzftab") int[] unzftab; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -819259021 + intValue = 1457026287 ) @Export("nblocks_used") int nblocks_used; @ObfuscatedName("b") @Export("cftab") int[] cftab; - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -420415873 + intValue = -1999043287 ) @Export("nInUse") int nInUse; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @Export("inUse") boolean[] inUse; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @Export("inUse16") boolean[] inUse16; @ObfuscatedName("ao") @@ -125,80 +127,58 @@ public final class BZip2State { @ObfuscatedName("ae") @Export("ll8") byte[] ll8; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("getAndMoveToFrontDecode_yy") int[] getAndMoveToFrontDecode_yy; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("selector") byte[] selector; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @Export("selectorMtf") byte[] selectorMtf; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("temp_charArray2d") byte[][] temp_charArray2d; - @ObfuscatedName("ak") + @ObfuscatedName("aa") @Export("limit") int[][] limit; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @Export("base") int[][] base; - @ObfuscatedName("as") + @ObfuscatedName("at") @Export("perm") int[][] perm; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("minLens") int[] minLens; - @ObfuscatedName("ap") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 202332287 + intValue = 960928111 ) - int field3766; + int field3770; BZip2State() { - this.field3750 = 4096; - this.field3784 = 16; - this.field3749 = 258; - this.field3755 = 6; - this.field3751 = 50; - this.field3752 = 18002; - this.nextByte = 0; - this.next_out = 0; - this.unzftab = new int[256]; - this.cftab = new int[257]; - this.inUse = new boolean[256]; - this.inUse16 = new boolean[16]; - this.seqToUnseq = new byte[256]; - this.ll8 = new byte[4096]; - this.getAndMoveToFrontDecode_yy = new int[16]; - this.selector = new byte[18002]; - this.selectorMtf = new byte[18002]; - this.temp_charArray2d = new byte[6][258]; - this.limit = new int[6][258]; - this.base = new int[6][258]; - this.perm = new int[6][258]; - this.minLens = new int[6]; - } - - @ObfuscatedName("iq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lhd;I)Ljava/lang/String;", - garbageValue = "-1638627143" - ) - static String method6001(String var0, Widget var1) { - if (var0.indexOf("%") != -1) { - for (int var2 = 1; var2 <= 5; ++var2) { - while (true) { - int var3 = var0.indexOf("%" + var2); - if (var3 == -1) { - break; - } - - var0 = var0.substring(0, var3) + class225.method4182(Canvas.method923(var1, var2 - 1)) + var0.substring(var3 + 2); - } - } - } - - return var0; - } + this.field3754 = 4096; // L: 4 + this.field3748 = 16; // L: 5 + this.field3784 = 258; // L: 6 + this.field3772 = 6; // L: 7 + this.field3751 = 50; // L: 8 + this.field3760 = 18002; // L: 9 + this.nextByte = 0; // L: 11 + this.next_out = 0; // L: 14 + this.unzftab = new int[256]; // L: 25 + this.cftab = new int[257]; // L: 27 + this.inUse = new boolean[256]; // L: 30 + this.inUse16 = new boolean[16]; // L: 31 + this.seqToUnseq = new byte[256]; // L: 32 + this.ll8 = new byte[4096]; // L: 33 + this.getAndMoveToFrontDecode_yy = new int[16]; // L: 34 + this.selector = new byte[18002]; // L: 35 + this.selectorMtf = new byte[18002]; // L: 36 + this.temp_charArray2d = new byte[6][258]; // L: 37 + this.limit = new int[6][258]; // L: 38 + this.base = new int[6][258]; // L: 39 + this.perm = new int[6][258]; // L: 40 + this.minLens = new int[6]; // L: 41 + } // L: 44 } diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 4b5549197e..604112a0cd 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -1,246 +1,338 @@ +import java.io.IOException; +import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ez") +@ObfuscatedName("eb") @Implements("BoundaryObject") public final class BoundaryObject { - @ObfuscatedName("m") + @ObfuscatedName("nf") @ObfuscatedGetter( - intValue = 175264999 + intValue = 1982051309 ) - @Export("tileHeight") - int tileHeight; - @ObfuscatedName("o") + @Export("widgetDragDuration") + static int widgetDragDuration; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 782033861 + intValue = 1829902819 ) - @Export("x") - int x; - @ObfuscatedName("q") + @Export("graphicsTickTimeIdx") + static int graphicsTickTimeIdx; + @ObfuscatedName("gc") + @Export("xteaKeys") + static int[][] xteaKeys; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1104746355 - ) - @Export("y") - int y; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -742181125 + intValue = 1415372023 ) @Export("orientationA") int orientationA; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1690066511 + intValue = -506654425 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1147548215 + ) + @Export("x") + int x; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1940819727 + ) + @Export("y") + int y; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1131836163 ) @Export("orientationB") int orientationB; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lez;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lez;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - longValue = 3086546930439306913L + longValue = 6638213269109827123L ) @Export("tag") public long tag; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 485971219 + intValue = 1666155333 ) @Export("flags") int flags; BoundaryObject() { - this.tag = 0L; - this.flags = 0; + this.tag = 0L; // L: 11 + this.flags = 0; // L: 12 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1351583068" + descriptor = "(I)Z", + garbageValue = "1497980399" ) - static void method3390() { - Tiles.field530 = null; - Tiles.field524 = null; - Tiles.field525 = null; - WorldMapLabel.field269 = null; - HealthBarUpdate.field1031 = null; - class171.field2036 = null; - Tiles.field526 = null; - BuddyRankComparator.Tiles_hue = null; - GrandExchangeOfferAgeComparator.Tiles_saturation = null; - TextureProvider.Tiles_lightness = null; - class237.Tiles_hueMultiplier = null; - WorldMapRectangle.field198 = null; - } - - @ObfuscatedName("hz") - @ObfuscatedSignature( - descriptor = "(Lkb;I)V", - garbageValue = "-1547224129" - ) - static final void method3389(PacketBuffer var0) { - for (int var1 = 0; var1 < Client.field718; ++var1) { - int var2 = Client.field719[var1]; - NPC var3 = Client.npcs[var2]; - int var4 = var0.readUnsignedByte(); - int var5; - int var6; - int var7; - if ((var4 & 128) != 0) { - var5 = var0.method5755(); - if (var5 == 65535) { - var5 = -1; - } - - var6 = var0.method5746(); - if (var5 == var3.sequence && var5 != -1) { - var7 = NetSocket.SequenceDefinition_get(var5).field3561; - if (var7 == 1) { - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field1000 = 0; - } - - if (var7 == 2) { - var3.field1000 = 0; - } - } else if (var5 == -1 || var3.sequence == -1 || NetSocket.SequenceDefinition_get(var5).field3543 >= NetSocket.SequenceDefinition_get(var3.sequence).field3543) { - var3.sequence = var5; - var3.sequenceFrame = 0; - var3.sequenceFrameCycle = 0; - var3.sequenceDelay = var6; - var3.field1000 = 0; - var3.field1023 = var3.pathLength; - } - } - - int var8; - if ((var4 & 16) != 0) { - var5 = var0.readUnsignedShort(); - var6 = var0.method5755(); - var7 = var3.x - (var5 - class182.baseX - class182.baseX) * 64; - var8 = var3.y - (var6 - SecureRandomFuture.baseY - SecureRandomFuture.baseY) * 64; - if (var7 != 0 || var8 != 0) { - var3.field992 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047; - } - } - - if ((var4 & 2) != 0) { - var3.field995 = var0.method5751(); - var3.field1008 = var0.readByte(); - var3.field1007 = var0.readByte(); - var3.field1009 = var0.method5751(); - var3.field966 = var0.method5757() + Client.cycle; - var3.field1011 = var0.method5755() + Client.cycle; - var3.field1006 = var0.readUnsignedShort(); - var3.pathLength = 1; - var3.field1023 = 0; - var3.field995 += var3.pathX[0]; - var3.field1008 += var3.pathY[0]; - var3.field1007 += var3.pathX[0]; - var3.field1009 += var3.pathY[0]; - } - - if ((var4 & 1) != 0) { - var5 = var0.method5748(); - int var9; - int var10; - int var11; - if (var5 > 0) { - for (var6 = 0; var6 < var5; ++var6) { - var8 = -1; - var9 = -1; - var10 = -1; - var7 = var0.readUShortSmart(); - if (var7 == 32767) { - var7 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - var8 = var0.readUShortSmart(); - var10 = var0.readUShortSmart(); - } else if (var7 != 32766) { - var9 = var0.readUShortSmart(); - } else { - var7 = -1; - } - - var11 = var0.readUShortSmart(); - var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11); - } - } - - var6 = var0.readUnsignedByte(); - if (var6 > 0) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var0.readUShortSmart(); - var9 = var0.readUShortSmart(); - if (var9 != 32767) { - var10 = var0.readUShortSmart(); - var11 = var0.readUnsignedByte(); - int var12 = var9 > 0 ? var0.readUnsignedByte() : var11; - var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12); - } else { - var3.removeHealthBar(var8); - } - } - } - } - - if ((var4 & 32) != 0) { - var3.overheadText = var0.readStringCp1252NullTerminated(); - var3.overheadTextCyclesRemaining = 100; - } - - if ((var4 & 4) != 0) { - var3.definition = StudioGame.getNpcDefinition(var0.method5757()); - var3.field967 = var3.definition.size; - var3.field1017 = var3.definition.rotation; - var3.walkSequence = var3.definition.walkSequence; - var3.walkBackSequence = var3.definition.walkBackSequence; - var3.walkLeftSequence = var3.definition.walkLeftSequence; - var3.walkRightSequence = var3.definition.walkRightSequence; - var3.idleSequence = var3.definition.idleSequence; - var3.turnLeftSequence = var3.definition.turnLeftSequence; - var3.turnRightSequence = var3.definition.turnRightSequence; - } - - if ((var4 & 8) != 0) { - var3.targetIndex = var0.readUnsignedShort(); - if (var3.targetIndex == 65535) { - var3.targetIndex = -1; - } - } - - if ((var4 & 64) != 0) { - var3.spotAnimation = var0.method5757(); - var5 = var0.method5767(); - var3.field1005 = var5 >> 16; - var3.field987 = (var5 & 65535) + Client.cycle; - var3.spotAnimationFrame = 0; - var3.spotAnimationFrameCycle = 0; - if (var3.field987 > Client.cycle) { - var3.spotAnimationFrame = -1; - } - - if (var3.spotAnimation == 65535) { - var3.spotAnimation = -1; - } - } + public static boolean method3384() { + long var0 = PacketWriter.currentTimeMillis(); // L: 42 + int var2 = (int)(var0 - NetCache.field3195); // L: 43 + NetCache.field3195 = var0; // L: 44 + if (var2 > 200) { // L: 45 + var2 = 200; } + NetCache.NetCache_loadTime += var2; // L: 46 + if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { // L: 47 + return true; + } else if (NetCache.NetCache_socket == null) { // L: 48 + return false; + } else { + try { + if (NetCache.NetCache_loadTime > 30000) { // L: 50 + throw new IOException(); + } else { + NetFileRequest var3; + Buffer var4; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { // L: 51 + var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); // L: 52 + var4 = new Buffer(4); // L: 53 + var4.writeByte(1); // L: 54 + var4.writeMedium((int)var3.key); // L: 55 + NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 56 + NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); // L: 57 + --NetCache.NetCache_pendingPriorityWritesCount; // L: 58 + ++NetCache.NetCache_pendingPriorityResponsesCount; // L: 59 + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { // L: 61 + var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); // L: 62 + var4 = new Buffer(4); // L: 63 + var4.writeByte(0); // L: 64 + var4.writeMedium((int)var3.key); // L: 65 + NetCache.NetCache_socket.write(var4.array, 0, 4); // L: 66 + var3.removeDual(); // L: 67 + NetCache.NetCache_pendingResponses.put(var3, var3.key); // L: 68 + --NetCache.NetCache_pendingWritesCount; // L: 69 + ++NetCache.NetCache_pendingResponsesCount; // L: 70 + } + + for (int var15 = 0; var15 < 100; ++var15) { // L: 72 + int var16 = NetCache.NetCache_socket.available(); // L: 73 + if (var16 < 0) { // L: 74 + throw new IOException(); + } + + if (var16 == 0) { // L: 75 + break; + } + + NetCache.NetCache_loadTime = 0; // L: 76 + byte var5 = 0; // L: 77 + if (TilePaint.NetCache_currentResponse == null) { // L: 78 + var5 = 8; + } else if (NetCache.field3205 == 0) { // L: 79 + var5 = 1; + } + + int var6; + int var7; + int var8; + int var10; + byte[] var10000; + int var10001; + Buffer var22; + if (var5 > 0) { // L: 80 + var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; // L: 81 + if (var6 > var16) { // L: 82 + var6 = var16; + } + + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); // L: 83 + if (NetCache.field3208 != 0) { // L: 84 + for (var7 = 0; var7 < var6; ++var7) { // L: 85 + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = NetCache.NetCache_responseHeaderBuffer.offset + var7; + var10000[var10001] ^= NetCache.field3208; + } + } + + var22 = NetCache.NetCache_responseHeaderBuffer; // L: 87 + var22.offset += var6; + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { // L: 88 + break; + } + + if (TilePaint.NetCache_currentResponse == null) { // L: 89 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 90 + var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 91 + var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); // L: 92 + int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); // L: 93 + var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); // L: 94 + long var11 = (long)(var8 + (var7 << 16)); // L: 95 + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); // L: 96 + UrlRequest.field1986 = true; // L: 97 + if (var13 == null) { // L: 98 + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); // L: 99 + UrlRequest.field1986 = false; // L: 100 + } + + if (var13 == null) { // L: 102 + throw new IOException(); // L: 103 + } + + int var14 = var9 == 0 ? 5 : 9; // L: 105 + TilePaint.NetCache_currentResponse = var13; // L: 106 + class224.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + TilePaint.NetCache_currentResponse.padding); // L: 107 + class224.NetCache_responseArchiveBuffer.writeByte(var9); // L: 108 + class224.NetCache_responseArchiveBuffer.writeInt(var10); // L: 109 + NetCache.field3205 = 8; // L: 110 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 111 + } else if (NetCache.field3205 == 0) { // L: 114 + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { // L: 115 + NetCache.field3205 = 1; // L: 116 + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 117 + } else { + TilePaint.NetCache_currentResponse = null; // L: 121 + } + } + } else { + var6 = class224.NetCache_responseArchiveBuffer.array.length - TilePaint.NetCache_currentResponse.padding; // L: 127 + var7 = 512 - NetCache.field3205; // L: 128 + if (var7 > var6 - class224.NetCache_responseArchiveBuffer.offset) { // L: 129 + var7 = var6 - class224.NetCache_responseArchiveBuffer.offset; + } + + if (var7 > var16) { // L: 130 + var7 = var16; + } + + NetCache.NetCache_socket.read(class224.NetCache_responseArchiveBuffer.array, class224.NetCache_responseArchiveBuffer.offset, var7); // L: 131 + if (NetCache.field3208 != 0) { // L: 132 + for (var8 = 0; var8 < var7; ++var8) { // L: 133 + var10000 = class224.NetCache_responseArchiveBuffer.array; + var10001 = var8 + class224.NetCache_responseArchiveBuffer.offset; + var10000[var10001] ^= NetCache.field3208; + } + } + + var22 = class224.NetCache_responseArchiveBuffer; // L: 135 + var22.offset += var7; + NetCache.field3205 += var7; // L: 136 + if (var6 == class224.NetCache_responseArchiveBuffer.offset) { // L: 137 + if (16711935L == TilePaint.NetCache_currentResponse.key) { // L: 138 + MenuAction.NetCache_reference = class224.NetCache_responseArchiveBuffer; // L: 139 + + for (var8 = 0; var8 < 256; ++var8) { // L: 140 + Archive var17 = NetCache.NetCache_archives[var8]; // L: 141 + if (var17 != null) { // L: 142 + MenuAction.NetCache_reference.offset = var8 * 8 + 5; // L: 143 + var10 = MenuAction.NetCache_reference.readInt(); // L: 144 + int var18 = MenuAction.NetCache_reference.readInt(); // L: 145 + var17.loadIndex(var10, var18); // L: 146 + } + } + } else { + NetCache.NetCache_crc.reset(); // L: 151 + NetCache.NetCache_crc.update(class224.NetCache_responseArchiveBuffer.array, 0, var6); // L: 152 + var8 = (int)NetCache.NetCache_crc.getValue(); // L: 153 + if (var8 != TilePaint.NetCache_currentResponse.crc) { // L: 154 + try { + NetCache.NetCache_socket.close(); // L: 156 + } catch (Exception var20) { // L: 158 + } + + ++NetCache.NetCache_crcMismatches; // L: 159 + NetCache.NetCache_socket = null; // L: 160 + NetCache.field3208 = (byte)((int)(Math.random() * 255.0D + 1.0D)); // L: 161 + return false; // L: 162 + } + + NetCache.NetCache_crcMismatches = 0; // L: 164 + NetCache.NetCache_ioExceptions = 0; // L: 165 + TilePaint.NetCache_currentResponse.archive.write((int)(TilePaint.NetCache_currentResponse.key & 65535L), class224.NetCache_responseArchiveBuffer.array, 16711680L == (TilePaint.NetCache_currentResponse.key & 16711680L), UrlRequest.field1986); // L: 166 + } + + TilePaint.NetCache_currentResponse.remove(); // L: 168 + if (UrlRequest.field1986) { // L: 169 + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; // L: 170 + } + + NetCache.field3205 = 0; // L: 171 + TilePaint.NetCache_currentResponse = null; // L: 172 + class224.NetCache_responseArchiveBuffer = null; // L: 173 + } else { + if (NetCache.field3205 != 512) { // L: 175 + break; + } + + NetCache.field3205 = 0; + } + } + } + + return true; // L: 179 + } + } catch (IOException var21) { + try { + NetCache.NetCache_socket.close(); // L: 183 + } catch (Exception var19) { // L: 185 + } + + ++NetCache.NetCache_ioExceptions; // L: 186 + NetCache.NetCache_socket = null; // L: 187 + return false; // L: 188 + } + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)[Lju;", + garbageValue = "1966430023" + ) + static HorizontalAlignment[] method3386() { + return new HorizontalAlignment[]{HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3479, HorizontalAlignment.field3481}; // L: 14 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lic;Lic;Lic;Lge;B)Z", + garbageValue = "72" + ) + public static boolean method3385(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) { + class206.musicPatchesArchive = var0; // L: 26 + class206.musicSamplesArchive = var1; // L: 27 + ModelData0.soundEffectsArchive = var2; // L: 28 + class206.midiPcmStream = var3; // L: 29 + return true; // L: 30 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)Ljava/security/SecureRandom;", + garbageValue = "-579146436" + ) + static SecureRandom method3387() { + SecureRandom var0 = new SecureRandom(); // L: 39 + var0.nextInt(); // L: 40 + return var0; // L: 41 } } diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java index bc982a7cbd..270c42fef2 100644 --- a/runescape-client/src/main/java/Bounds.java +++ b/runescape-client/src/main/java/Bounds.java @@ -4,140 +4,143 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lv") +@ObfuscatedName("lr") @Implements("Bounds") public class Bounds { - @ObfuscatedName("m") + @ObfuscatedName("w") + @Export("Widget_loadedInterfaces") + public static boolean[] Widget_loadedInterfaces; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -961758993 + intValue = -942038373 ) @Export("lowX") public int lowX; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1458350895 + intValue = -38208119 ) @Export("lowY") public int lowY; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 875525085 + intValue = -468327151 ) @Export("highX") public int highX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1188404153 + intValue = 85471293 ) @Export("highY") public int highY; public Bounds(int var1, int var2, int var3, int var4) { - this.setLow(var1, var2); - this.setHigh(var3, var4); - } + this.setLow(var1, var2); // L: 14 + this.setHigh(var3, var4); // L: 15 + } // L: 16 public Bounds(int var1, int var2) { - this(0, 0, var1, var2); - } + this(0, 0, var1, var2); // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-2102954293" + garbageValue = "1517519205" ) @Export("setLow") public void setLow(int var1, int var2) { - this.lowX = var1; - this.lowY = var2; - } + this.lowX = var1; // L: 19 + this.lowY = var2; // L: 20 + } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-40" + descriptor = "(III)V", + garbageValue = "1357233631" ) @Export("setHigh") public void setHigh(int var1, int var2) { - this.highX = var1; - this.highY = var2; - } + this.highX = var1; // L: 24 + this.highY = var2; // L: 25 + } // L: 26 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Llv;Llv;I)V", - garbageValue = "1555379366" + descriptor = "(Llr;Llr;S)V", + garbageValue = "172" ) - public void method6202(Bounds var1, Bounds var2) { - this.method6199(var1, var2); - this.method6194(var1, var2); - } + public void method6089(Bounds var1, Bounds var2) { + this.method6090(var1, var2); // L: 33 + this.method6087(var1, var2); // L: 34 + } // L: 35 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Llv;Llv;B)V", - garbageValue = "58" + descriptor = "(Llr;Llr;I)V", + garbageValue = "-805505027" ) - void method6199(Bounds var1, Bounds var2) { - var2.lowX = this.lowX; - var2.highX = this.highX; - if (this.lowX < var1.lowX) { - var2.highX = (var2.highX * 73759861 - (var1.lowX * 73759861 - this.lowX * 73759861)) * 875525085; - var2.lowX = var1.lowX; + void method6090(Bounds var1, Bounds var2) { + var2.lowX = this.lowX; // L: 38 + var2.highX = this.highX; // L: 39 + if (this.lowX < var1.lowX) { // L: 40 + var2.highX = (var2.highX * 1565633521 - (var1.lowX * 1565633521 - this.lowX * 1565633521)) * -468327151; // L: 41 + var2.lowX = var1.lowX; // L: 42 } - if (var2.method6193() > var1.method6193()) { - var2.highX -= var2.method6193() - var1.method6193(); + if (var2.method6091() > var1.method6091()) { // L: 44 + var2.highX -= var2.method6091() - var1.method6091(); // L: 45 } - if (var2.highX < 0) { + if (var2.highX < 0) { // L: 47 var2.highX = 0; } - } + } // L: 48 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Llv;Llv;I)V", - garbageValue = "-810970943" + descriptor = "(Llr;Llr;I)V", + garbageValue = "1845749630" ) - void method6194(Bounds var1, Bounds var2) { - var2.lowY = this.lowY; - var2.highY = this.highY; - if (this.lowY < var1.lowY) { - var2.highY = (var2.highY * 1962542455 - (var1.lowY * 1962542455 - this.lowY * 1962542455)) * -1188404153; - var2.lowY = var1.lowY; + void method6087(Bounds var1, Bounds var2) { + var2.lowY = this.lowY; // L: 51 + var2.highY = this.highY; // L: 52 + if (this.lowY < var1.lowY) { // L: 53 + var2.highY = (var2.highY * -1438521579 - (var1.lowY * -1438521579 - this.lowY * -1438521579)) * 85471293; // L: 54 + var2.lowY = var1.lowY; // L: 55 } - if (var2.method6196() > var1.method6196()) { - var2.highY -= var2.method6196() - var1.method6196(); + if (var2.method6092() > var1.method6092()) { // L: 57 + var2.highY -= var2.method6092() - var1.method6092(); // L: 58 } - if (var2.highY < 0) { + if (var2.highY < 0) { // L: 60 var2.highY = 0; } - } + } // L: 61 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "515582700" + garbageValue = "-1918003577" ) - int method6193() { - return this.lowX + this.highX; + int method6091() { + return this.highX + this.lowX; // L: 64 } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-500619811" + descriptor = "(B)I", + garbageValue = "97" ) - int method6196() { - return this.lowY + this.highY; + int method6092() { + return this.highY + this.lowY; // L: 68 } public String toString() { - return null; + return null; // L: 29 } } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 768c4048dc..35e78cff2a 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -4,177 +4,75 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kx") +@ObfuscatedName("ko") @Implements("Buddy") public class Buddy extends User { - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 746026781 + intValue = 1220284933 ) @Export("world") public int world; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2013337995 + intValue = -224698591 ) @Export("int2") public int int2; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1889859317 + intValue = -263202513 ) @Export("rank") public int rank; Buddy() { - this.world = -1; - } + this.world = -1; // L: 4 + } // L: 8 - @ObfuscatedName("aw") + @ObfuscatedName("bz") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-820539853" + garbageValue = "-580421822" ) @Export("set") void set(int var1, int var2) { - this.world = var1; - this.int2 = var2; - } + this.world = var1; // L: 11 + this.int2 = var2; // L: 12 + } // L: 13 - @ObfuscatedName("az") + @ObfuscatedName("bj") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1724193250" + garbageValue = "-907221261" ) @Export("getWorld") public int getWorld() { - return this.world; + return this.world; // L: 16 } - @ObfuscatedName("aq") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-279238296" + descriptor = "(S)Z", + garbageValue = "4837" ) @Export("hasWorld") public boolean hasWorld() { - return this.world > 0; + return this.world > 0; // L: 20 } - @ObfuscatedName("m") + @ObfuscatedName("jp") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "562871414" + descriptor = "(II)Z", + garbageValue = "1739727093" ) - static int method5363(int var0, int var1) { - FloorOverlayDefinition var3 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); - FloorOverlayDefinition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var4 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0); - var3 = new FloorOverlayDefinition(); - if (var4 != null) { - var3.decode(new Buffer(var4), var0); - } - - var3.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var3, (long)var0); - var2 = var3; - } - - if (var2 == null) { - return var1; - } else if (var2.secondaryRgb >= 0) { - return var2.secondaryRgb | -16777216; - } else { - int var5; - byte var6; - int var8; - int var9; - if (var2.texture >= 0) { - var5 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var2.texture); - var6 = 96; - if (var5 == -2) { - var8 = 12345678; - } else if (var5 == -1) { - if (var6 < 0) { - var6 = 0; - } else if (var6 > 127) { - var6 = 127; - } - - var9 = 127 - var6; - var8 = var9; - } else { - var9 = var6 * (var5 & 127) / 128; - if (var9 < 2) { - var9 = 2; - } else if (var9 > 126) { - var9 = 126; - } - - var8 = var9 + (var5 & 65408); - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var8] | -16777216; - } else if (var2.primaryRgb == 16711935) { - return var1; - } else { - var8 = Players.method2285(var2.hue, var2.saturation, var2.lightness); - var6 = 96; - if (var8 == -2) { - var5 = 12345678; - } else if (var8 == -1) { - if (var6 < 0) { - var6 = 0; - } else if (var6 > 127) { - var6 = 127; - } - - var9 = 127 - var6; - var5 = var9; - } else { - var9 = var6 * (var8 & 127) / 128; - if (var9 < 2) { - var9 = 2; - } else if (var9 > 126) { - var9 = 126; - } - - var5 = var9 + (var8 & 65408); - } - - return Rasterizer3D.Rasterizer3D_colorPalette[var5] | -16777216; + static boolean method5277(int var0) { + for (int var1 = 0; var1 < Client.field898; ++var1) { // L: 10103 + if (Client.field900[var1] == var0) { // L: 10104 + return true; } } - } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lic;III)Llh;", - garbageValue = "214880487" - ) - static IndexedSprite method5355(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); - boolean var3; - if (var4 == null) { - var3 = false; - } else { - class3.SpriteBuffer_decode(var4); - var3 = true; - } - - return !var3 ? null : AttackOption.method2173(); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "1714" - ) - static void method5349(int var0) { - Login.loginIndex = 12; - Login.field1212 = var0; + return false; // L: 10106 } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index 1f853bbd80..f8961d9dc3 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -1,56 +1,97 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fn") +@ObfuscatedName("fm") @Implements("BuddyRankComparator") public class BuddyRankComparator extends AbstractUserComparator { + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 841228159 + ) + @Export("musicTrackGroupId") + public static int musicTrackGroupId; + @ObfuscatedName("jo") + @ObfuscatedSignature( + descriptor = "Lhq;" + ) + @Export("dragInventoryWidget") + static Widget dragInventoryWidget; @ObfuscatedName("z") - @Export("Tiles_hue") - static int[] Tiles_hue; - @ObfuscatedName("m") @Export("reversed") final boolean reversed; public BuddyRankComparator(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;I)I", - garbageValue = "1665981134" + descriptor = "(Lko;Lko;I)I", + garbageValue = "-895598946" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var2.rank != var1.rank) { - return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; + if (var2.rank != var1.rank) { // L: 14 + return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; // L: 15 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 17 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } - @ObfuscatedName("ka") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1830826767" + descriptor = "([BIILec;[Lft;B)V", + garbageValue = "52" ) - static String method3556(String var0) { - PlayerType[] var1 = VarbitDefinition.PlayerType_values(); + static final void method3524(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { + Buffer var5 = new Buffer(var0); // L: 205 + int var6 = -1; // L: 206 - for (int var2 = 0; var2 < var1.length; ++var2) { - PlayerType var3 = var1[var2]; - if (var3.modIcon != -1 && var0.startsWith(WorldMapRegion.method611(var3.modIcon))) { - var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); - break; + while (true) { + int var7 = var5.method5632(); // L: 208 + if (var7 == 0) { // L: 209 + return; // L: 233 + } + + var6 += var7; // L: 210 + int var8 = 0; // L: 211 + + while (true) { + int var9 = var5.readUShortSmart(); // L: 213 + if (var9 == 0) { // L: 214 + break; + } + + var8 += var9 - 1; // L: 215 + int var10 = var8 & 63; // L: 216 + int var11 = var8 >> 6 & 63; // L: 217 + int var12 = var8 >> 12; // L: 218 + int var13 = var5.readUnsignedByte(); // L: 219 + int var14 = var13 >> 2; // L: 220 + int var15 = var13 & 3; // L: 221 + int var16 = var11 + var1; // L: 222 + int var17 = var10 + var2; // L: 223 + if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { // L: 224 + int var18 = var12; // L: 225 + if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { // L: 226 + var18 = var12 - 1; + } + + CollisionMap var19 = null; // L: 227 + if (var18 >= 0) { // L: 228 + var19 = var4[var18]; + } + + GrandExchangeOfferWorldComparator.method137(var12, var16, var17, var6, var15, var14, var3, var19); // L: 229 + } } } - - return var0; } } diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index 0d4379c2c1..df7b1134e7 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -5,1074 +5,1108 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kn") +@ObfuscatedName("kf") @Implements("Buffer") public class Buffer extends Node { - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("crc32Table") static int[] crc32Table; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("crc64Table") static long[] crc64Table; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("array") public byte[] array; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1437110173 + intValue = -249160527 ) @Export("offset") public int offset; static { - crc32Table = new int[256]; + crc32Table = new int[256]; // L: 14 int var2; - for (int var1 = 0; var1 < 256; ++var1) { - int var0 = var1; + for (int var1 = 0; var1 < 256; ++var1) { // L: 19 + int var4 = var1; // L: 20 - for (var2 = 0; var2 < 8; ++var2) { - if ((var0 & 1) == 1) { - var0 = var0 >>> 1 ^ -306674912; + for (var2 = 0; var2 < 8; ++var2) { // L: 21 + if ((var4 & 1) == 1) { // L: 22 + var4 = var4 >>> 1 ^ -306674912; } else { - var0 >>>= 1; + var4 >>>= 1; // L: 23 } } - crc32Table[var1] = var0; + crc32Table[var1] = var4; // L: 25 } - crc64Table = new long[256]; + crc64Table = new long[256]; // L: 29 - for (var2 = 0; var2 < 256; ++var2) { - long var4 = (long)var2; + for (var2 = 0; var2 < 256; ++var2) { // L: 34 + long var0 = (long)var2; // L: 35 - for (int var3 = 0; var3 < 8; ++var3) { - if ((var4 & 1L) == 1L) { - var4 = var4 >>> 1 ^ -3932672073523589310L; + for (int var3 = 0; var3 < 8; ++var3) { // L: 36 + if ((var0 & 1L) == 1L) { // L: 37 + var0 = var0 >>> 1 ^ -3932672073523589310L; } else { - var4 >>>= 1; + var0 >>>= 1; // L: 38 } } - crc64Table[var2] = var4; + crc64Table[var2] = var0; // L: 40 } - } + } // L: 42 public Buffer(int var1) { - this.array = WorldMapIcon_0.ByteArrayPool_getArray(var1); - this.offset = 0; - } + this.array = class298.ByteArrayPool_getArray(var1); // L: 58 + this.offset = 0; // L: 59 + } // L: 60 public Buffer(byte[] var1) { - this.array = var1; - this.offset = 0; - } + this.array = var1; // L: 63 + this.offset = 0; // L: 64 + } // L: 65 - @ObfuscatedName("bh") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1332846958" + descriptor = "(B)V", + garbageValue = "0" ) @Export("releaseArray") public void releaseArray() { - if (this.array != null) { - User.ByteArrayPool_release(this.array); + if (this.array != null) { // L: 68 + Canvas.ByteArrayPool_release(this.array); } - this.array = null; - } + this.array = null; // L: 69 + } // L: 70 - @ObfuscatedName("bg") + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-238244279" + descriptor = "(IS)V", + garbageValue = "1229" ) @Export("writeByte") public void writeByte(int var1) { - this.array[++this.offset - 1] = (byte)var1; - } + this.array[++this.offset - 1] = (byte)var1; // L: 73 + } // L: 74 - @ObfuscatedName("be") + @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-2062616020" + garbageValue = "-1689611223" ) @Export("writeShort") public void writeShort(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - } + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 77 + this.array[++this.offset - 1] = (byte)var1; // L: 78 + } // L: 79 - @ObfuscatedName("bf") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1322343150" + descriptor = "(IB)V", + garbageValue = "77" ) @Export("writeMedium") public void writeMedium(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - } + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 82 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 83 + this.array[++this.offset - 1] = (byte)var1; // L: 84 + } // L: 85 - @ObfuscatedName("ba") + @ObfuscatedName("af") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "1526300467" + garbageValue = "-471050402" ) @Export("writeInt") public void writeInt(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - } + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 88 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 89 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 90 + this.array[++this.offset - 1] = (byte)var1; // L: 91 + } // L: 92 - @ObfuscatedName("bd") + @ObfuscatedName("ak") @Export("writeLongMedium") public void writeLongMedium(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); - this.array[++this.offset - 1] = (byte)((int)var1); - } + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 95 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 96 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 97 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 98 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 99 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 100 + } // L: 101 - @ObfuscatedName("bb") + @ObfuscatedName("ac") @Export("writeLong") public void writeLong(long var1) { - this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); - this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); - this.array[++this.offset - 1] = (byte)((int)var1); - } - - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1754555155" - ) - @Export("writeBoolean") - public void writeBoolean(boolean var1) { - this.writeByte(var1 ? 1 : 0); - } - - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "914637380" - ) - @Export("writeStringCp1252NullTerminated") - public void writeStringCp1252NullTerminated(String var1) { - int var2 = var1.indexOf(0); - if (var2 >= 0) { - throw new IllegalArgumentException(""); - } else { - this.offset += class90.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; - } - } - - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "2130981128" - ) - @Export("writeStringCp1252NullCircumfixed") - public void writeStringCp1252NullCircumfixed(String var1) { - int var2 = var1.indexOf(0); - if (var2 >= 0) { - throw new IllegalArgumentException(""); - } else { - this.array[++this.offset - 1] = 0; - this.offset += class90.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; - } - } - - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)V", - garbageValue = "1273602380" - ) - @Export("writeCESU8") - public void writeCESU8(CharSequence var1) { - int var3 = var1.length(); - int var4 = 0; - - int var5; - for (var5 = 0; var5 < var3; ++var5) { - char var6 = var1.charAt(var5); - if (var6 <= 127) { - ++var4; - } else if (var6 <= 2047) { - var4 += 2; - } else { - var4 += 3; - } - } - - this.array[++this.offset - 1] = 0; - this.writeVarInt(var4); - var4 = this.offset * 192844107; - byte[] var12 = this.array; - int var7 = this.offset; - int var8 = var1.length(); - int var9 = var7; - - for (int var10 = 0; var10 < var8; ++var10) { - char var11 = var1.charAt(var10); - if (var11 <= 127) { - var12[var9++] = (byte)var11; - } else if (var11 <= 2047) { - var12[var9++] = (byte)(192 | var11 >> 6); - var12[var9++] = (byte)(128 | var11 & '?'); - } else { - var12[var9++] = (byte)(224 | var11 >> '\f'); - var12[var9++] = (byte)(128 | var11 >> 6 & 63); - var12[var9++] = (byte)(128 | var11 & '?'); - } - } - - var5 = var9 - var7; - this.offset = (var5 * 192844107 + var4) * -1437110173; - } - - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "96" - ) - @Export("writeBytes") - public void writeBytes(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { - this.array[++this.offset - 1] = var1[var4]; - } - - } + this.array[++this.offset - 1] = (byte)((int)(var1 >> 56)); // L: 104 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 48)); // L: 105 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 40)); // L: 106 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 32)); // L: 107 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 24)); // L: 108 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 16)); // L: 109 + this.array[++this.offset - 1] = (byte)((int)(var1 >> 8)); // L: 110 + this.array[++this.offset - 1] = (byte)((int)var1); // L: 111 + } // L: 112 @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-914578816" + descriptor = "(ZI)V", + garbageValue = "581507378" ) - public void method5711(Buffer var1) { - this.writeBytes(var1.array, 0, var1.offset); - } - - @ObfuscatedName("bv") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1697969107" - ) - @Export("writeLengthInt") - public void writeLengthInt(int var1) { - if (var1 < 0) { - throw new IllegalArgumentException(); - } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); - this.array[this.offset - var1 - 1] = (byte)var1; - } - } - - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-510969382" - ) - @Export("writeLengthShort") - public void writeLengthShort(int var1) { - if (var1 >= 0 && var1 <= 65535) { - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); - this.array[this.offset - var1 - 1] = (byte)var1; - } else { - throw new IllegalArgumentException(); - } - } + @Export("writeBoolean") + public void writeBoolean(boolean var1) { + this.writeByte(var1 ? 1 : 0); // L: 115 + } // L: 116 @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "349369645" + ) + @Export("writeStringCp1252NullTerminated") + public void writeStringCp1252NullTerminated(String var1) { + int var2 = var1.indexOf(0); // L: 123 + if (var2 >= 0) { // L: 124 + throw new IllegalArgumentException(""); + } else { + this.offset += SoundSystem.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 125 + this.array[++this.offset - 1] = 0; // L: 126 + } + } // L: 127 + + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "99" + ) + @Export("writeStringCp1252NullCircumfixed") + public void writeStringCp1252NullCircumfixed(String var1) { + int var2 = var1.indexOf(0); // L: 134 + if (var2 >= 0) { // L: 135 + throw new IllegalArgumentException(""); + } else { + this.array[++this.offset - 1] = 0; // L: 136 + this.offset += SoundSystem.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); // L: 137 + this.array[++this.offset - 1] = 0; // L: 138 + } + } // L: 139 + + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)V", + garbageValue = "-1859415815" + ) + @Export("writeCESU8") + public void writeCESU8(CharSequence var1) { + int var2 = FloorOverlayDefinition.method4871(var1); // L: 142 + this.array[++this.offset - 1] = 0; // L: 143 + this.writeVarInt(var2); // L: 144 + int var3 = this.offset * -1261786031; // L: 145 + byte[] var5 = this.array; // L: 147 + int var6 = this.offset; // L: 148 + int var7 = var1.length(); // L: 150 + int var8 = var6; // L: 151 + + for (int var9 = 0; var9 < var7; ++var9) { // L: 152 + char var10 = var1.charAt(var9); // L: 153 + if (var10 <= 127) { // L: 154 + var5[var8++] = (byte)var10; // L: 155 + } else if (var10 <= 2047) { // L: 157 + var5[var8++] = (byte)(192 | var10 >> 6); // L: 158 + var5[var8++] = (byte)(128 | var10 & '?'); // L: 159 + } else { + var5[var8++] = (byte)(224 | var10 >> '\f'); // L: 162 + var5[var8++] = (byte)(128 | var10 >> 6 & 63); // L: 163 + var5[var8++] = (byte)(128 | var10 & '?'); // L: 164 + } + } + + int var4 = var8 - var6; // L: 167 + this.offset = (var3 + var4 * -1261786031) * -249160527; // L: 169 + } // L: 170 + + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "([BIII)V", + garbageValue = "-894436385" + ) + @Export("writeBytes") + public void writeBytes(byte[] var1, int var2, int var3) { + for (int var4 = var2; var4 < var3 + var2; ++var4) { // L: 173 + this.array[++this.offset - 1] = var1[var4]; + } + + } // L: 174 + + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "(Lkf;I)V", + garbageValue = "-2077997319" + ) + public void method5611(Buffer var1) { + this.writeBytes(var1.array, 0, var1.offset); // L: 177 + } // L: 178 + + @ObfuscatedName("bp") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-767264169" + garbageValue = "-369089618" + ) + @Export("writeLengthInt") + public void writeLengthInt(int var1) { + if (var1 < 0) { // L: 181 + throw new IllegalArgumentException(); // L: 182 + } else { + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); // L: 184 + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); // L: 185 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 186 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 187 + } + } // L: 188 + + @ObfuscatedName("bn") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-50" + ) + @Export("writeLengthShort") + public void writeLengthShort(int var1) { + if (var1 >= 0 && var1 <= 65535) { // L: 191 + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); // L: 194 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 195 + } else { + throw new IllegalArgumentException(); // L: 192 + } + } // L: 196 + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1412060467" ) @Export("writeLengthByte") public void writeLengthByte(int var1) { - if (var1 >= 0 && var1 <= 255) { - this.array[this.offset - var1 - 1] = (byte)var1; + if (var1 >= 0 && var1 <= 255) { // L: 199 + this.array[this.offset - var1 - 1] = (byte)var1; // L: 202 } else { - throw new IllegalArgumentException(); + throw new IllegalArgumentException(); // L: 200 } - } + } // L: 203 + + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-92" + ) + @Export("writeSmartByteShort") + public void writeSmartByteShort(int var1) { + if (var1 >= 0 && var1 < 128) { // L: 206 + this.writeByte(var1); // L: 207 + } else if (var1 >= 0 && var1 < 32768) { // L: 210 + this.writeShort(var1 + 32768); // L: 211 + } else { + throw new IllegalArgumentException(); // L: 214 + } + } // L: 208 212 @ObfuscatedName("bu") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "416798651" + garbageValue = "-444619487" ) - @Export("writeSmartByteShort") - public void writeSmartByteShort(int var1) { - if (var1 >= 0 && var1 < 128) { - this.writeByte(var1); - } else if (var1 >= 0 && var1 < 32768) { - this.writeShort(var1 + 32768); - } else { - throw new IllegalArgumentException(); + @Export("writeVarInt") + public void writeVarInt(int var1) { + if ((var1 & -128) != 0) { // L: 218 + if ((var1 & -16384) != 0) { // L: 219 + if ((var1 & -2097152) != 0) { // L: 220 + if ((var1 & -268435456) != 0) { // L: 221 + this.writeByte(var1 >>> 28 | 128); + } + + this.writeByte(var1 >>> 21 | 128); // L: 222 + } + + this.writeByte(var1 >>> 14 | 128); // L: 224 + } + + this.writeByte(var1 >>> 7 | 128); // L: 226 } + + this.writeByte(var1 & 127); // L: 228 + } // L: 229 + + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "600497455" + ) + @Export("readUnsignedByte") + public int readUnsignedByte() { + return this.array[++this.offset - 1] & 255; // L: 232 + } + + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "(B)B", + garbageValue = "66" + ) + @Export("readByte") + public byte readByte() { + return this.array[++this.offset - 1]; // L: 236 + } + + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "(S)I", + garbageValue = "10687" + ) + @Export("readUnsignedShort") + public int readUnsignedShort() { + this.offset += 2; // L: 240 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 241 + } + + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "72" + ) + @Export("readShort") + public int readShort() { + this.offset += 2; // L: 245 + int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 246 + if (var1 > 32767) { // L: 247 + var1 -= 65536; + } + + return var1; // L: 248 } @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "18" + descriptor = "(I)I", + garbageValue = "914016533" ) - @Export("writeVarInt") - public void writeVarInt(int var1) { - if ((var1 & -128) != 0) { - if ((var1 & -16384) != 0) { - if ((var1 & -2097152) != 0) { - if ((var1 & -268435456) != 0) { - this.writeByte(var1 >>> 28 | 128); - } - - this.writeByte(var1 >>> 21 | 128); - } - - this.writeByte(var1 >>> 14 | 128); - } - - this.writeByte(var1 >>> 7 | 128); - } - - this.writeByte(var1 & 127); + @Export("readMedium") + public int readMedium() { + this.offset += 3; // L: 252 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 253 } - @ObfuscatedName("br") + @ObfuscatedName("bq") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "124" + descriptor = "(S)I", + garbageValue = "28464" ) - @Export("readUnsignedByte") - public int readUnsignedByte() { - return this.array[++this.offset - 1] & 255; - } - - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "(B)B", - garbageValue = "81" - ) - @Export("readByte") - public byte readByte() { - return this.array[++this.offset - 1]; + @Export("readInt") + public int readInt() { + this.offset += 4; // L: 257 + return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); // L: 258 } @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "471084162" + descriptor = "(I)J", + garbageValue = "1145152498" ) - @Export("readUnsignedShort") - public int readUnsignedShort() { - this.offset += 2; - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); + @Export("readLong") + public long readLong() { + long var1 = (long)this.readInt() & 4294967295L; // L: 262 + long var3 = (long)this.readInt() & 4294967295L; // L: 263 + return (var1 << 32) + var3; // L: 264 } - @ObfuscatedName("bj") + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "87414619" + descriptor = "(B)Z", + garbageValue = "63" ) - @Export("readShort") - public int readShort() { - this.offset += 2; - int var1 = (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); - if (var1 > 32767) { - var1 -= 65536; + @Export("readBoolean") + public boolean readBoolean() { + return (this.readUnsignedByte() & 1) == 1; // L: 268 + } + + @ObfuscatedName("bk") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "706645017" + ) + @Export("readStringCp1252NullTerminatedOrNull") + public String readStringCp1252NullTerminatedOrNull() { + if (this.array[this.offset] == 0) { // L: 272 + ++this.offset; // L: 273 + return null; // L: 274 + } else { + return this.readStringCp1252NullTerminated(); // L: 276 + } + } + + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "95" + ) + @Export("readStringCp1252NullTerminated") + public String readStringCp1252NullTerminated() { + int var1 = this.offset; // L: 280 + + while (this.array[++this.offset - 1] != 0) { // L: 281 } - return var1; + int var2 = this.offset - var1 - 1; // L: 282 + return var2 == 0 ? "" : SpotAnimationDefinition.decodeStringCp1252(this.array, var1, var2); // L: 283 284 + } + + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "(B)Ljava/lang/String;", + garbageValue = "-101" + ) + @Export("readStringCp1252NullCircumfixed") + public String readStringCp1252NullCircumfixed() { + byte var1 = this.array[++this.offset - 1]; // L: 288 + if (var1 != 0) { // L: 289 + throw new IllegalStateException(""); + } else { + int var2 = this.offset; // L: 290 + + while (this.array[++this.offset - 1] != 0) { // L: 291 + } + + int var3 = this.offset - var2 - 1; // L: 292 + return var3 == 0 ? "" : SpotAnimationDefinition.decodeStringCp1252(this.array, var2, var3); // L: 293 294 + } } @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1982311791" - ) - @Export("readMedium") - public int readMedium() { - this.offset += 3; - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8); - } - - @ObfuscatedName("cc") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "94863796" - ) - @Export("readInt") - public int readInt() { - this.offset += 4; - return ((this.array[this.offset - 3] & 255) << 16) + (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 2] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 24); - } - - @ObfuscatedName("cb") - @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-497792504" - ) - @Export("readLong") - public long readLong() { - long var1 = (long)this.readInt() & 4294967295L; - long var3 = (long)this.readInt() & 4294967295L; - return var3 + (var1 << 32); - } - - @ObfuscatedName("ch") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "364318278" - ) - @Export("readBoolean") - public boolean readBoolean() { - return (this.readUnsignedByte() & 1) == 1; - } - - @ObfuscatedName("cw") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "1669124168" - ) - @Export("readStringCp1252NullTerminatedOrNull") - public String readStringCp1252NullTerminatedOrNull() { - if (this.array[this.offset] == 0) { - ++this.offset; - return null; - } else { - return this.readStringCp1252NullTerminated(); - } - } - - @ObfuscatedName("cz") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "60" - ) - @Export("readStringCp1252NullTerminated") - public String readStringCp1252NullTerminated() { - int var1 = this.offset; - - while (this.array[++this.offset - 1] != 0) { - } - - int var2 = this.offset - var1 - 1; - return var2 == 0 ? "" : MouseRecorder.decodeStringCp1252(this.array, var1, var2); - } - - @ObfuscatedName("cg") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-10" - ) - @Export("readStringCp1252NullCircumfixed") - public String readStringCp1252NullCircumfixed() { - byte var1 = this.array[++this.offset - 1]; - if (var1 != 0) { - throw new IllegalStateException(""); - } else { - int var2 = this.offset; - - while (this.array[++this.offset - 1] != 0) { - } - - int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : MouseRecorder.decodeStringCp1252(this.array, var2, var3); - } - } - - @ObfuscatedName("cn") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1123161230" + garbageValue = "2118487667" ) @Export("readCESU8") public String readCESU8() { - byte var1 = this.array[++this.offset - 1]; - if (var1 != 0) { + byte var1 = this.array[++this.offset - 1]; // L: 298 + if (var1 != 0) { // L: 299 throw new IllegalStateException(""); } else { - int var2 = this.readVarInt(); - if (var2 + this.offset > this.array.length) { + int var2 = this.readVarInt(); // L: 300 + if (var2 + this.offset > this.array.length) { // L: 301 throw new IllegalStateException(""); } else { - String var3 = class4.method48(this.array, this.offset, var2); - this.offset += var2; - return var3; + byte[] var4 = this.array; // L: 303 + int var5 = this.offset; // L: 304 + char[] var6 = new char[var2]; // L: 306 + int var7 = 0; // L: 307 + int var8 = var5; // L: 308 + + int var11; + for (int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) { // L: 309 310 341 + int var10 = var4[var8++] & 255; // L: 311 + if (var10 < 128) { // L: 313 + if (var10 == 0) { // L: 314 + var11 = 65533; + } else { + var11 = var10; // L: 315 + } + } else if (var10 < 192) { // L: 317 + var11 = 65533; + } else if (var10 < 224) { // L: 318 + if (var8 < var9 && (var4[var8] & 192) == 128) { // L: 319 + var11 = (var10 & 31) << 6 | var4[var8++] & 63; // L: 320 + if (var11 < 128) { // L: 321 + var11 = 65533; + } + } else { + var11 = 65533; // L: 323 + } + } else if (var10 < 240) { // L: 325 + if (var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) { // L: 326 + var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 327 + if (var11 < 2048) { // L: 328 + var11 = 65533; + } + } else { + var11 = 65533; // L: 330 + } + } else if (var10 < 248) { // L: 332 + if (var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) { // L: 333 + var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63; // L: 334 + if (var11 >= 65536 && var11 <= 1114111) { // L: 335 + var11 = 65533; // L: 336 + } else { + var11 = 65533; + } + } else { + var11 = 65533; // L: 338 + } + } else { + var11 = 65533; // L: 340 + } + } + + String var3 = new String(var6, 0, var7); // L: 343 + this.offset += var2; // L: 346 + return var3; // L: 347 } } } - @ObfuscatedName("ce") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "2094233778" + descriptor = "([BIIB)V", + garbageValue = "0" ) @Export("readBytes") public void readBytes(byte[] var1, int var2, int var3) { for (int var4 = var2; var4 < var3 + var2; ++var4) { - var1[var4] = this.array[++this.offset - 1]; + var1[var4] = this.array[++this.offset - 1]; // L: 351 } - } + } // L: 352 - @ObfuscatedName("cj") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1710018513" + descriptor = "(B)I", + garbageValue = "0" ) @Export("readShortSmart") public int readShortSmart() { - int var1 = this.array[this.offset] & 255; - return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; + int var1 = this.array[this.offset] & 255; // L: 355 + return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152; // L: 356 357 } - @ObfuscatedName("ck") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-96" + descriptor = "(I)I", + garbageValue = "573846843" ) @Export("readUShortSmart") public int readUShortSmart() { - int var1 = this.array[this.offset] & 255; - return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; + int var1 = this.array[this.offset] & 255; // L: 361 + return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768; // L: 362 363 + } + + @ObfuscatedName("ct") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1664654031" + ) + public int method5632() { + int var1 = 0; // L: 367 + + int var2; + for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { // L: 368 369 371 + var1 += 32767; // L: 370 + } + + var1 += var2; // L: 373 + return var1; // L: 374 } @ObfuscatedName("cv") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "715402244" + garbageValue = "1880158305" ) - public int method5732() { - int var1 = 0; + public int method5666() { + return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); // L: 378 379 + } + + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "79" + ) + public int method5634() { + if (this.array[this.offset] < 0) { // L: 383 + return this.readInt() & Integer.MAX_VALUE; + } else { + int var1 = this.readUnsignedShort(); // L: 384 + return var1 == 32767 ? -1 : var1; // L: 385 + } + } + + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-24" + ) + @Export("readVarInt") + public int readVarInt() { + byte var1 = this.array[++this.offset - 1]; // L: 390 int var2; - for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) { - var1 += 32767; + for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { // L: 391 392 394 + var2 = (var2 | var1 & 127) << 7; // L: 393 } - var1 += var2; - return var1; + return var2 | var1; // L: 396 + } + + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "([IB)V", + garbageValue = "0" + ) + @Export("xteaEncryptAll") + public void xteaEncryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 400 + this.offset = 0; // L: 401 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 402 + int var4 = this.readInt(); // L: 403 + int var5 = this.readInt(); // L: 404 + int var6 = 0; // L: 405 + int var7 = -1640531527; // L: 406 + + for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { // L: 407 408 411 + var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; // L: 409 + var6 += var7; // L: 410 + } + + this.offset -= 8; // L: 413 + this.writeInt(var4); // L: 414 + this.writeInt(var5); // L: 415 + } + + } // L: 417 + + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "([II)V", + garbageValue = "-391802168" + ) + @Export("xteaDecryptAll") + public void xteaDecryptAll(int[] var1) { + int var2 = this.offset / 8; // L: 420 + this.offset = 0; // L: 421 + + for (int var3 = 0; var3 < var2; ++var3) { // L: 422 + int var4 = this.readInt(); // L: 423 + int var5 = this.readInt(); // L: 424 + int var6 = -957401312; // L: 425 + int var7 = -1640531527; // L: 426 + + for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { // L: 427 428 431 + var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; // L: 429 + var6 -= var7; // L: 430 + } + + this.offset -= 8; // L: 433 + this.writeInt(var4); // L: 434 + this.writeInt(var5); // L: 435 + } + + } // L: 437 + + @ObfuscatedName("cm") + @ObfuscatedSignature( + descriptor = "([IIII)V", + garbageValue = "-1086697970" + ) + @Export("xteaEncrypt") + public void xteaEncrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 440 + this.offset = var2; // L: 441 + int var5 = (var3 - var2) / 8; // L: 442 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 443 + int var7 = this.readInt(); // L: 444 + int var8 = this.readInt(); // L: 445 + int var9 = 0; // L: 446 + int var10 = -1640531527; // L: 447 + + for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { // L: 448 449 452 + var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; // L: 450 + var9 += var10; // L: 451 + } + + this.offset -= 8; // L: 454 + this.writeInt(var7); // L: 455 + this.writeInt(var8); // L: 456 + } + + this.offset = var4; // L: 458 + } // L: 459 + + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "([IIIB)V", + garbageValue = "111" + ) + @Export("xteaDecrypt") + public void xteaDecrypt(int[] var1, int var2, int var3) { + int var4 = this.offset; // L: 462 + this.offset = var2; // L: 463 + int var5 = (var3 - var2) / 8; // L: 464 + + for (int var6 = 0; var6 < var5; ++var6) { // L: 465 + int var7 = this.readInt(); // L: 466 + int var8 = this.readInt(); // L: 467 + int var9 = -957401312; // L: 468 + int var10 = -1640531527; // L: 469 + + for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { // L: 470 471 474 + var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; // L: 472 + var9 -= var10; // L: 473 + } + + this.offset -= 8; // L: 476 + this.writeInt(var7); // L: 477 + this.writeInt(var8); // L: 478 + } + + this.offset = var4; // L: 480 + } // L: 481 + + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", + garbageValue = "-1998456113" + ) + @Export("encryptRsa") + public void encryptRsa(BigInteger var1, BigInteger var2) { + int var3 = this.offset; // L: 484 + this.offset = 0; // L: 485 + byte[] var4 = new byte[var3]; // L: 486 + this.readBytes(var4, 0, var3); // L: 487 + BigInteger var5 = new BigInteger(var4); // L: 488 + BigInteger var6 = var5.modPow(var1, var2); // L: 489 + byte[] var7 = var6.toByteArray(); // L: 490 + this.offset = 0; // L: 491 + this.writeShort(var7.length); // L: 492 + this.writeBytes(var7, 0, var7.length); // L: 493 + } // L: 494 + + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "277387180" + ) + @Export("writeCrc") + public int writeCrc(int var1) { + byte[] var3 = this.array; // L: 498 + int var4 = this.offset; // L: 499 + int var5 = -1; // L: 501 + + for (int var6 = var1; var6 < var4; ++var6) { // L: 502 + var5 = var5 >>> 8 ^ crc32Table[(var5 ^ var3[var6]) & 255]; // L: 503 + } + + var5 = ~var5; // L: 505 + this.writeInt(var5); // L: 509 + return var5; // L: 510 + } + + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1944905387" + ) + @Export("checkCrc") + public boolean checkCrc() { + this.offset -= 4; // L: 514 + byte[] var2 = this.array; // L: 516 + int var3 = this.offset; // L: 517 + int var4 = -1; // L: 519 + + int var5; + for (var5 = 0; var5 < var3; ++var5) { // L: 520 + var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255]; // L: 521 + } + + var4 = ~var4; // L: 523 + var5 = this.readInt(); // L: 527 + return var5 == var4; // L: 528 + } + + @ObfuscatedName("cf") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1872779472" + ) + public void method5645(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 533 + } // L: 534 + + @ObfuscatedName("cj") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1958454445" + ) + public void method5644(int var1) { + this.array[++this.offset - 1] = (byte)(0 - var1); // L: 537 + } // L: 538 + + @ObfuscatedName("cd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1046245184" + ) + @Export("writeIntME") + public void writeIntME(int var1) { + this.array[++this.offset - 1] = (byte)(128 - var1); // L: 541 + } // L: 542 + + @ObfuscatedName("cx") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-349157091" + ) + public int method5646() { + return this.array[++this.offset - 1] - 128 & 255; // L: 545 } @ObfuscatedName("cp") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "81140995" + garbageValue = "2104060709" ) - public int method5733() { - return this.array[this.offset] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort(); + public int method5639() { + return 0 - this.array[++this.offset - 1] & 255; // L: 549 } - @ObfuscatedName("ci") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "11" - ) - public int method5843() { - if (this.array[this.offset] < 0) { - return this.readInt() & Integer.MAX_VALUE; - } else { - int var1 = this.readUnsignedShort(); - return var1 == 32767 ? -1 : var1; - } - } - - @ObfuscatedName("cu") + @ObfuscatedName("ch") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "841550272" + garbageValue = "-1616346013" ) - @Export("readVarInt") - public int readVarInt() { - byte var1 = this.array[++this.offset - 1]; - - int var2; - for (var2 = 0; var1 < 0; var1 = this.array[++this.offset - 1]) { - var2 = (var2 | var1 & 127) << 7; - } - - return var2 | var1; - } - - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-1857698855" - ) - @Export("xteaEncryptAll") - public void xteaEncryptAll(int[] var1) { - int var2 = this.offset / 8; - this.offset = 0; - - for (int var3 = 0; var3 < var2; ++var3) { - int var4 = this.readInt(); - int var5 = this.readInt(); - int var6 = 0; - int var7 = -1640531527; - - for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) { - var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]; - var6 += var7; - } - - this.offset -= 8; - this.writeInt(var4); - this.writeInt(var5); - } - - } - - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "([II)V", - garbageValue = "-1432585027" - ) - @Export("xteaDecryptAll") - public void xteaDecryptAll(int[] var1) { - int var2 = this.offset / 8; - this.offset = 0; - - for (int var3 = 0; var3 < var2; ++var3) { - int var4 = this.readInt(); - int var5 = this.readInt(); - int var6 = -957401312; - int var7 = -1640531527; - - for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) { - var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6; - var6 -= var7; - } - - this.offset -= 8; - this.writeInt(var4); - this.writeInt(var5); - } - - } - - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "-230257638" - ) - @Export("xteaEncrypt") - public void xteaEncrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; - this.offset = var2; - int var5 = (var3 - var2) / 8; - - for (int var6 = 0; var6 < var5; ++var6) { - int var7 = this.readInt(); - int var8 = this.readInt(); - int var9 = 0; - int var10 = -1640531527; - - for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) { - var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]; - var9 += var10; - } - - this.offset -= 8; - this.writeInt(var7); - this.writeInt(var8); - } - - this.offset = var4; - } - - @ObfuscatedName("cm") - @ObfuscatedSignature( - descriptor = "([IIII)V", - garbageValue = "1537225216" - ) - @Export("xteaDecrypt") - public void xteaDecrypt(int[] var1, int var2, int var3) { - int var4 = this.offset; - this.offset = var2; - int var5 = (var3 - var2) / 8; - - for (int var6 = 0; var6 < var5; ++var6) { - int var7 = this.readInt(); - int var8 = this.readInt(); - int var9 = -957401312; - int var10 = -1640531527; - - for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) { - var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9; - var9 -= var10; - } - - this.offset -= 8; - this.writeInt(var7); - this.writeInt(var8); - } - - this.offset = var4; - } - - @ObfuscatedName("cf") - @ObfuscatedSignature( - descriptor = "(Ljava/math/BigInteger;Ljava/math/BigInteger;I)V", - garbageValue = "-859977936" - ) - @Export("encryptRsa") - public void encryptRsa(BigInteger var1, BigInteger var2) { - int var3 = this.offset; - this.offset = 0; - byte[] var4 = new byte[var3]; - this.readBytes(var4, 0, var3); - BigInteger var5 = new BigInteger(var4); - BigInteger var6 = var5.modPow(var1, var2); - byte[] var7 = var6.toByteArray(); - this.offset = 0; - this.writeShort(var7.length); - this.writeBytes(var7, 0, var7.length); - } - - @ObfuscatedName("ct") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-693896153" - ) - @Export("writeCrc") - public int writeCrc(int var1) { - int var2 = Actor.method1822(this.array, var1, this.offset); - this.writeInt(var2); - return var2; - } - - @ObfuscatedName("cd") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1948165259" - ) - @Export("checkCrc") - public boolean checkCrc() { - this.offset -= 4; - int var1 = Actor.method1822(this.array, 0, this.offset); - int var2 = this.readInt(); - return var2 == var1; - } - - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "2052645276" - ) - @Export("writeIntME") - public void writeIntME(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("cx") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "0" - ) - public void method5744(int var1) { - this.array[++this.offset - 1] = (byte)(0 - var1); + public int method5612() { + return 128 - this.array[++this.offset - 1] & 255; // L: 553 } @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-394267159" + descriptor = "(B)B", + garbageValue = "92" ) - public void method5837(int var1) { - this.array[++this.offset - 1] = (byte)(128 - var1); + public byte method5649() { + return (byte)(this.array[++this.offset - 1] - 128); // L: 557 } - @ObfuscatedName("cr") + @ObfuscatedName("ck") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "851416829" + descriptor = "(I)B", + garbageValue = "907230791" ) - public int method5746() { - return this.array[++this.offset - 1] - 128 & 255; + public byte method5650() { + return (byte)(0 - this.array[++this.offset - 1]); // L: 561 } + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "(I)B", + garbageValue = "-1960161584" + ) + public byte method5730() { + return (byte)(128 - this.array[++this.offset - 1]); // L: 565 + } + + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-18" + ) + public void method5665(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 569 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 570 + } // L: 571 + + @ObfuscatedName("cy") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "2095246398" + ) + public void method5653(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 574 + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 575 + } // L: 576 + + @ObfuscatedName("cb") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "32" + ) + public void method5654(int var1) { + this.array[++this.offset - 1] = (byte)(var1 + 128); // L: 579 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 580 + } // L: 581 + @ObfuscatedName("cl") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "2135245803" + garbageValue = "359063427" ) - public int method5936() { - return 0 - this.array[++this.offset - 1] & 255; + public int method5655() { + this.offset += 2; // L: 584 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 585 } @ObfuscatedName("dx") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1231018339" + garbageValue = "1348032650" ) - public int method5748() { - return 128 - this.array[++this.offset - 1] & 255; + public int method5656() { + this.offset += 2; // L: 589 + return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); // L: 590 } - @ObfuscatedName("dw") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-209851904" - ) - public byte method5730() { - return (byte)(this.array[++this.offset - 1] - 128); - } - - @ObfuscatedName("dm") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "1146670320" - ) - public byte method5750() { - return (byte)(0 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("dd") - @ObfuscatedSignature( - descriptor = "(I)B", - garbageValue = "-658631883" - ) - public byte method5751() { - return (byte)(128 - this.array[++this.offset - 1]); - } - - @ObfuscatedName("dh") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "118" - ) - public void method5752(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("dl") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-327298658" - ) - public void method5753(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 + 128); - } - - @ObfuscatedName("dr") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "137731710" - ) - public void method5898(int var1) { - this.array[++this.offset - 1] = (byte)(var1 + 128); - this.array[++this.offset - 1] = (byte)(var1 >> 8); - } - - @ObfuscatedName("di") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1619364591" - ) - public int method5755() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); - } - - @ObfuscatedName("dp") + @ObfuscatedName("dq") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-31" + garbageValue = "14" ) - public int method5867() { - this.offset += 2; - return (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); - } - - @ObfuscatedName("dc") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "713390854" - ) - public int method5757() { - this.offset += 2; - return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); - } - - @ObfuscatedName("dt") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1572434954" - ) - public int method5758() { - this.offset += 2; - int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); - if (var1 > 32767) { - var1 -= 65536; - } - - return var1; - } - - @ObfuscatedName("ds") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "89596822" - ) - public int method5759() { - this.offset += 2; - int var1 = (this.array[this.offset - 1] - 128 & 255) + ((this.array[this.offset - 2] & 255) << 8); - if (var1 > 32767) { - var1 -= 65536; - } - - return var1; - } - - @ObfuscatedName("dg") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "95" - ) - public void method5798(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)var1; - } - - @ObfuscatedName("do") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "1" - ) - public int method5761() { - this.offset += 3; - return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); - } - - @ObfuscatedName("dn") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-68115848" - ) - public void method5762(int var1) { - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 24); - } - - @ObfuscatedName("db") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-95" - ) - @Export("writeShortLE") - public void writeShortLE(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 8); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)(var1 >> 16); - } - - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "(IS)V", - garbageValue = "-18106" - ) - public void method5764(int var1) { - this.array[++this.offset - 1] = (byte)(var1 >> 16); - this.array[++this.offset - 1] = (byte)(var1 >> 24); - this.array[++this.offset - 1] = (byte)var1; - this.array[++this.offset - 1] = (byte)(var1 >> 8); + public int method5657() { + this.offset += 2; // L: 594 + return ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 595 } @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1451471311" + descriptor = "(B)I", + garbageValue = "44" ) - public int method5765() { - this.offset += 4; - return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); + public int method5658() { + this.offset += 2; // L: 599 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] & 255); // L: 600 + if (var1 > 32767) { // L: 601 + var1 -= 65536; + } + + return var1; // L: 602 } + @ObfuscatedName("dh") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-2054831893" + ) + public int method5659() { + this.offset += 2; // L: 606 + int var1 = ((this.array[this.offset - 1] & 255) << 8) + (this.array[this.offset - 2] - 128 & 255); // L: 607 + if (var1 > 32767) { // L: 608 + var1 -= 65536; + } + + return var1; // L: 609 + } + + @ObfuscatedName("dd") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "80296845" + ) + public void method5660(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 613 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 614 + this.array[++this.offset - 1] = (byte)var1; // L: 615 + } // L: 616 + + @ObfuscatedName("db") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1347720576" + ) + public int method5740() { + this.offset += 3; // L: 619 + return (this.array[this.offset - 1] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16); // L: 620 + } + + @ObfuscatedName("dj") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-1701210516" + ) + public void method5662(int var1) { + this.array[++this.offset - 1] = (byte)var1; // L: 624 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 625 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 626 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 627 + } // L: 628 + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-684888758" + descriptor = "(II)V", + garbageValue = "991573770" ) - public int method5766() { - this.offset += 4; - return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); - } + public void method5663(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 631 + this.array[++this.offset - 1] = (byte)var1; // L: 632 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 633 + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 634 + } // L: 635 + + @ObfuscatedName("de") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-383188135" + ) + @Export("writeShortLE") + public void writeShortLE(int var1) { + this.array[++this.offset - 1] = (byte)(var1 >> 16); // L: 638 + this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 639 + this.array[++this.offset - 1] = (byte)var1; // L: 640 + this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 641 + } // L: 642 @ObfuscatedName("da") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2146396815" + garbageValue = "-640686873" ) - public int method5767() { - this.offset += 4; - return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); + public int method5678() { + this.offset += 4; // L: 645 + return (this.array[this.offset - 4] & 255) + ((this.array[this.offset - 3] & 255) << 8) + ((this.array[this.offset - 2] & 255) << 16) + ((this.array[this.offset - 1] & 255) << 24); // L: 646 } - @ObfuscatedName("df") + @ObfuscatedName("dr") @ObfuscatedSignature( - descriptor = "([BIII)V", - garbageValue = "-2049590377" + descriptor = "(I)I", + garbageValue = "-1384707566" ) - public void method5821(byte[] var1, int var2, int var3) { - for (int var4 = var2; var4 < var3 + var2; ++var4) { + public int method5708() { + this.offset += 4; // L: 650 + return ((this.array[this.offset - 2] & 255) << 24) + ((this.array[this.offset - 4] & 255) << 8) + (this.array[this.offset - 3] & 255) + ((this.array[this.offset - 1] & 255) << 16); // L: 651 + } + + @ObfuscatedName("dw") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1723621979" + ) + public int method5667() { + this.offset += 4; // L: 655 + return ((this.array[this.offset - 1] & 255) << 8) + ((this.array[this.offset - 4] & 255) << 16) + (this.array[this.offset - 2] & 255) + ((this.array[this.offset - 3] & 255) << 24); // L: 656 + } + + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "([BIIB)V", + garbageValue = "108" + ) + public void method5749(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 660 + var1[var4] = this.array[++this.offset - 1]; + } + + } // L: 661 + + @ObfuscatedName("ds") + @ObfuscatedSignature( + descriptor = "([BIIS)V", + garbageValue = "321" + ) + public void method5697(byte[] var1, int var2, int var3) { + for (int var4 = var3 + var2 - 1; var4 >= var2; --var4) { // L: 664 var1[var4] = (byte)(this.array[++this.offset - 1] - 128); } - } - - @ObfuscatedName("jx") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-801005893" - ) - static void method5950() { - for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { - int var1 = var0.group; - if (UserComparator4.loadInterface(var1)) { - boolean var2 = true; - Widget[] var3 = Widget.Widget_interfaceComponents[var1]; - - int var4; - for (var4 = 0; var4 < var3.length; ++var4) { - if (var3[var4] != null) { - var2 = var3[var4].isIf3; - break; - } - } - - if (!var2) { - var4 = (int)var0.key; - Widget var5 = WorldMapSprite.getWidget(var4); - if (var5 != null) { - class234.invalidateWidget(var5); - } - } - } - } - - } + } // L: 665 } diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index 5850db04c2..112fb84b36 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -6,66 +6,66 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mn") +@ObfuscatedName("mz") @Implements("BufferedFile") public class BufferedFile { - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lmy;" ) @Export("accessFile") AccessFile accessFile; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("readBuffer") byte[] readBuffer; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = 183648846884359197L + longValue = 9179108447436471203L ) @Export("readBufferOffset") long readBufferOffset; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1553809797 + intValue = 405113093 ) @Export("readBufferLength") int readBufferLength; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("writeBuffer") byte[] writeBuffer; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = -2985208532115456417L + longValue = -2663227867343054731L ) @Export("writeBufferOffset") long writeBufferOffset; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 457646537 + intValue = -44681909 ) @Export("writeBufferLength") int writeBufferLength; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - longValue = 2498512168954711415L + longValue = 8904526348477535207L ) @Export("offset") long offset; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = -3113265757492371609L + longValue = 3315460692689798849L ) @Export("fileLength") long fileLength; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - longValue = 6675249402129041573L + longValue = -7074391582166578327L ) @Export("length") long length; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - longValue = 1854591788033998237L + longValue = 8487172473192178189L ) @Export("fileOffset") long fileOffset; @@ -74,312 +74,312 @@ public class BufferedFile { descriptor = "(Lmy;II)V" ) public BufferedFile(AccessFile var1, int var2, int var3) throws IOException { - this.readBufferOffset = -1L; - this.writeBufferOffset = -1L; - this.writeBufferLength = 0; - this.accessFile = var1; - this.length = this.fileLength = var1.length(); - this.readBuffer = new byte[var2]; - this.writeBuffer = new byte[var3]; - this.offset = 0L; - } + this.readBufferOffset = -1L; // L: 9 + this.writeBufferOffset = -1L; // L: 12 + this.writeBufferLength = 0; // L: 13 + this.accessFile = var1; // L: 20 + this.length = this.fileLength = var1.length(); // L: 21 + this.readBuffer = new byte[var2]; // L: 22 + this.writeBuffer = new byte[var3]; // L: 23 + this.offset = 0L; // L: 24 + } // L: 25 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "159388731" + descriptor = "(B)V", + garbageValue = "-33" ) @Export("close") public void close() throws IOException { - this.flush(); - this.accessFile.close(); - } + this.flush(); // L: 28 + this.accessFile.close(); // L: 29 + } // L: 30 - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("seek") public void seek(long var1) throws IOException { - if (var1 < 0L) { + if (var1 < 0L) { // L: 33 throw new IOException(""); } else { - this.offset = var1; + this.offset = var1; // L: 34 } - } + } // L: 35 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)J", - garbageValue = "243378114" + garbageValue = "-1539100429" ) @Export("length") public long length() { - return this.length; + return this.length; // L: 38 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "([BI)V", - garbageValue = "1810550632" + garbageValue = "-1457343734" ) @Export("readFully") public void readFully(byte[] var1) throws IOException { - this.read(var1, 0, var1.length); - } + this.read(var1, 0, var1.length); // L: 42 + } // L: 43 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([BIIB)V", - garbageValue = "-4" + descriptor = "([BIII)V", + garbageValue = "779663490" ) @Export("read") public void read(byte[] var1, int var2, int var3) throws IOException { try { - if (var3 + var2 > var1.length) { + if (var3 + var2 > var1.length) { // L: 47 throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length); } - if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && (long)var3 + this.offset <= this.writeBufferOffset + (long)this.writeBufferLength) { - System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); - this.offset += (long)var3; - return; + if (this.writeBufferOffset != -1L && this.offset >= this.writeBufferOffset && this.offset + (long)var3 <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 48 + System.arraycopy(this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var1, var2, var3); // L: 49 + this.offset += (long)var3; // L: 50 + return; // L: 51 } - long var4 = this.offset; - int var7 = var3; + long var4 = this.offset; // L: 53 + int var7 = var3; // L: 55 int var8; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { - var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); - if (var8 > var3) { + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 56 + var8 = (int)((long)this.readBufferLength - (this.offset - this.readBufferOffset)); // L: 57 + if (var8 > var3) { // L: 58 var8 = var3; } - System.arraycopy(this.readBuffer, (int)(this.offset - this.readBufferOffset), var1, var2, var8); - this.offset += (long)var8; - var2 += var8; - var3 -= var8; + System.arraycopy(this.readBuffer, (int)(this.offset - this.readBufferOffset), var1, var2, var8); // L: 59 + this.offset += (long)var8; // L: 60 + var2 += var8; // L: 61 + var3 -= var8; // L: 62 } - if (var3 > this.readBuffer.length) { - this.accessFile.seek(this.offset); + if (var3 > this.readBuffer.length) { // L: 64 + this.accessFile.seek(this.offset); // L: 65 - for (this.fileOffset = this.offset; var3 > 0; var3 -= var8) { - var8 = this.accessFile.read(var1, var2, var3); - if (var8 == -1) { + for (this.fileOffset = this.offset; var3 > 0; var3 -= var8) { // L: 66 67 73 + var8 = this.accessFile.read(var1, var2, var3); // L: 68 + if (var8 == -1) { // L: 69 break; } - this.fileOffset += (long)var8; - this.offset += (long)var8; - var2 += var8; + this.fileOffset += (long)var8; // L: 70 + this.offset += (long)var8; // L: 71 + var2 += var8; // L: 72 } - } else if (var3 > 0) { - this.load(); - var8 = var3; - if (var3 > this.readBufferLength) { + } else if (var3 > 0) { // L: 76 + this.load(); // L: 77 + var8 = var3; // L: 78 + if (var3 > this.readBufferLength) { // L: 79 var8 = this.readBufferLength; } - System.arraycopy(this.readBuffer, 0, var1, var2, var8); - var2 += var8; - var3 -= var8; - this.offset += (long)var8; + System.arraycopy(this.readBuffer, 0, var1, var2, var8); // L: 80 + var2 += var8; // L: 81 + var3 -= var8; // L: 82 + this.offset += (long)var8; // L: 83 } - if (this.writeBufferOffset != -1L) { - if (this.writeBufferOffset > this.offset && var3 > 0) { - var8 = var2 + (int)(this.writeBufferOffset - this.offset); - if (var8 > var3 + var2) { + if (-1L != this.writeBufferOffset) { // L: 85 + if (this.writeBufferOffset > this.offset && var3 > 0) { // L: 86 + var8 = var2 + (int)(this.writeBufferOffset - this.offset); // L: 87 + if (var8 > var3 + var2) { // L: 88 var8 = var3 + var2; } - while (var2 < var8) { - var1[var2++] = 0; - --var3; - ++this.offset; + while (var2 < var8) { // L: 89 + var1[var2++] = 0; // L: 90 + --var3; // L: 91 + ++this.offset; // L: 92 } } - long var13 = -1L; - long var10 = -1L; - if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { - var13 = this.writeBufferOffset; - } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { - var13 = var4; + long var13 = -1L; // L: 95 + long var10 = -1L; // L: 96 + if (this.writeBufferOffset >= var4 && this.writeBufferOffset < var4 + (long)var7) { // L: 97 + var13 = this.writeBufferOffset; // L: 98 + } else if (var4 >= this.writeBufferOffset && var4 < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 100 + var13 = var4; // L: 101 } - if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && (long)this.writeBufferLength + this.writeBufferOffset <= var4 + (long)var7) { - var10 = (long)this.writeBufferLength + this.writeBufferOffset; - } else if (var4 + (long)var7 > this.writeBufferOffset && (long)var7 + var4 <= this.writeBufferOffset + (long)this.writeBufferLength) { - var10 = var4 + (long)var7; + if ((long)this.writeBufferLength + this.writeBufferOffset > var4 && this.writeBufferOffset + (long)this.writeBufferLength <= var4 + (long)var7) { // L: 103 + var10 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 104 + } else if ((long)var7 + var4 > this.writeBufferOffset && var4 + (long)var7 <= this.writeBufferOffset + (long)this.writeBufferLength) { // L: 106 + var10 = (long)var7 + var4; // L: 107 } - if (var13 > -1L && var10 > var13) { - int var12 = (int)(var10 - var13); - System.arraycopy(this.writeBuffer, (int)(var13 - this.writeBufferOffset), var1, (int)(var13 - var4) + var2, var12); - if (var10 > this.offset) { - var3 = (int)((long)var3 - (var10 - this.offset)); - this.offset = var10; + if (var13 > -1L && var10 > var13) { // L: 109 + int var12 = (int)(var10 - var13); // L: 110 + System.arraycopy(this.writeBuffer, (int)(var13 - this.writeBufferOffset), var1, (int)(var13 - var4) + var2, var12); // L: 111 + if (var10 > this.offset) { // L: 112 + var3 = (int)((long)var3 - (var10 - this.offset)); // L: 113 + this.offset = var10; // L: 114 } } } - } catch (IOException var16) { - this.fileOffset = -1L; - throw var16; + } catch (IOException var16) { // L: 120 + this.fileOffset = -1L; // L: 121 + throw var16; // L: 122 } - if (var3 > 0) { + if (var3 > 0) { // L: 124 throw new EOFException(); } - } + } // L: 125 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1659142795" + garbageValue = "1341738722" ) @Export("load") void load() throws IOException { - this.readBufferLength = 0; - if (this.offset != this.fileOffset) { - this.accessFile.seek(this.offset); - this.fileOffset = this.offset; + this.readBufferLength = 0; // L: 128 + if (this.offset != this.fileOffset) { // L: 129 + this.accessFile.seek(this.offset); // L: 130 + this.fileOffset = this.offset; // L: 131 } int var2; - for (this.readBufferOffset = this.offset; this.readBufferLength < this.readBuffer.length; this.readBufferLength += var2) { - int var1 = this.readBuffer.length - this.readBufferLength; - if (var1 > 200000000) { + for (this.readBufferOffset = this.offset; this.readBufferLength < this.readBuffer.length; this.readBufferLength += var2) { // L: 133 134 140 + int var1 = this.readBuffer.length - this.readBufferLength; // L: 135 + if (var1 > 200000000) { // L: 136 var1 = 200000000; } - var2 = this.accessFile.read(this.readBuffer, this.readBufferLength, var1); - if (var2 == -1) { + var2 = this.accessFile.read(this.readBuffer, this.readBufferLength, var1); // L: 137 + if (var2 == -1) { // L: 138 break; } - this.fileOffset += (long)var2; + this.fileOffset += (long)var2; // L: 139 } - } + } // L: 142 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1917244707" + garbageValue = "329860365" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { try { - if (this.offset + (long)var3 > this.length) { - this.length = (long)var3 + this.offset; + if ((long)var3 + this.offset > this.length) { // L: 146 + this.length = this.offset + (long)var3; } - if (this.writeBufferOffset != -1L && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { - this.flush(); + if (-1L != this.writeBufferOffset && (this.offset < this.writeBufferOffset || this.offset > (long)this.writeBufferLength + this.writeBufferOffset)) { // L: 147 + this.flush(); // L: 148 } - if (this.writeBufferOffset != -1L && this.offset + (long)var3 > this.writeBufferOffset + (long)this.writeBuffer.length) { - int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); - this.offset += (long)var4; - var2 += var4; - var3 -= var4; - this.writeBufferLength = this.writeBuffer.length; - this.flush(); + if (this.writeBufferOffset != -1L && (long)var3 + this.offset > this.writeBufferOffset + (long)this.writeBuffer.length) { // L: 150 + int var4 = (int)((long)this.writeBuffer.length - (this.offset - this.writeBufferOffset)); // L: 151 + System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var4); // L: 152 + this.offset += (long)var4; // L: 153 + var2 += var4; // L: 154 + var3 -= var4; // L: 155 + this.writeBufferLength = this.writeBuffer.length; // L: 156 + this.flush(); // L: 157 } - if (var3 <= this.writeBuffer.length) { - if (var3 > 0) { - if (-1L == this.writeBufferOffset) { + if (var3 <= this.writeBuffer.length) { // L: 159 + if (var3 > 0) { // L: 188 + if (this.writeBufferOffset == -1L) { // L: 189 this.writeBufferOffset = this.offset; } - System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var3); - this.offset += (long)var3; - if (this.offset - this.writeBufferOffset > (long)this.writeBufferLength) { + System.arraycopy(var1, var2, this.writeBuffer, (int)(this.offset - this.writeBufferOffset), var3); // L: 190 + this.offset += (long)var3; // L: 191 + if (this.offset - this.writeBufferOffset > (long)this.writeBufferLength) { // L: 192 this.writeBufferLength = (int)(this.offset - this.writeBufferOffset); } } } else { - if (this.fileOffset != this.offset) { - this.accessFile.seek(this.offset); - this.fileOffset = this.offset; + if (this.fileOffset != this.offset) { // L: 160 + this.accessFile.seek(this.offset); // L: 161 + this.fileOffset = this.offset; // L: 162 } - this.accessFile.write(var1, var2, var3); - this.fileOffset += (long)var3; - if (this.fileOffset > this.fileLength) { + this.accessFile.write(var1, var2, var3); // L: 164 + this.fileOffset += (long)var3; // L: 165 + if (this.fileOffset > this.fileLength) { // L: 166 this.fileLength = this.fileOffset; } - long var9 = -1L; - long var6 = -1L; - if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { - var9 = this.offset; - } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < this.offset + (long)var3) { - var9 = this.readBufferOffset; + long var9 = -1L; // L: 167 + long var6 = -1L; // L: 168 + if (this.offset >= this.readBufferOffset && this.offset < (long)this.readBufferLength + this.readBufferOffset) { // L: 169 + var9 = this.offset; // L: 170 + } else if (this.readBufferOffset >= this.offset && this.readBufferOffset < (long)var3 + this.offset) { // L: 172 + var9 = this.readBufferOffset; // L: 173 } - if (this.offset + (long)var3 > this.readBufferOffset && (long)var3 + this.offset <= this.readBufferOffset + (long)this.readBufferLength) { - var6 = (long)var3 + this.offset; - } else if ((long)this.readBufferLength + this.readBufferOffset > this.offset && (long)this.readBufferLength + this.readBufferOffset <= (long)var3 + this.offset) { - var6 = this.readBufferOffset + (long)this.readBufferLength; + if ((long)var3 + this.offset > this.readBufferOffset && (long)var3 + this.offset <= (long)this.readBufferLength + this.readBufferOffset) { // L: 175 + var6 = this.offset + (long)var3; // L: 176 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.offset && this.readBufferOffset + (long)this.readBufferLength <= (long)var3 + this.offset) { // L: 178 + var6 = this.readBufferOffset + (long)this.readBufferLength; // L: 179 } - if (var9 > -1L && var6 > var9) { - int var8 = (int)(var6 - var9); - System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); + if (var9 > -1L && var6 > var9) { // L: 181 + int var8 = (int)(var6 - var9); // L: 182 + System.arraycopy(var1, (int)(var9 + (long)var2 - this.offset), this.readBuffer, (int)(var9 - this.readBufferOffset), var8); // L: 183 } - this.offset += (long)var3; + this.offset += (long)var3; // L: 185 } - } catch (IOException var12) { - this.fileOffset = -1L; - throw var12; + } catch (IOException var12) { // L: 196 + this.fileOffset = -1L; // L: 197 + throw var12; // L: 198 } - } + } // L: 186 193 200 - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1996252506" + garbageValue = "-236075933" ) @Export("flush") void flush() throws IOException { - if (this.writeBufferOffset != -1L) { - if (this.writeBufferOffset != this.fileOffset) { - this.accessFile.seek(this.writeBufferOffset); - this.fileOffset = this.writeBufferOffset; + if (-1L != this.writeBufferOffset) { // L: 203 + if (this.fileOffset != this.writeBufferOffset) { // L: 204 + this.accessFile.seek(this.writeBufferOffset); // L: 205 + this.fileOffset = this.writeBufferOffset; // L: 206 } - this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); - this.fileOffset += (long)this.writeBufferLength * -743906103946903551L; - if (this.fileOffset > this.fileLength) { + this.accessFile.write(this.writeBuffer, 0, this.writeBufferLength); // L: 208 + this.fileOffset += (long)this.writeBufferLength * 16721398605021185L; // L: 209 + if (this.fileOffset > this.fileLength) { // L: 210 this.fileLength = this.fileOffset; } - long var1 = -1L; - long var3 = -1L; - if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < this.readBufferOffset + (long)this.readBufferLength) { - var1 = this.writeBufferOffset; - } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { - var1 = this.readBufferOffset; + long var1 = -1L; // L: 211 + long var3 = -1L; // L: 212 + if (this.writeBufferOffset >= this.readBufferOffset && this.writeBufferOffset < (long)this.readBufferLength + this.readBufferOffset) { // L: 213 + var1 = this.writeBufferOffset; // L: 214 + } else if (this.readBufferOffset >= this.writeBufferOffset && this.readBufferOffset < this.writeBufferOffset + (long)this.writeBufferLength) { // L: 216 + var1 = this.readBufferOffset; // L: 217 } - if (this.writeBufferOffset + (long)this.writeBufferLength > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= this.readBufferOffset + (long)this.readBufferLength) { - var3 = this.writeBufferOffset + (long)this.writeBufferLength; - } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { - var3 = this.readBufferOffset + (long)this.readBufferLength; + if ((long)this.writeBufferLength + this.writeBufferOffset > this.readBufferOffset && this.writeBufferOffset + (long)this.writeBufferLength <= (long)this.readBufferLength + this.readBufferOffset) { // L: 219 + var3 = this.writeBufferOffset + (long)this.writeBufferLength; // L: 220 + } else if (this.readBufferOffset + (long)this.readBufferLength > this.writeBufferOffset && (long)this.readBufferLength + this.readBufferOffset <= (long)this.writeBufferLength + this.writeBufferOffset) { // L: 222 + var3 = (long)this.readBufferLength + this.readBufferOffset; // L: 223 } - if (var1 > -1L && var3 > var1) { - int var5 = (int)(var3 - var1); - System.arraycopy(this.writeBuffer, (int)(var1 - this.writeBufferOffset), this.readBuffer, (int)(var1 - this.readBufferOffset), var5); + if (var1 > -1L && var3 > var1) { // L: 225 + int var5 = (int)(var3 - var1); // L: 226 + System.arraycopy(this.writeBuffer, (int)(var1 - this.writeBufferOffset), this.readBuffer, (int)(var1 - this.readBufferOffset), var5); // L: 227 } - this.writeBufferOffset = -1L; - this.writeBufferLength = 0; + this.writeBufferOffset = -1L; // L: 229 + this.writeBufferLength = 0; // L: 230 } - } + } // L: 232 } diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java index 2f9629c278..a9dcc07166 100644 --- a/runescape-client/src/main/java/BufferedNetSocket.java +++ b/runescape-client/src/main/java/BufferedNetSocket.java @@ -5,103 +5,103 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lc") +@ObfuscatedName("lk") @Implements("BufferedNetSocket") public class BufferedNetSocket extends AbstractSocket { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("socket") Socket socket; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lli;" + descriptor = "Llx;" ) @Export("source") BufferedSource source; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llu;" + descriptor = "Llf;" ) @Export("sink") BufferedSink sink; BufferedNetSocket(Socket var1, int var2, int var3) throws IOException { - this.socket = var1; - this.socket.setSoTimeout(30000); - this.socket.setTcpNoDelay(true); - this.socket.setReceiveBufferSize(65536); - this.socket.setSendBufferSize(65536); - this.source = new BufferedSource(this.socket.getInputStream(), var2); - this.sink = new BufferedSink(this.socket.getOutputStream(), var3); - } + this.socket = var1; // L: 12 + this.socket.setSoTimeout(30000); // L: 13 + this.socket.setTcpNoDelay(true); // L: 14 + this.socket.setReceiveBufferSize(65536); // L: 15 + this.socket.setSendBufferSize(65536); // L: 16 + this.source = new BufferedSource(this.socket.getInputStream(), var2); // L: 17 + this.sink = new BufferedSink(this.socket.getOutputStream(), var3); // L: 18 + } // L: 19 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-768493590" + garbageValue = "-147773206" ) @Export("close") public void close() { - this.sink.close(); + this.sink.close(); // L: 42 try { - this.socket.close(); - } catch (IOException var2) { + this.socket.close(); // L: 44 + } catch (IOException var2) { // L: 46 } - this.source.close(); - } + this.source.close(); // L: 47 + } // L: 48 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "-8" + garbageValue = "-99" ) @Export("readUnsignedByte") public int readUnsignedByte() throws IOException { - return this.source.readUnsignedByte(); + return this.source.readUnsignedByte(); // L: 30 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1942767880" + descriptor = "(B)I", + garbageValue = "12" ) @Export("available") public int available() throws IOException { - return this.source.available(); + return this.source.available(); // L: 26 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1355091335" + descriptor = "(IB)Z", + garbageValue = "-78" ) @Export("isAvailable") public boolean isAvailable(int var1) throws IOException { - return this.source.isAvailable(var1); + return this.source.isAvailable(var1); // L: 22 } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "37" + descriptor = "([BIII)I", + garbageValue = "-1533815985" ) @Export("read") public int read(byte[] var1, int var2, int var3) throws IOException { - return this.source.read(var1, var2, var3); + return this.source.read(var1, var2, var3); // L: 34 } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "-105" + garbageValue = "52" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.sink.write(var1, var2, var3); - } + this.sink.write(var1, var2, var3); // L: 38 + } // L: 39 protected void finalize() { - this.close(); - } + this.close(); // L: 51 + } // L: 52 } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index fbe83c5a76..609b5a5904 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -6,195 +6,206 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lu") +@ObfuscatedName("lf") @Implements("BufferedSink") public class BufferedSink implements Runnable { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("thread") Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -870723035 + intValue = 744968193 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("buffer") byte[] buffer; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 136248619 + intValue = -683527295 ) @Export("position") int position; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 961072211 + intValue = 870280175 ) @Export("limit") int limit; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("exception") IOException exception; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("closed") boolean closed; BufferedSink(OutputStream var1, int var2) { - this.position = 0; - this.limit = 0; - this.outputStream = var1; - this.capacity = var2 + 1; - this.buffer = new byte[this.capacity]; - this.thread = new Thread(this); - this.thread.setDaemon(true); - this.thread.start(); - } + this.position = 0; // L: 186 + this.limit = 0; // L: 187 + this.outputStream = var1; // L: 192 + this.capacity = var2 + 1; // L: 193 + this.buffer = new byte[this.capacity]; // L: 194 + this.thread = new Thread(this); // L: 195 + this.thread.setDaemon(true); // L: 196 + this.thread.start(); // L: 197 + } // L: 198 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "49" + garbageValue = "8" ) @Export("isClosed") boolean isClosed() { - if (this.closed) { + if (this.closed) { // L: 201 try { - this.outputStream.close(); + this.outputStream.close(); // L: 203 if (this.exception == null) { - this.exception = new IOException(""); + this.exception = new IOException(""); // L: 204 } - } catch (IOException var2) { + } catch (IOException var2) { // L: 206 if (this.exception == null) { - this.exception = new IOException(var2); + this.exception = new IOException(var2); // L: 207 } } - return true; + return true; // L: 209 } else { - return false; + return false; // L: 211 } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "2083374722" + garbageValue = "803679823" ) @Export("write") void write(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { - synchronized(this) { - if (this.exception != null) { + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 261 + synchronized(this) { // L: 262 + if (this.exception != null) { // L: 263 throw new IOException(this.exception.toString()); } else { int var5; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 265 var5 = this.capacity - this.limit + this.position - 1; } else { - var5 = this.position - this.limit - 1; + var5 = this.position - this.limit - 1; // L: 266 } - if (var5 < var3) { + if (var5 < var3) { // L: 267 throw new IOException(""); } else { - if (var3 + this.limit <= this.capacity) { - System.arraycopy(var1, var2, this.buffer, this.limit, var3); + if (var3 + this.limit <= this.capacity) { // L: 268 + System.arraycopy(var1, var2, this.buffer, this.limit, var3); // L: 269 } else { - int var6 = this.capacity - this.limit; - System.arraycopy(var1, var2, this.buffer, this.limit, var6); - System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); + int var6 = this.capacity - this.limit; // L: 272 + System.arraycopy(var1, var2, this.buffer, this.limit, var6); // L: 273 + System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); // L: 274 } - this.limit = (var3 + this.limit) % this.capacity; - this.notifyAll(); + this.limit = (var3 + this.limit) % this.capacity; // L: 276 + this.notifyAll(); // L: 277 } } } } else { throw new IOException(); } - } + } // L: 279 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(S)V", - garbageValue = "7072" + garbageValue = "256" ) @Export("close") void close() { - synchronized(this) { - this.closed = true; - this.notifyAll(); - } + synchronized(this) { // L: 282 + this.closed = true; // L: 283 + this.notifyAll(); // L: 284 + } // L: 285 try { - this.thread.join(); - } catch (InterruptedException var3) { + this.thread.join(); // L: 287 + } catch (InterruptedException var3) { // L: 289 } - } + } // L: 290 public void run() { do { int var1; - synchronized(this) { + synchronized(this) { // L: 217 while (true) { - if (this.exception != null) { + if (this.exception != null) { // L: 219 return; } - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 220 var1 = this.limit - this.position; } else { - var1 = this.capacity - this.position + this.limit; + var1 = this.capacity - this.position + this.limit; // L: 221 } - if (var1 > 0) { + if (var1 > 0) { // L: 222 break; } try { - this.outputStream.flush(); - } catch (IOException var11) { - this.exception = var11; - return; + this.outputStream.flush(); // L: 224 + } catch (IOException var11) { // L: 226 + this.exception = var11; // L: 227 + return; // L: 228 } - if (this.isClosed()) { + if (this.isClosed()) { // L: 230 return; } try { - this.wait(); - } catch (InterruptedException var12) { + this.wait(); // L: 232 + } catch (InterruptedException var12) { // L: 234 } } } try { - if (var1 + this.position <= this.capacity) { - this.outputStream.write(this.buffer, this.position, var1); + if (var1 + this.position <= this.capacity) { // L: 238 + this.outputStream.write(this.buffer, this.position, var1); // L: 239 } else { - int var7 = this.capacity - this.position; - this.outputStream.write(this.buffer, this.position, var7); - this.outputStream.write(this.buffer, 0, var1 - var7); + int var7 = this.capacity - this.position; // L: 242 + this.outputStream.write(this.buffer, this.position, var7); // L: 243 + this.outputStream.write(this.buffer, 0, var1 - var7); // L: 244 } - } catch (IOException var10) { + } catch (IOException var10) { // L: 247 IOException var2 = var10; - synchronized(this) { - this.exception = var2; - return; + synchronized(this) { // L: 248 + this.exception = var2; // L: 249 + return; // L: 250 } } - synchronized(this) { - this.position = (var1 + this.position) % this.capacity; - } - } while(!this.isClosed()); + synchronized(this) { // L: 253 + this.position = (var1 + this.position) % this.capacity; // L: 254 + } // L: 255 + } while(!this.isClosed()); // L: 256 } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lic;Lic;Ljava/lang/String;Ljava/lang/String;I)Lkr;", + garbageValue = "326512340" + ) + public static Font method5983(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { + int var4 = var0.getGroupId(var2); // L: 148 + int var5 = var0.getFileId(var4, var3); // L: 149 + return RouteStrategy.method3688(var0, var1, var4, var5); // L: 150 + } } diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 66eca3943d..c93134402e 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -7,78 +7,78 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("li") +@ObfuscatedName("lx") @Implements("BufferedSource") public class BufferedSource implements Runnable { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("thread") Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -775768789 + intValue = -1790809931 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("buffer") byte[] buffer; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1204557961 + intValue = -264397639 ) @Export("position") int position; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -340586493 + intValue = 1799802211 ) @Export("limit") int limit; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("exception") IOException exception; BufferedSource(InputStream var1, int var2) { - this.position = 0; - this.limit = 0; - this.inputStream = var1; - this.capacity = var2 + 1; - this.buffer = new byte[this.capacity]; - this.thread = new Thread(this); - this.thread.setDaemon(true); - this.thread.start(); - } + this.position = 0; // L: 59 + this.limit = 0; // L: 60 + this.inputStream = var1; // L: 64 + this.capacity = var2 + 1; // L: 65 + this.buffer = new byte[this.capacity]; // L: 66 + this.thread = new Thread(this); // L: 67 + this.thread.setDaemon(true); // L: 68 + this.thread.start(); // L: 69 + } // L: 70 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "733897471" + garbageValue = "-1870168211" ) @Export("isAvailable") boolean isAvailable(int var1) throws IOException { - if (var1 == 0) { + if (var1 == 0) { // L: 106 return true; - } else if (var1 > 0 && var1 < this.capacity) { - synchronized(this) { + } else if (var1 > 0 && var1 < this.capacity) { // L: 107 + synchronized(this) { // L: 108 int var3; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 110 var3 = this.limit - this.position; } else { - var3 = this.capacity - this.position + this.limit; + var3 = this.capacity - this.position + this.limit; // L: 111 } - if (var3 < var1) { - if (this.exception != null) { + if (var3 < var1) { // L: 112 + if (this.exception != null) { // L: 113 throw new IOException(this.exception.toString()); } else { - this.notifyAll(); - return false; + this.notifyAll(); // L: 114 + return false; // L: 115 } } else { - return true; + return true; // L: 117 } } } else { @@ -86,87 +86,87 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "122" + descriptor = "(I)I", + garbageValue = "-1796836135" ) @Export("available") int available() throws IOException { - synchronized(this) { + synchronized(this) { // L: 122 int var2; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 124 var2 = this.limit - this.position; } else { - var2 = this.capacity - this.position + this.limit; + var2 = this.capacity - this.position + this.limit; // L: 125 } - if (var2 <= 0 && this.exception != null) { - throw new IOException(this.exception.toString()); + if (var2 <= 0 && this.exception != null) { // L: 126 + throw new IOException(this.exception.toString()); // L: 127 } else { - this.notifyAll(); - return var2; + this.notifyAll(); // L: 129 + return var2; // L: 130 } } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "400008412" + garbageValue = "1217698749" ) @Export("readUnsignedByte") int readUnsignedByte() throws IOException { - synchronized(this) { - if (this.position == this.limit) { - if (this.exception != null) { + synchronized(this) { // L: 135 + if (this.position == this.limit) { // L: 136 + if (this.exception != null) { // L: 137 throw new IOException(this.exception.toString()); } else { - return -1; + return -1; // L: 138 } } else { - int var2 = this.buffer[this.position] & 255; - this.position = (this.position + 1) % this.capacity; - this.notifyAll(); - return var2; + int var2 = this.buffer[this.position] & 255; // L: 140 + this.position = (this.position + 1) % this.capacity; // L: 141 + this.notifyAll(); // L: 142 + return var2; // L: 143 } } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "24" + descriptor = "([BIII)I", + garbageValue = "315484651" ) @Export("read") int read(byte[] var1, int var2, int var3) throws IOException { - if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { - synchronized(this) { + if (var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) { // L: 148 + synchronized(this) { // L: 149 int var5; - if (this.position <= this.limit) { + if (this.position <= this.limit) { // L: 151 var5 = this.limit - this.position; } else { - var5 = this.capacity - this.position + this.limit; + var5 = this.capacity - this.position + this.limit; // L: 152 } - if (var3 > var5) { + if (var3 > var5) { // L: 153 var3 = var5; } - if (var3 == 0 && this.exception != null) { + if (var3 == 0 && this.exception != null) { // L: 154 throw new IOException(this.exception.toString()); } else { - if (var3 + this.position <= this.capacity) { - System.arraycopy(this.buffer, this.position, var1, var2, var3); + if (var3 + this.position <= this.capacity) { // L: 155 + System.arraycopy(this.buffer, this.position, var1, var2, var3); // L: 156 } else { - int var6 = this.capacity - this.position; - System.arraycopy(this.buffer, this.position, var1, var2, var6); - System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); + int var6 = this.capacity - this.position; // L: 159 + System.arraycopy(this.buffer, this.position, var1, var2, var6); // L: 160 + System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); // L: 161 } - this.position = (var3 + this.position) % this.capacity; - this.notifyAll(); - return var3; + this.position = (var3 + this.position) % this.capacity; // L: 163 + this.notifyAll(); // L: 164 + return var3; // L: 165 } } } else { @@ -174,73 +174,73 @@ public class BufferedSource implements Runnable { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-1" + descriptor = "(I)V", + garbageValue = "-1698989409" ) @Export("close") void close() { - synchronized(this) { + synchronized(this) { // L: 170 if (this.exception == null) { - this.exception = new IOException(""); + this.exception = new IOException(""); // L: 171 } - this.notifyAll(); + this.notifyAll(); // L: 172 } try { - this.thread.join(); - } catch (InterruptedException var3) { + this.thread.join(); // L: 175 + } catch (InterruptedException var3) { // L: 177 } - } + } // L: 178 public void run() { while (true) { int var1; - synchronized(this) { + synchronized(this) { // L: 75 while (true) { - if (this.exception != null) { + if (this.exception != null) { // L: 77 return; } - if (this.position == 0) { + if (this.position == 0) { // L: 78 var1 = this.capacity - this.limit - 1; - } else if (this.position <= this.limit) { + } else if (this.position <= this.limit) { // L: 79 var1 = this.capacity - this.limit; } else { - var1 = this.position - this.limit - 1; + var1 = this.position - this.limit - 1; // L: 80 } - if (var1 > 0) { + if (var1 > 0) { // L: 81 break; } try { - this.wait(); - } catch (InterruptedException var10) { + this.wait(); // L: 83 + } catch (InterruptedException var10) { // L: 85 } } } int var7; try { - var7 = this.inputStream.read(this.buffer, this.limit, var1); + var7 = this.inputStream.read(this.buffer, this.limit, var1); // L: 90 if (var7 == -1) { - throw new EOFException(); + throw new EOFException(); // L: 91 } - } catch (IOException var11) { + } catch (IOException var11) { // L: 93 IOException var3 = var11; - synchronized(this) { - this.exception = var3; - return; + synchronized(this) { // L: 94 + this.exception = var3; // L: 95 + return; // L: 96 } } - synchronized(this) { - this.limit = (var7 + this.limit) % this.capacity; - } + synchronized(this) { // L: 99 + this.limit = (var7 + this.limit) % this.capacity; // L: 100 + } // L: 101 } } } diff --git a/runescape-client/src/main/java/ByteArrayNode.java b/runescape-client/src/main/java/ByteArrayNode.java index 9a54f06d2e..b1348062a4 100644 --- a/runescape-client/src/main/java/ByteArrayNode.java +++ b/runescape-client/src/main/java/ByteArrayNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gb") +@ObfuscatedName("gm") @Implements("ByteArrayNode") public class ByteArrayNode extends Node { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("byteArray") public byte[] byteArray; public ByteArrayNode(byte[] var1) { - this.byteArray = var1; - } + this.byteArray = var1; // L: 7 + } // L: 8 } diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java index a96e19dc28..3e32a8b707 100644 --- a/runescape-client/src/main/java/ByteArrayPool.java +++ b/runescape-client/src/main/java/ByteArrayPool.java @@ -3,124 +3,110 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("kh") +@ObfuscatedName("kg") @Implements("ByteArrayPool") public class ByteArrayPool { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1047368171 + intValue = -2025901059 ) @Export("ByteArrayPool_smallCount") static int ByteArrayPool_smallCount; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 404509009 + intValue = -1213393185 ) @Export("ByteArrayPool_mediumCount") static int ByteArrayPool_mediumCount; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 294344847 + intValue = 1641573055 ) @Export("ByteArrayPool_largeCount") static int ByteArrayPool_largeCount; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("ByteArrayPool_small") static byte[][] ByteArrayPool_small; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("ByteArrayPool_medium") static byte[][] ByteArrayPool_medium; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("ByteArrayPool_large") static byte[][] ByteArrayPool_large; + @ObfuscatedName("x") + @Export("ByteArrayPool_alternativeSizes") + static int[] ByteArrayPool_alternativeSizes; + @ObfuscatedName("w") + @Export("ByteArrayPool_altSizeArrayCounts") + static int[] ByteArrayPool_altSizeArrayCounts; + @ObfuscatedName("g") + @Export("ByteArrayPool_arrays") + static byte[][][] ByteArrayPool_arrays; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lbo;" + ) + @Export("mouseRecorder") + static MouseRecorder mouseRecorder; static { - ByteArrayPool_smallCount = 0; - ByteArrayPool_mediumCount = 0; - ByteArrayPool_largeCount = 0; - ByteArrayPool_small = new byte[1000][]; - ByteArrayPool_medium = new byte[250][]; - ByteArrayPool_large = new byte[50][]; + ByteArrayPool_smallCount = 0; // L: 4 + ByteArrayPool_mediumCount = 0; // L: 5 + ByteArrayPool_largeCount = 0; // L: 6 + ByteArrayPool_small = new byte[1000][]; // L: 7 + ByteArrayPool_medium = new byte[250][]; // L: 8 + ByteArrayPool_large = new byte[50][]; // L: 9 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IZI)[B", - garbageValue = "1801183295" + descriptor = "(IZB)[B", + garbageValue = "29" ) @Export("ByteArrayPool_getArrayBool") static synchronized byte[] ByteArrayPool_getArrayBool(int var0, boolean var1) { - byte[] var2; - if (var0 != 100) { + byte[] var4; + if (var0 != 100) { // L: 35 if (var0 < 100) { } } else if (ByteArrayPool_smallCount > 0) { - var2 = ByteArrayPool_small[--ByteArrayPool_smallCount]; - ByteArrayPool_small[ByteArrayPool_smallCount] = null; - return var2; + var4 = ByteArrayPool_small[--ByteArrayPool_smallCount]; // L: 36 + ByteArrayPool_small[ByteArrayPool_smallCount] = null; // L: 37 + return var4; // L: 38 } - if (var0 != 5000) { + if (var0 != 5000) { // L: 40 if (var0 < 5000) { } } else if (ByteArrayPool_mediumCount > 0) { - var2 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; - ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; - return var2; + var4 = ByteArrayPool_medium[--ByteArrayPool_mediumCount]; // L: 41 + ByteArrayPool_medium[ByteArrayPool_mediumCount] = null; // L: 42 + return var4; // L: 43 } - if (var0 != 30000) { + if (var0 != 30000) { // L: 45 if (var0 < 30000) { } } else if (ByteArrayPool_largeCount > 0) { - var2 = ByteArrayPool_large[--ByteArrayPool_largeCount]; - ByteArrayPool_large[ByteArrayPool_largeCount] = null; - return var2; + var4 = ByteArrayPool_large[--ByteArrayPool_largeCount]; // L: 46 + ByteArrayPool_large[ByteArrayPool_largeCount] = null; // L: 47 + return var4; // L: 48 } - if (Fonts.ByteArrayPool_arrays != null) { - for (int var4 = 0; var4 < ParamDefinition.ByteArrayPool_alternativeSizes.length; ++var4) { - if (ParamDefinition.ByteArrayPool_alternativeSizes[var4] != var0) { - if (var0 < ParamDefinition.ByteArrayPool_alternativeSizes[var4]) { + if (ByteArrayPool_arrays != null) { // L: 50 + for (int var2 = 0; var2 < ByteArrayPool_alternativeSizes.length; ++var2) { // L: 51 + if (ByteArrayPool_alternativeSizes[var2] != var0) { // L: 52 + if (var0 < ByteArrayPool_alternativeSizes[var2]) { } - } else if (VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var4] > 0) { - byte[] var3 = Fonts.ByteArrayPool_arrays[var4][--VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var4]]; - Fonts.ByteArrayPool_arrays[var4][VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var4]] = null; - return var3; + } else if (ByteArrayPool_altSizeArrayCounts[var2] > 0) { + byte[] var3 = ByteArrayPool_arrays[var2][--ByteArrayPool_altSizeArrayCounts[var2]]; // L: 53 + ByteArrayPool_arrays[var2][ByteArrayPool_altSizeArrayCounts[var2]] = null; // L: 54 + return var3; // L: 55 } } } - return new byte[var0]; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/lang/Class;", - garbageValue = "28" - ) - @Export("loadClassFromDescriptor") - static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { - if (var0.equals("B")) { - return Byte.TYPE; - } else if (var0.equals("I")) { - return Integer.TYPE; - } else if (var0.equals("S")) { - return Short.TYPE; - } else if (var0.equals("J")) { - return Long.TYPE; - } else if (var0.equals("Z")) { - return Boolean.TYPE; - } else if (var0.equals("F")) { - return Float.TYPE; - } else if (var0.equals("D")) { - return Double.TYPE; - } else if (var0.equals("C")) { - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); - } + return new byte[var0]; // L: 68 } } diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java index 91c25cc0ab..9fd29c33c3 100644 --- a/runescape-client/src/main/java/Calendar.java +++ b/runescape-client/src/main/java/Calendar.java @@ -2,24 +2,45 @@ import java.util.TimeZone; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hy") +@ObfuscatedName("hk") @Implements("Calendar") public class Calendar { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("MONTH_NAMES_ENGLISH_GERMAN") - public static final String[][] MONTH_NAMES_ENGLISH_GERMAN; - @ObfuscatedName("o") + static final String[][] MONTH_NAMES_ENGLISH_GERMAN; + @ObfuscatedName("k") @Export("DAYS_OF_THE_WEEK") - public static final String[] DAYS_OF_THE_WEEK; - @ObfuscatedName("q") + static final String[] DAYS_OF_THE_WEEK; + @ObfuscatedName("s") @Export("Calendar_calendar") - public static java.util.Calendar Calendar_calendar; + static java.util.Calendar Calendar_calendar; + @ObfuscatedName("x") + public static short[] field2535; static { - MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; - DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}}; // L: 7 + DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; // L: 17 java.util.Calendar.getInstance(); Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT")); } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I[BLlz;I)V", + garbageValue = "2015362738" + ) + static void method4039(int var0, byte[] var1, ArchiveDisk var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18 + var3.type = 0; // L: 19 + var3.key = (long)var0; // L: 20 + var3.data = var1; // L: 21 + var3.archiveDisk = var2; // L: 22 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24 + } // L: 25 + + WorldMapArea.method415(); // L: 26 + } // L: 27 } diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java index 2c91422471..d8cb549309 100644 --- a/runescape-client/src/main/java/Canvas.java +++ b/runescape-client/src/main/java/Canvas.java @@ -2,290 +2,134 @@ import java.awt.Component; import java.awt.Graphics; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ba") +@ObfuscatedName("bi") @Implements("Canvas") public final class Canvas extends java.awt.Canvas { - @ObfuscatedName("hd") - @ObfuscatedGetter( - intValue = 1560721333 + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lhq;" ) - @Export("cameraYaw") - static int cameraYaw; - @ObfuscatedName("m") + static Widget field438; + @ObfuscatedName("z") @Export("component") Component component; Canvas(Component var1) { - this.component = var1; - } + this.component = var1; // L: 11 + } // L: 12 public final void paint(Graphics var1) { - this.component.paint(var1); - } + this.component.paint(var1); // L: 19 + } // L: 20 public final void update(Graphics var1) { - this.component.update(var1); + this.component.update(var1); // L: 15 + } // L: 16 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IB)I", + garbageValue = "-36" + ) + public static int method905(int var0) { + var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); // L: 35 + var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); // L: 36 + var0 = var0 + (var0 >>> 4) & 252645135; // L: 37 + var0 += var0 >>> 8; // L: 38 + var0 += var0 >>> 16; // L: 39 + return var0 & 255; // L: 40 } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)Ljg;", - garbageValue = "83996779" + descriptor = "([BI)V", + garbageValue = "1073407655" ) - @Export("getObjectDefinition") - public static ObjectDefinition getObjectDefinition(int var0) { - ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("ByteArrayPool_release") + public static synchronized void ByteArrayPool_release(byte[] var0) { + if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { // L: 76 + ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; // L: 77 + } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { // L: 80 + ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; // L: 81 + } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { // L: 84 + ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; // L: 85 } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1398023724" - ) - static final void method927(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your friend list").toString(); - ObjectSound.addGameMessage(30, "", var1); - } - - @ObfuscatedName("ga") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "411559133" - ) - static void method925() { - if (class60.localPlayer.x >> 7 == Client.destinationX && class60.localPlayer.y >> 7 == Client.destinationY) { - Client.destinationX = 0; - } - - } - - @ObfuscatedName("is") - @ObfuscatedSignature( - descriptor = "(III)Ljava/lang/String;", - garbageValue = "-266618010" - ) - @Export("getColorForCombatDifference") - static final String getColorForCombatDifference(int var0, int var1) { - int var2 = var1 - var0; - if (var2 < -9) { - return ItemContainer.colorStartTag(16711680); - } else if (var2 < -6) { - return ItemContainer.colorStartTag(16723968); - } else if (var2 < -3) { - return ItemContainer.colorStartTag(16740352); - } else if (var2 < 0) { - return ItemContainer.colorStartTag(16756736); - } else if (var2 > 9) { - return ItemContainer.colorStartTag(65280); - } else if (var2 > 6) { - return ItemContainer.colorStartTag(4259584); - } else if (var2 > 3) { - return ItemContainer.colorStartTag(8453888); - } else { - return var2 > 0 ? ItemContainer.colorStartTag(12648192) : ItemContainer.colorStartTag(16776960); - } - } - - @ObfuscatedName("iw") - @ObfuscatedSignature( - descriptor = "(Lhd;II)I", - garbageValue = "623604092" - ) - static final int method923(Widget var0, int var1) { - if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { - try { - int[] var2 = var0.cs1Instructions[var1]; - int var3 = 0; - int var4 = 0; - byte var5 = 0; - - while (true) { - int var6 = var2[var4++]; - int var7 = 0; - byte var8 = 0; - if (var6 == 0) { - return var3; - } - - if (var6 == 1) { - var7 = Client.currentLevels[var2[var4++]]; - } - - if (var6 == 2) { - var7 = Client.levels[var2[var4++]]; - } - - if (var6 == 3) { - var7 = Client.experience[var2[var4++]]; - } - - int var9; - Widget var10; - int var11; - int var12; - if (var6 == 4) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = WorldMapSprite.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!KitDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 += var10.itemQuantities[var12]; - } - } - } - } - - if (var6 == 5) { - var7 = Varps.Varps_main[var2[var4++]]; - } - - if (var6 == 6) { - var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; - } - - if (var6 == 7) { - var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; - } - - if (var6 == 8) { - var7 = class60.localPlayer.combatLevel; - } - - if (var6 == 9) { - for (var9 = 0; var9 < 25; ++var9) { - if (Skills.Skills_enabled[var9]) { - var7 += Client.levels[var9]; - } - } - } - - if (var6 == 10) { - var9 = var2[var4++] << 16; - var9 += var2[var4++]; - var10 = WorldMapSprite.getWidget(var9); - var11 = var2[var4++]; - if (var11 != -1 && (!KitDefinition.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { - for (var12 = 0; var12 < var10.itemIds.length; ++var12) { - if (var11 + 1 == var10.itemIds[var12]) { - var7 = 999999999; - break; - } - } - } - } - - if (var6 == 11) { - var7 = Client.runEnergy; - } - - if (var6 == 12) { - var7 = Client.weight; - } - - if (var6 == 13) { - var9 = Varps.Varps_main[var2[var4++]]; - int var13 = var2[var4++]; - var7 = (var9 & 1 << var13) != 0 ? 1 : 0; - } - - if (var6 == 14) { - var9 = var2[var4++]; - var7 = Widget.getVarbit(var9); - } - - if (var6 == 15) { - var8 = 1; - } - - if (var6 == 16) { - var8 = 2; - } - - if (var6 == 17) { - var8 = 3; - } - - if (var6 == 18) { - var7 = (class60.localPlayer.x >> 7) + class182.baseX; - } - - if (var6 == 19) { - var7 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; - } - - if (var6 == 20) { - var7 = var2[var4++]; - } - - if (var8 == 0) { - if (var5 == 0) { - var3 += var7; - } - - if (var5 == 1) { - var3 -= var7; - } - - if (var5 == 2 && var7 != 0) { - var3 /= var7; - } - - if (var5 == 3) { - var3 *= var7; - } - - var5 = 0; - } else { - var5 = var8; + if (ByteArrayPool.ByteArrayPool_arrays != null) { // L: 88 + for (int var1 = 0; var1 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var1) { // L: 89 + if (var0.length == ByteArrayPool.ByteArrayPool_alternativeSizes[var1] && ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1] < ByteArrayPool.ByteArrayPool_arrays[var1].length) { // L: 90 + ByteArrayPool.ByteArrayPool_arrays[var1][ByteArrayPool.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; // L: 91 + return; // L: 92 } } - } catch (Exception var14) { - return -1; } - } else { - return -2; - } - } - @ObfuscatedName("kx") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-83" - ) - @Export("Clan_joinChat") - static final void Clan_joinChat(String var0) { - if (!var0.equals("")) { - PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); } - } + } // L: 78 82 86 96 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(Lct;B)V", + garbageValue = "-37" + ) + @Export("changeWorld") + static void changeWorld(World var0) { + if (var0.isMembersOnly() != Client.isMembersWorld) { // L: 1720 + Client.isMembersWorld = var0.isMembersOnly(); // L: 1721 + WorldMapManager.method726(var0.isMembersOnly()); // L: 1722 + } + + ItemContainer.worldHost = var0.host; // L: 1724 + Client.worldId = var0.id; // L: 1725 + Client.worldProperties = var0.properties; // L: 1726 + Client.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1727 + class23.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1728 + WorldMapScaleHandler.port3 = Client.port1; // L: 1729 + } // L: 1730 + + @ObfuscatedName("jo") + @ObfuscatedSignature( + descriptor = "(Lhq;I)V", + garbageValue = "-580678135" + ) + static final void method903(Widget var0) { + int var1 = var0.contentType; // L: 10437 + if (var1 == 324) { // L: 10438 + if (Client.field937 == -1) { // L: 10439 + Client.field937 = var0.spriteId2; // L: 10440 + Client.field942 = var0.spriteId; // L: 10441 + } + + if (Client.playerAppearance.isFemale) { // L: 10443 + var0.spriteId2 = Client.field937; + } else { + var0.spriteId2 = Client.field942; // L: 10444 + } + + } else if (var1 == 325) { // L: 10447 + if (Client.field937 == -1) { // L: 10448 + Client.field937 = var0.spriteId2; // L: 10449 + Client.field942 = var0.spriteId; // L: 10450 + } + + if (Client.playerAppearance.isFemale) { // L: 10452 + var0.spriteId2 = Client.field942; + } else { + var0.spriteId2 = Client.field937; // L: 10453 + } + + } else if (var1 == 327) { // L: 10456 + var0.modelAngleX = 150; // L: 10457 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 10458 + var0.modelType = 5; // L: 10459 + var0.modelId = 0; // L: 10460 + } else if (var1 == 328) { // L: 10463 + var0.modelAngleX = 150; // L: 10464 + var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 10465 + var0.modelType = 5; // L: 10466 + var0.modelId = 1; // L: 10467 + } + } // L: 10445 10454 10461 10468 10470 } diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index 283c3fc8b1..358689af4b 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -1,4 +1,3 @@ -import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -8,74 +7,349 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cl") @Implements("ChatChannel") public class ChatChannel { - @ObfuscatedName("eh") - @Export("secureRandom") - static SecureRandom secureRandom; - @ObfuscatedName("o") + @ObfuscatedName("ln") + @ObfuscatedGetter( + intValue = -1406179309 + ) + @Export("menuX") + static int menuX; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lbr;" + descriptor = "[Lbk;" ) @Export("messages") Message[] messages; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1880348079 + intValue = -1207472641 ) @Export("count") int count; ChatChannel() { - this.messages = new Message[100]; - } + this.messages = new Message[100]; // L: 83 + } // L: 86 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)Lbr;", - garbageValue = "-1" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbk;", + garbageValue = "-1549087177" ) @Export("addMessage") Message addMessage(int var1, String var2, String var3, String var4) { - Message var5 = this.messages[99]; + Message var5 = this.messages[99]; // L: 89 - for (int var6 = this.count; var6 > 0; --var6) { - if (var6 != 100) { - this.messages[var6] = this.messages[var6 - 1]; + for (int var6 = this.count; var6 > 0; --var6) { // L: 90 + if (var6 != 100) { // L: 91 + this.messages[var6] = this.messages[var6 - 1]; // L: 92 } } - if (var5 == null) { + if (var5 == null) { // L: 94 var5 = new Message(var1, var2, var4, var3); } else { - var5.remove(); - var5.removeDual(); - var5.set(var1, var2, var4, var3); + var5.remove(); // L: 96 + var5.removeDual(); // L: 97 + var5.set(var1, var2, var4, var3); // L: 98 } - this.messages[0] = var5; - if (this.count < 100) { + this.messages[0] = var5; // L: 100 + if (this.count < 100) { // L: 101 ++this.count; } - return var5; + return var5; // L: 102 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Lbr;", - garbageValue = "-317582349" + descriptor = "(II)Lbk;", + garbageValue = "1867589012" ) @Export("getMessage") Message getMessage(int var1) { - return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; + return var1 >= 0 && var1 < this.count ? this.messages[var1] : null; // L: 106 107 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1472365930" + garbageValue = "-1452572127" ) @Export("size") int size() { - return this.count; + return this.count; // L: 111 } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(IIIIIZI)Llp;", + garbageValue = "-1593670187" + ) + @Export("getItemSprite") + public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { + if (var1 == -1) { // L: 353 + var4 = 0; + } else if (var4 == 2 && var1 != 1) { // L: 354 + var4 = 1; + } + + long var6 = ((long)var4 << 40) + ((long)var2 << 38) + ((long)var1 << 16) + (long)var0 + ((long)var3 << 42); // L: 355 + Sprite var8; + if (!var5) { // L: 357 + var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); // L: 358 + if (var8 != null) { // L: 359 + return var8; + } + } + + ItemDefinition var9 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var0); // L: 361 + if (var1 > 1 && var9.countobj != null) { // L: 362 + int var10 = -1; // L: 363 + + for (int var11 = 0; var11 < 10; ++var11) { // L: 364 + if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { // L: 365 + var10 = var9.countobj[var11]; + } + } + + if (var10 != -1) { // L: 367 + var9 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var10); + } + } + + Model var19 = var9.getModel(1); // L: 369 + if (var19 == null) { // L: 370 + return null; + } else { + Sprite var20 = null; // L: 371 + if (var9.noteTemplate != -1) { // L: 372 + var20 = getItemSprite(var9.note, 10, 1, 0, 0, true); // L: 373 + if (var20 == null) { // L: 374 + return null; + } + } else if (var9.notedId != -1) { // L: 376 + var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); // L: 377 + if (var20 == null) { // L: 378 + return null; + } + } else if (var9.placeholderTemplate != -1) { // L: 380 + var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); // L: 381 + if (var20 == null) { // L: 382 + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; // L: 384 + int var13 = Rasterizer2D.Rasterizer2D_width; // L: 385 + int var14 = Rasterizer2D.Rasterizer2D_height; // L: 386 + int[] var15 = new int[4]; // L: 387 + Rasterizer2D.Rasterizer2D_getClipArray(var15); // L: 388 + var8 = new Sprite(36, 32); // L: 389 + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 390 + Rasterizer2D.Rasterizer2D_clear(); // L: 391 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 392 + Rasterizer3D.method3181(16, 16); // L: 393 + Rasterizer3D.field1788 = false; // L: 394 + if (var9.placeholderTemplate != -1) { // L: 395 + var20.drawTransBgAt(0, 0); + } + + int var16 = var9.zoom2d; // L: 396 + if (var5) { // L: 397 + var16 = (int)(1.5D * (double)var16); + } else if (var2 == 2) { // L: 398 + var16 = (int)(1.04D * (double)var16); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; // L: 399 + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; // L: 400 + var19.calculateBoundsCylinder(); // L: 401 + var19.method3003(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); // L: 402 + if (var9.notedId != -1) { // L: 403 + var20.drawTransBgAt(0, 0); + } + + if (var2 >= 1) { // L: 404 + var8.outline(1); + } + + if (var2 >= 2) { // L: 405 + var8.outline(16777215); + } + + if (var3 != 0) { // L: 406 + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); // L: 407 + if (var9.noteTemplate != -1) { // L: 408 + var20.drawTransBgAt(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { // L: 409 + ScriptEvent.ItemDefinition_fontPlain11.draw(class194.method3712(var1), 0, 9, 16776960, 1); // L: 410 + } + + if (!var5) { // L: 412 + ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); // L: 413 + Rasterizer2D.Rasterizer2D_setClipArray(var15); // L: 414 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 415 + Rasterizer3D.field1788 = true; // L: 416 + return var8; // L: 417 + } + } + + @ObfuscatedName("gy") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-2146534087" + ) + @Export("drawObject") + static final void drawObject(int var0, int var1, int var2, int var3, int var4) { + long var5 = ScriptEvent.scene.getBoundaryObjectTag(var0, var1, var2); // L: 5182 + int var7; + int var8; + int var9; + int var10; + int var12; + int var13; + if (0L != var5) { // L: 5183 + var7 = ScriptEvent.scene.getObjectFlags(var0, var1, var2, var5); // L: 5184 + var8 = var7 >> 6 & 3; // L: 5185 + var9 = var7 & 31; // L: 5186 + var10 = var3; // L: 5187 + if (GrandExchangeOfferTotalQuantityComparator.method173(var5)) { // L: 5188 + var10 = var4; + } + + int[] var11 = ApproximateRouteStrategy.sceneMinimapSprite.pixels; // L: 5189 + var12 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5190 + var13 = UserComparator9.Entity_unpackID(var5); // L: 5191 + ObjectDefinition var14 = MidiPcmStream.getObjectDefinition(var13); // L: 5192 + if (var14.mapSceneId != -1) { // L: 5193 + IndexedSprite var15 = ReflectionCheck.mapSceneSprites[var14.mapSceneId]; // L: 5194 + if (var15 != null) { // L: 5195 + int var16 = (var14.sizeX * 4 - var15.subWidth) / 2; // L: 5196 + int var17 = (var14.sizeY * 4 - var15.subHeight) / 2; // L: 5197 + var15.drawAt(var1 * 4 + var16 + 48, (104 - var2 - var14.sizeY) * 4 + var17 + 48); // L: 5198 + } + } else { + if (var9 == 0 || var9 == 2) { // L: 5202 + if (var8 == 0) { // L: 5203 + var11[var12] = var10; // L: 5204 + var11[var12 + 512] = var10; // L: 5205 + var11[var12 + 1024] = var10; // L: 5206 + var11[var12 + 1536] = var10; // L: 5207 + } else if (var8 == 1) { // L: 5209 + var11[var12] = var10; // L: 5210 + var11[var12 + 1] = var10; // L: 5211 + var11[var12 + 2] = var10; // L: 5212 + var11[var12 + 3] = var10; // L: 5213 + } else if (var8 == 2) { // L: 5215 + var11[var12 + 3] = var10; // L: 5216 + var11[var12 + 512 + 3] = var10; // L: 5217 + var11[var12 + 1024 + 3] = var10; // L: 5218 + var11[var12 + 1536 + 3] = var10; // L: 5219 + } else if (var8 == 3) { // L: 5221 + var11[var12 + 1536] = var10; // L: 5222 + var11[var12 + 1536 + 1] = var10; // L: 5223 + var11[var12 + 1536 + 2] = var10; // L: 5224 + var11[var12 + 1536 + 3] = var10; // L: 5225 + } + } + + if (var9 == 3) { // L: 5228 + if (var8 == 0) { // L: 5229 + var11[var12] = var10; + } else if (var8 == 1) { // L: 5230 + var11[var12 + 3] = var10; + } else if (var8 == 2) { // L: 5231 + var11[var12 + 1536 + 3] = var10; + } else if (var8 == 3) { // L: 5232 + var11[var12 + 1536] = var10; + } + } + + if (var9 == 2) { // L: 5234 + if (var8 == 3) { // L: 5235 + var11[var12] = var10; // L: 5236 + var11[var12 + 512] = var10; // L: 5237 + var11[var12 + 1024] = var10; // L: 5238 + var11[var12 + 1536] = var10; // L: 5239 + } else if (var8 == 0) { // L: 5241 + var11[var12] = var10; // L: 5242 + var11[var12 + 1] = var10; // L: 5243 + var11[var12 + 2] = var10; // L: 5244 + var11[var12 + 3] = var10; // L: 5245 + } else if (var8 == 1) { // L: 5247 + var11[var12 + 3] = var10; // L: 5248 + var11[var12 + 512 + 3] = var10; // L: 5249 + var11[var12 + 1024 + 3] = var10; // L: 5250 + var11[var12 + 1536 + 3] = var10; // L: 5251 + } else if (var8 == 2) { // L: 5253 + var11[var12 + 1536] = var10; // L: 5254 + var11[var12 + 1536 + 1] = var10; // L: 5255 + var11[var12 + 1536 + 2] = var10; // L: 5256 + var11[var12 + 1536 + 3] = var10; // L: 5257 + } + } + } + } + + var5 = ScriptEvent.scene.getGameObjectTag(var0, var1, var2); // L: 5262 + if (0L != var5) { // L: 5263 + var7 = ScriptEvent.scene.getObjectFlags(var0, var1, var2, var5); // L: 5264 + var8 = var7 >> 6 & 3; // L: 5265 + var9 = var7 & 31; // L: 5266 + var10 = UserComparator9.Entity_unpackID(var5); // L: 5267 + ObjectDefinition var24 = MidiPcmStream.getObjectDefinition(var10); // L: 5268 + int var19; + if (var24.mapSceneId != -1) { // L: 5269 + IndexedSprite var20 = ReflectionCheck.mapSceneSprites[var24.mapSceneId]; // L: 5270 + if (var20 != null) { // L: 5271 + var13 = (var24.sizeX * 4 - var20.subWidth) / 2; // L: 5272 + var19 = (var24.sizeY * 4 - var20.subHeight) / 2; // L: 5273 + var20.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48); // L: 5274 + } + } else if (var9 == 9) { // L: 5277 + var12 = 15658734; // L: 5278 + if (GrandExchangeOfferTotalQuantityComparator.method173(var5)) { // L: 5279 + var12 = 15597568; + } + + int[] var18 = ApproximateRouteStrategy.sceneMinimapSprite.pixels; // L: 5280 + var19 = var1 * 4 + (103 - var2) * 2048 + 24624; // L: 5281 + if (var8 != 0 && var8 != 2) { // L: 5282 + var18[var19] = var12; // L: 5289 + var18[var19 + 1 + 512] = var12; // L: 5290 + var18[var19 + 1024 + 2] = var12; // L: 5291 + var18[var19 + 1536 + 3] = var12; // L: 5292 + } else { + var18[var19 + 1536] = var12; // L: 5283 + var18[var19 + 1 + 1024] = var12; // L: 5284 + var18[var19 + 512 + 2] = var12; // L: 5285 + var18[var19 + 3] = var12; // L: 5286 + } + } + } + + var5 = ScriptEvent.scene.getFloorDecorationTag(var0, var1, var2); // L: 5296 + if (0L != var5) { // L: 5297 + var7 = UserComparator9.Entity_unpackID(var5); // L: 5298 + ObjectDefinition var21 = MidiPcmStream.getObjectDefinition(var7); // L: 5299 + if (var21.mapSceneId != -1) { // L: 5300 + IndexedSprite var22 = ReflectionCheck.mapSceneSprites[var21.mapSceneId]; // L: 5301 + if (var22 != null) { // L: 5302 + var10 = (var21.sizeX * 4 - var22.subWidth) / 2; // L: 5303 + int var23 = (var21.sizeY * 4 - var22.subHeight) / 2; // L: 5304 + var22.drawAt(var10 + var1 * 4 + 48, var23 + (104 - var2 - var21.sizeY) * 4 + 48); // L: 5305 + } + } + } + + } // L: 5309 } diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java index c5ecdf1098..855c1035ca 100644 --- a/runescape-client/src/main/java/ClanChat.java +++ b/runescape-client/src/main/java/ClanChat.java @@ -1,279 +1,268 @@ -import java.io.IOException; -import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kk") +@ObfuscatedName("kx") @Implements("ClanChat") public class ClanChat extends UserList { - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lkp;" ) @Export("localUser") final Usernamed localUser; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("name") public String name; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("owner") public String owner; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("minKick") public byte minKick; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1947222095 + intValue = 996591213 ) @Export("rank") public int rank; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1869619471 + intValue = -463550623 ) - int field3663; + int field3661; @ObfuscatedSignature( - descriptor = "(Lmo;Lkp;)V" + descriptor = "(Lmu;Lkp;)V" ) public ClanChat(LoginType var1, Usernamed var2) { - super(100); - this.name = null; - this.owner = null; - this.field3663 = 1; - this.loginType = var1; - this.localUser = var2; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)Ljf;", - garbageValue = "551595115" - ) - @Export("newInstance") - User newInstance() { - return new ClanMate(); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)[Ljf;", - garbageValue = "1959965595" - ) - @Export("newTypedArray") - User[] newTypedArray(int var1) { - return new ClanMate[var1]; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-85" - ) - @Export("readName") - final void readName(String var1) { - long var5 = 0L; - int var7 = var1.length(); - - for (int var8 = 0; var8 < var7; ++var8) { - var5 *= 37L; - char var9 = var1.charAt(var8); - if (var9 >= 'A' && var9 <= 'Z') { - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); - } - - if (var5 >= 177917621779460413L) { - break; - } - } - - while (0L == var5 % 37L && var5 != 0L) { - var5 /= 37L; - } - - String var10 = WorldMapData_0.base37DecodeLong(var5); - if (var10 == null) { - var10 = ""; - } - - this.name = var10; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1810188467" - ) - @Export("setOwner") - final void setOwner(String var1) { - long var5 = 0L; - int var7 = var1.length(); - - for (int var8 = 0; var8 < var7; ++var8) { - var5 *= 37L; - char var9 = var1.charAt(var8); - if (var9 >= 'A' && var9 <= 'Z') { - var5 += (long)(var9 + 1 - 65); - } else if (var9 >= 'a' && var9 <= 'z') { - var5 += (long)(var9 + 1 - 97); - } else if (var9 >= '0' && var9 <= '9') { - var5 += (long)(var9 + 27 - 48); - } - - if (var5 >= 177917621779460413L) { - break; - } - } - - while (0L == var5 % 37L && var5 != 0L) { - var5 /= 37L; - } - - String var10 = WorldMapData_0.base37DecodeLong(var5); - if (var10 == null) { - var10 = ""; - } - - this.owner = var10; - } + super(100); // L: 18 + this.name = null; // L: 11 + this.owner = null; // L: 12 + this.field3661 = 1; // L: 15 + this.loginType = var1; // L: 19 + this.localUser = var2; // L: 20 + } // L: 21 @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "585042716" + descriptor = "(B)Ljc;", + garbageValue = "35" + ) + @Export("newInstance") + User newInstance() { + return new ClanMate(); // L: 24 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IB)[Ljc;", + garbageValue = "-19" + ) + @Export("newTypedArray") + User[] newTypedArray(int var1) { + return new ClanMate[var1]; // L: 28 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-2006450135" + ) + @Export("readName") + final void readName(String var1) { + long var5 = 0L; // L: 36 + int var7 = var1.length(); // L: 37 + + for (int var8 = 0; var8 < var7; ++var8) { // L: 38 + var5 *= 37L; // L: 39 + char var9 = var1.charAt(var8); // L: 40 + if (var9 >= 'A' && var9 <= 'Z') { // L: 41 + var5 += (long)(var9 + 1 - 65); + } else if (var9 >= 'a' && var9 <= 'z') { // L: 42 + var5 += (long)(var9 + 1 - 97); + } else if (var9 >= '0' && var9 <= '9') { + var5 += (long)(var9 + 27 - 48); // L: 43 + } + + if (var5 >= 177917621779460413L) { // L: 44 + break; + } + } + + while (0L == var5 % 37L && var5 != 0L) { // L: 46 + var5 /= 37L; + } + + String var10 = GrandExchangeOfferTotalQuantityComparator.base37DecodeLong(var5); // L: 49 + if (var10 == null) { // L: 50 + var10 = ""; + } + + this.name = var10; // L: 53 + } // L: 54 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-13" + ) + @Export("setOwner") + final void setOwner(String var1) { + long var5 = 0L; // L: 61 + int var7 = var1.length(); // L: 62 + + for (int var8 = 0; var8 < var7; ++var8) { // L: 63 + var5 *= 37L; // L: 64 + char var9 = var1.charAt(var8); // L: 65 + if (var9 >= 'A' && var9 <= 'Z') { // L: 66 + var5 += (long)(var9 + 1 - 65); + } else if (var9 >= 'a' && var9 <= 'z') { // L: 67 + var5 += (long)(var9 + 1 - 97); + } else if (var9 >= '0' && var9 <= '9') { + var5 += (long)(var9 + 27 - 48); // L: 68 + } + + if (var5 >= 177917621779460413L) { // L: 69 + break; + } + } + + while (var5 % 37L == 0L && 0L != var5) { // L: 71 + var5 /= 37L; + } + + String var10 = GrandExchangeOfferTotalQuantityComparator.base37DecodeLong(var5); // L: 74 + if (var10 == null) { // L: 75 + var10 = ""; + } + + this.owner = var10; // L: 78 + } // L: 79 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Lkf;I)V", + garbageValue = "-140522773" ) @Export("readUpdate") public final void readUpdate(Buffer var1) { - this.setOwner(var1.readStringCp1252NullTerminated()); - long var2 = var1.readLong(); - this.readName(Frames.method3398(var2)); - this.minKick = var1.readByte(); - int var4 = var1.readUnsignedByte(); - if (var4 != 255) { - this.clear(); + this.setOwner(var1.readStringCp1252NullTerminated()); // L: 82 + long var2 = var1.readLong(); // L: 83 + this.readName(AbstractWorldMapData.method331(var2)); // L: 84 + this.minKick = var1.readByte(); // L: 85 + int var4 = var1.readUnsignedByte(); // L: 86 + if (var4 != 255) { // L: 87 + this.clear(); // L: 88 - for (int var5 = 0; var5 < var4; ++var5) { - ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); - int var7 = var1.readUnsignedShort(); - var6.set(var7, ++this.field3663 - 1); - var6.rank = var1.readByte(); - var1.readStringCp1252NullTerminated(); - this.isLocalPlayer(var6); + for (int var5 = 0; var5 < var4; ++var5) { // L: 89 + ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 90 + int var7 = var1.readUnsignedShort(); // L: 91 + var6.set(var7, ++this.field3661 - 1); // L: 92 + var6.rank = var1.readByte(); // L: 93 + var1.readStringCp1252NullTerminated(); // L: 94 + this.isLocalPlayer(var6); // L: 95 } } - } + } // L: 97 - @ObfuscatedName("ci") + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "-100" + descriptor = "(Lkf;I)V", + garbageValue = "-1609519630" ) - public final void method5421(Buffer var1) { - Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var3 = var1.readUnsignedShort(); - byte var4 = var1.readByte(); - boolean var5 = false; - if (var4 == -128) { + public final void method5350(Buffer var1) { + Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 100 + int var3 = var1.readUnsignedShort(); // L: 101 + byte var4 = var1.readByte(); // L: 102 + boolean var5 = false; // L: 103 + if (var4 == -128) { // L: 104 var5 = true; } ClanMate var6; - if (var5) { - if (this.getSize() == 0) { + if (var5) { // L: 105 + if (this.getSize() == 0) { // L: 106 return; } - var6 = (ClanMate)this.getByCurrentUsername(var2); - if (var6 != null && var6.getWorld() == var3) { - this.remove(var6); + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 107 + if (var6 != null && var6.getWorld() == var3) { // L: 108 + this.remove(var6); // L: 109 } } else { - var1.readStringCp1252NullTerminated(); - var6 = (ClanMate)this.getByCurrentUsername(var2); - if (var6 == null) { - if (this.getSize() > super.capacity) { + var1.readStringCp1252NullTerminated(); // L: 113 + var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 114 + if (var6 == null) { // L: 115 + if (this.getSize() > super.capacity) { // L: 116 return; } - var6 = (ClanMate)this.addLastNoPreviousUsername(var2); + var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 117 } - var6.set(var3, ++this.field3663 - 1); - var6.rank = var4; - this.isLocalPlayer(var6); + var6.set(var3, ++this.field3661 - 1); // L: 119 + var6.rank = var4; // L: 120 + this.isLocalPlayer(var6); // L: 121 } - } + } // L: 123 - @ObfuscatedName("cu") + @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-117" + descriptor = "(I)V", + garbageValue = "-1118151470" ) @Export("clearFriends") public final void clearFriends() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { - ((ClanMate)this.get(var1)).clearIsFriend(); + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 126 + ((ClanMate)this.get(var1)).clearIsFriend(); // L: 127 } - } + } // L: 129 - @ObfuscatedName("cq") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-23" + descriptor = "(I)V", + garbageValue = "1383721491" ) @Export("invalidateIgnoreds") public final void invalidateIgnoreds() { - for (int var1 = 0; var1 < this.getSize(); ++var1) { - ((ClanMate)this.get(var1)).clearIsIgnored(); + for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 132 + ((ClanMate)this.get(var1)).clearIsIgnored(); // L: 133 } - } + } // L: 135 - @ObfuscatedName("co") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "(Lji;I)V", - garbageValue = "244481619" + descriptor = "(Ljf;I)V", + garbageValue = "-1871849373" ) @Export("isLocalPlayer") final void isLocalPlayer(ClanMate var1) { - if (var1.getUsername().equals(this.localUser.username())) { + if (var1.getUsername().equals(this.localUser.username())) { // L: 138 this.rank = var1.rank; } - } + } // L: 139 - @ObfuscatedName("ag") + @ObfuscatedName("in") @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;III)Llj;", - garbageValue = "-1116942702" + descriptor = "(I)Z", + garbageValue = "2030161914" ) - public static AbstractSocket method5441(Socket var0, int var1, int var2) throws IOException { - return new BufferedNetSocket(var0, var1, var2); - } - - @ObfuscatedName("el") - @ObfuscatedSignature( - descriptor = "(B)Lma;", - garbageValue = "-90" - ) - @Export("getWorldMap") - static WorldMap getWorldMap() { - return class228.worldMap; + @Export("getTapToDrop") + static boolean getTapToDrop() { + return Client.tapToDrop; // L: 9635 } } diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java index afc989fd28..137055954a 100644 --- a/runescape-client/src/main/java/ClanMate.java +++ b/runescape-client/src/main/java/ClanMate.java @@ -3,95 +3,116 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ji") +@ObfuscatedName("jf") @Implements("ClanMate") public class ClanMate extends Buddy { - @ObfuscatedName("bk") - @Export("otp") - static String otp; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkm;" ) @Export("friend") TriBool friend; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkm;" ) @Export("ignored") TriBool ignored; ClanMate() { - this.friend = TriBool.TriBool_unknown; - this.ignored = TriBool.TriBool_unknown; - } + this.friend = TriBool.TriBool_unknown; // L: 6 + this.ignored = TriBool.TriBool_unknown; // L: 7 + } // L: 9 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "55" + descriptor = "(I)V", + garbageValue = "-1483080876" ) @Export("clearIsFriend") void clearIsFriend() { - this.friend = TriBool.TriBool_unknown; + this.friend = TriBool.TriBool_unknown; // L: 12 + } // L: 13 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2093407981" + ) + @Export("isFriend") + public final boolean isFriend() { + if (this.friend == TriBool.TriBool_unknown) { // L: 16 + this.fillIsFriend(); // L: 17 + } + + return this.friend == TriBool.TriBool_true; // L: 19 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2130404233" + ) + @Export("fillIsFriend") + void fillIsFriend() { + this.friend = class60.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 23 + } // L: 24 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "405113093" + ) + @Export("clearIsIgnored") + void clearIsIgnored() { + this.ignored = TriBool.TriBool_unknown; // L: 27 + } // L: 28 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-607786293" + ) + @Export("isIgnored") + public final boolean isIgnored() { + if (this.ignored == TriBool.TriBool_unknown) { // L: 31 + this.fillIsIgnored(); // L: 32 + } + + return this.ignored == TriBool.TriBool_true; // L: 34 } @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1504738052" - ) - @Export("isFriend") - public final boolean isFriend() { - if (this.friend == TriBool.TriBool_unknown) { - this.fillIsFriend(); - } - - return this.friend == TriBool.TriBool_true; - } - - @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2080180390" - ) - @Export("fillIsFriend") - void fillIsFriend() { - this.friend = ModeWhere.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - @Export("clearIsIgnored") - void clearIsIgnored() { - this.ignored = TriBool.TriBool_unknown; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "10" - ) - @Export("isIgnored") - public final boolean isIgnored() { - if (this.ignored == TriBool.TriBool_unknown) { - this.fillIsIgnored(); - } - - return this.ignored == TriBool.TriBool_true; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1156765322" + garbageValue = "-483165617" ) @Export("fillIsIgnored") void fillIsIgnored() { - this.ignored = ModeWhere.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; + this.ignored = class60.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 38 + } // L: 39 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(CB)Z", + garbageValue = "0" + ) + public static boolean method5146(char var0) { + if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { // L: 45 + if (var0 != 0) { // L: 46 + char[] var1 = class297.cp1252AsciiExtension; // L: 48 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 49 + char var3 = var1[var2]; // L: 50 + if (var0 == var3) { + return true; // L: 52 + } + } + } + + return false; // L: 57 + } else { + return true; + } } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index b74189fd2a..fbdc5084de 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1,9 +1,9 @@ -import java.io.File; import java.io.IOException; import java.net.Socket; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; @@ -14,1901 +14,2297 @@ import netscape.javascript.JSObject; @Implements("Client") @ObfuscatedName("client") public final class Client extends GameShell implements Usernamed { - @ObfuscatedName("na") + @ObfuscatedName("nm") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhq;" ) @Export("clickedWidget") static Widget clickedWidget; - @ObfuscatedName("oe") + @ObfuscatedName("ox") @ObfuscatedGetter( - intValue = -729224767 + intValue = -738274361 ) - static int field877; - @ObfuscatedName("ob") + static int field881; + @ObfuscatedName("op") @ObfuscatedGetter( - intValue = 1674098753 + intValue = -548379031 ) @Export("rootWidgetCount") static int rootWidgetCount; - @ObfuscatedName("og") + @ObfuscatedName("ob") @ObfuscatedGetter( - longValue = -5166210462225322257L + longValue = -5904511497921322921L ) - static long field886; + static long field890; @ObfuscatedName("oo") - static boolean[] field813; - @ObfuscatedName("oa") - static boolean[] field880; - @ObfuscatedName("od") - static boolean[] field879; + static boolean[] field882; + @ObfuscatedName("or") + static boolean[] field884; + @ObfuscatedName("oz") + static boolean[] field883; @ObfuscatedName("no") - static boolean field854; + static boolean field880; @ObfuscatedName("ne") - static boolean field692; - @ObfuscatedName("on") - @Export("isResizable") - static boolean isResizable; - @ObfuscatedName("nm") @ObfuscatedGetter( - intValue = -1861718839 + intValue = -565689219 ) @Export("cycleCntr") static int cycleCntr; - @ObfuscatedName("su") + @ObfuscatedName("ol") + @Export("isResizable") + static boolean isResizable; + @ObfuscatedName("sr") @ObfuscatedGetter( - intValue = -1473502491 + intValue = -509271729 ) - public static int field942; - @ObfuscatedName("op") + public static int field946; + @ObfuscatedName("on") @ObfuscatedGetter( - intValue = 1884992439 + intValue = 1680416831 ) - static int field866; - @ObfuscatedName("nn") + static int field870; + @ObfuscatedName("nx") + static boolean field799; + @ObfuscatedName("qk") + static boolean field704; + @ObfuscatedName("nc") @ObfuscatedGetter( - intValue = 1534043965 + intValue = -1698989409 ) @Export("widgetClickX") static int widgetClickX; - @ObfuscatedName("qi") - static boolean field743; - @ObfuscatedName("nb") + @ObfuscatedName("nl") @ObfuscatedGetter( - intValue = 1952446261 + intValue = 907230791 ) @Export("widgetClickY") static int widgetClickY; - @ObfuscatedName("nl") - @ObfuscatedGetter( - intValue = 2126591519 - ) - static int field852; @ObfuscatedName("ng") - @ObfuscatedSignature( - descriptor = "Lhd;" + @ObfuscatedGetter( + intValue = -1025599455 ) - @Export("clickedWidgetParent") - static Widget clickedWidgetParent; - @ObfuscatedName("oi") + static int field856; + @ObfuscatedName("og") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("widgetFlags") static NodeHashTable widgetFlags; - @ObfuscatedName("np") - @ObfuscatedGetter( - intValue = 152745331 - ) - static int field853; - @ObfuscatedName("nk") + @ObfuscatedName("ny") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhq;" + ) + @Export("clickedWidgetParent") + static Widget clickedWidgetParent; + @ObfuscatedName("os") + @Export("rootWidgetXs") + static int[] rootWidgetXs; + @ObfuscatedName("ou") + @Export("rootWidgetWidths") + static int[] rootWidgetWidths; + @ObfuscatedName("nr") + @ObfuscatedGetter( + intValue = -2016835687 + ) + static int field785; + @ObfuscatedName("nn") + @ObfuscatedSignature( + descriptor = "Lhq;" ) @Export("viewportWidget") static Widget viewportWidget; - @ObfuscatedName("oz") + @ObfuscatedName("ov") @ObfuscatedGetter( - intValue = 1013553507 + intValue = 2115914755 ) @Export("gameDrawingMode") static int gameDrawingMode; - @ObfuscatedName("om") - @Export("rootWidgetXs") - static int[] rootWidgetXs; - @ObfuscatedName("oc") - @Export("rootWidgetWidths") - static int[] rootWidgetWidths; - @ObfuscatedName("mv") - @ObfuscatedGetter( - intValue = -1442407177 - ) - @Export("staffModLevel") - public static int staffModLevel; - @ObfuscatedName("rg") - @Export("isCameraLocked") - static boolean isCameraLocked; - @ObfuscatedName("rp") - static boolean[] field918; - @ObfuscatedName("nw") - @ObfuscatedGetter( - intValue = 1213638029 - ) - static int field855; - @ObfuscatedName("tt") - @ObfuscatedSignature( - descriptor = "Lbs;" - ) - static final ApproximateRouteStrategy field905; - @ObfuscatedName("nv") - @ObfuscatedGetter( - intValue = 924656773 - ) - static int field856; - @ObfuscatedName("os") + @ObfuscatedName("oy") @Export("rootWidgetYs") static int[] rootWidgetYs; - @ObfuscatedName("ow") - @ObfuscatedSignature( - descriptor = "Ljp;" + @ObfuscatedName("mb") + @ObfuscatedGetter( + intValue = -1986502797 ) - @Export("scriptEvents") - static NodeDeque scriptEvents; - @ObfuscatedName("ok") + @Export("staffModLevel") + static int staffModLevel; + @ObfuscatedName("om") @Export("rootWidgetHeights") static int[] rootWidgetHeights; @ObfuscatedName("nz") @ObfuscatedGetter( - intValue = 1791790939 + intValue = -1644651357 ) - static int field950; - @ObfuscatedName("nu") - @Export("isDraggingWidget") - static boolean isDraggingWidget; + static int field864; @ObfuscatedName("ta") - static int[] field947; - @ObfuscatedName("tr") - static int[] field948; - @ObfuscatedName("oy") - @ObfuscatedGetter( - intValue = 652578349 + @ObfuscatedSignature( + descriptor = "Lbv;" ) - @Export("mouseWheelRotation") - static int mouseWheelRotation; - @ObfuscatedName("mg") - @ObfuscatedGetter( - intValue = -1228693343 + static final ApproximateRouteStrategy field950; + @ObfuscatedName("oh") + @ObfuscatedSignature( + descriptor = "Lji;" ) - @Export("runEnergy") - static int runEnergy; - @ObfuscatedName("mz") + @Export("scriptEvents") + static NodeDeque scriptEvents; + @ObfuscatedName("nd") @ObfuscatedGetter( - intValue = -1173095783 + intValue = 1703929767 ) - @Export("weight") - static int weight; - @ObfuscatedName("nh") - static int[] field859; - @ObfuscatedName("nc") + static int field859; + @ObfuscatedName("nb") @ObfuscatedGetter( - intValue = -912002373 + intValue = 1650820599 ) - static int field860; - @ObfuscatedName("qx") + static int field947; + @ObfuscatedName("ni") @ObfuscatedGetter( - intValue = 858415781 + intValue = 918307921 + ) + static int field795; + @ObfuscatedName("oq") + @ObfuscatedGetter( + intValue = -1571954779 + ) + static int field775; + @ObfuscatedName("qu") + @ObfuscatedGetter( + intValue = -1071833827 ) @Export("currentTrackGroupId") static int currentTrackGroupId; - @ObfuscatedName("qw") + @ObfuscatedName("nw") + static int[] field863; + @ObfuscatedName("te") + static int[] field830; + @ObfuscatedName("tv") + static int[] field952; + @ObfuscatedName("nv") + @Export("isDraggingWidget") + static boolean isDraggingWidget; + @ObfuscatedName("mj") @ObfuscatedGetter( - intValue = -1223703005 + intValue = 965072955 ) - @Export("musicVolume") - static int musicVolume; - @ObfuscatedName("qg") + @Export("runEnergy") + static int runEnergy; + @ObfuscatedName("qr") @ObfuscatedGetter( - intValue = 1354700181 - ) - @Export("areaSoundEffectVolume") - static int areaSoundEffectVolume; - @ObfuscatedName("oq") - @ObfuscatedGetter( - intValue = -600377077 - ) - static int field870; - @ObfuscatedName("ni") - @ObfuscatedSignature( - descriptor = "Lhd;" - ) - @Export("draggedOnWidget") - static Widget draggedOnWidget; - @ObfuscatedName("ph") - static long[] field892; - @ObfuscatedName("sr") - @ObfuscatedGetter( - intValue = -662177847 - ) - static int field868; - @ObfuscatedName("sl") - @Export("archiveLoaders") - static ArrayList archiveLoaders; - @ObfuscatedName("sk") - @ObfuscatedSignature( - descriptor = "Lhv;" - ) - @Export("playerAppearance") - static PlayerAppearance playerAppearance; - @ObfuscatedName("sc") - @ObfuscatedGetter( - intValue = -1024127287 - ) - @Export("archiveLoadersDone") - static int archiveLoadersDone; - @ObfuscatedName("sv") - @ObfuscatedGetter( - intValue = 898610375 - ) - static int field938; - @ObfuscatedName("nr") - @Export("changedSkills") - static int[] changedSkills; - @ObfuscatedName("nx") - @ObfuscatedGetter( - intValue = -842750463 - ) - @Export("changedSkillsCount") - static int changedSkillsCount; - @ObfuscatedName("pz") - @ObfuscatedGetter( - intValue = -1471739451 - ) - static int field730; - @ObfuscatedName("ou") - @ObfuscatedGetter( - intValue = -1073959107 - ) - static int field943; - @ObfuscatedName("qu") - @ObfuscatedGetter( - intValue = -683211221 - ) - @Export("minimapState") - static int minimapState; - @ObfuscatedName("qb") - @ObfuscatedGetter( - intValue = -624260701 + intValue = -259926039 ) @Export("destinationX") static int destinationX; - @ObfuscatedName("sd") - @ObfuscatedSignature( - descriptor = "[Ld;" + @ObfuscatedName("mk") + @ObfuscatedGetter( + intValue = 706119953 ) - @Export("grandExchangeOffers") - static GrandExchangeOffer[] grandExchangeOffers; + @Export("weight") + static int weight; @ObfuscatedName("qe") @ObfuscatedGetter( - intValue = -57175271 + intValue = 347041669 ) @Export("destinationY") static int destinationY; - @ObfuscatedName("qp") + @ObfuscatedName("ow") @ObfuscatedGetter( - intValue = 1814530167 + intValue = 1612540519 ) - @Export("soundEffectVolume") - static int soundEffectVolume; - @ObfuscatedName("ov") + @Export("mouseWheelRotation") + static int mouseWheelRotation; + @ObfuscatedName("ro") + @Export("isCameraLocked") + static boolean isCameraLocked; + @ObfuscatedName("ss") @ObfuscatedGetter( - intValue = 1920180329 + intValue = 940085397 ) - static int field818; - @ObfuscatedName("nj") - @Export("changedItemContainers") - static int[] changedItemContainers; - @ObfuscatedName("sf") + static int field937; + @ObfuscatedName("sq") @ObfuscatedSignature( - descriptor = "Lmk;" + descriptor = "Lha;" ) - @Export("platformInfoProvider") - static PlatformInfoProvider platformInfoProvider; - @ObfuscatedName("nd") + @Export("playerAppearance") + static PlayerAppearance playerAppearance; + @ObfuscatedName("qf") @ObfuscatedGetter( - intValue = -392982617 + intValue = -812618355 ) - static int field878; - @ObfuscatedName("mq") + @Export("areaSoundEffectVolume") + static int areaSoundEffectVolume; + @ObfuscatedName("rz") + static boolean[] field922; + @ObfuscatedName("si") + @ObfuscatedGetter( + intValue = 1407217563 + ) + static int field942; + @ObfuscatedName("nh") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhq;" ) - @Export("meslayerContinueWidget") - static Widget meslayerContinueWidget; - @ObfuscatedName("qk") + @Export("draggedOnWidget") + static Widget draggedOnWidget; + @ObfuscatedName("qn") @ObfuscatedGetter( - intValue = -1126917969 + intValue = -751525007 ) @Export("soundEffectCount") static int soundEffectCount; - @ObfuscatedName("qf") + @ObfuscatedName("qo") @Export("soundEffectIds") static int[] soundEffectIds; - @ObfuscatedName("ru") - static int[] field919; - @ObfuscatedName("mf") - @ObfuscatedGetter( - intValue = 1696970787 + @ObfuscatedName("mq") + @ObfuscatedSignature( + descriptor = "Lhq;" ) - @Export("chatEffects") - static int chatEffects; - @ObfuscatedName("ql") + @Export("meslayerContinueWidget") + static Widget meslayerContinueWidget; + @ObfuscatedName("qi") @Export("queuedSoundEffectLoops") static int[] queuedSoundEffectLoops; - @ObfuscatedName("rb") - static int[] field775; - @ObfuscatedName("mt") + @ObfuscatedName("qa") @ObfuscatedGetter( - intValue = -1292017341 + intValue = 1720412197 ) - static int field838; - @ObfuscatedName("ry") - static int[] field778; - @ObfuscatedName("qz") + @Export("musicVolume") + static int musicVolume; + @ObfuscatedName("qp") @Export("queuedSoundEffectDelays") static int[] queuedSoundEffectDelays; - @ObfuscatedName("rv") - static short field727; - @ObfuscatedName("pd") - @ObfuscatedGetter( - intValue = 1435648883 - ) - static int field937; - @ObfuscatedName("rf") - static int[] field922; - @ObfuscatedName("rw") - static short field924; - @ObfuscatedName("pu") - @ObfuscatedGetter( - longValue = 5234729741765487197L - ) - static long field897; - @ObfuscatedName("rt") - static short field685; - @ObfuscatedName("qm") + @ObfuscatedName("sn") + @Export("archiveLoaders") + static ArrayList archiveLoaders; + @ObfuscatedName("qx") @ObfuscatedSignature( - descriptor = "[Ldr;" + descriptor = "[Ldj;" ) @Export("soundEffects") static SoundEffect[] soundEffects; - @ObfuscatedName("rj") - static short field861; - @ObfuscatedName("qv") + @ObfuscatedName("se") + @ObfuscatedGetter( + intValue = 1815598231 + ) + @Export("archiveLoadersDone") + static int archiveLoadersDone; + @ObfuscatedName("qt") @Export("soundLocations") static int[] soundLocations; - @ObfuscatedName("rx") - static short field928; - @ObfuscatedName("sj") + @ObfuscatedName("qd") @ObfuscatedGetter( - intValue = 1878607171 + intValue = -549724569 ) - @Export("viewportZoom") - static int viewportZoom; - @ObfuscatedName("rh") - static short field927; - @ObfuscatedName("so") + @Export("minimapState") + static int minimapState; + @ObfuscatedName("qv") @ObfuscatedGetter( - intValue = -1349755447 + intValue = 512054773 ) - @Export("viewportWidth") - static int viewportWidth; - @ObfuscatedName("ss") + @Export("soundEffectVolume") + static int soundEffectVolume; + @ObfuscatedName("pd") @ObfuscatedGetter( - intValue = -1045549837 + intValue = -1205130553 ) - @Export("viewportHeight") - static int viewportHeight; - @ObfuscatedName("pt") + static int field902; + @ObfuscatedName("pb") @ObfuscatedGetter( - intValue = 262227823 + longValue = -1783844530730786273L ) - @Export("mapIconCount") - static int mapIconCount; - @ObfuscatedName("pj") - @Export("mapIconXs") - static int[] mapIconXs; - @ObfuscatedName("mp") + static long field901; + @ObfuscatedName("mt") @ObfuscatedGetter( - intValue = -700106021 + intValue = 131534275 + ) + @Export("chatEffects") + static int chatEffects; + @ObfuscatedName("st") + @ObfuscatedSignature( + descriptor = "Lmo;" + ) + @Export("platformInfoProvider") + static PlatformInfoProvider platformInfoProvider; + @ObfuscatedName("mv") + @ObfuscatedGetter( + intValue = -127705051 + ) + static int field707; + @ObfuscatedName("mn") + @ObfuscatedGetter( + intValue = 1491507455 ) @Export("followerIndex") static int followerIndex; - @ObfuscatedName("pi") - @Export("mapIconYs") - static int[] mapIconYs; - @ObfuscatedName("ro") + @ObfuscatedName("pn") @ObfuscatedGetter( - intValue = 1721264053 + intValue = -1223881297 ) - @Export("viewportOffsetX") - static int viewportOffsetX; - @ObfuscatedName("pw") + @Export("mapIconCount") + static int mapIconCount; + @ObfuscatedName("rw") + static short field769; + @ObfuscatedName("ru") + static short field928; + @ObfuscatedName("np") + @Export("changedItemContainers") + static int[] changedItemContainers; + @ObfuscatedName("rm") + static short field938; + @ObfuscatedName("nt") + @ObfuscatedGetter( + intValue = 2062422777 + ) + static int field903; + @ObfuscatedName("pl") + @Export("mapIconXs") + static int[] mapIconXs; + @ObfuscatedName("ry") + static short field934; + @ObfuscatedName("rx") + static short field932; + @ObfuscatedName("sj") + @ObfuscatedGetter( + intValue = 1522828843 + ) + @Export("viewportZoom") + static int viewportZoom; + @ObfuscatedName("rq") + static short field931; + @ObfuscatedName("so") + @ObfuscatedGetter( + intValue = 112709455 + ) + @Export("viewportWidth") + static int viewportWidth; + @ObfuscatedName("pf") @ObfuscatedSignature( - descriptor = "[Llz;" + descriptor = "[Llp;" ) @Export("mapIcons") static Sprite[] mapIcons; - @ObfuscatedName("sp") + @ObfuscatedName("pk") + @Export("mapIconYs") + static int[] mapIconYs; + @ObfuscatedName("od") @ObfuscatedGetter( - intValue = -2094601857 + intValue = -618238831 + ) + static int field871; + @ObfuscatedName("py") + @ObfuscatedGetter( + intValue = -372222431 + ) + static int field898; + @ObfuscatedName("sv") + @ObfuscatedGetter( + intValue = -1397478813 + ) + @Export("viewportHeight") + static int viewportHeight; + @ObfuscatedName("rg") + @ObfuscatedGetter( + intValue = 1838939771 + ) + @Export("viewportOffsetX") + static int viewportOffsetX; + @ObfuscatedName("oj") + @ObfuscatedGetter( + intValue = -1096742287 + ) + static int field873; + @ObfuscatedName("sh") + @ObfuscatedGetter( + intValue = -1729596091 ) @Export("viewportOffsetY") static int viewportOffsetY; - @ObfuscatedName("rl") - @Export("zoomHeight") - static short zoomHeight; - @ObfuscatedName("rm") - @Export("zoomWidth") - static short zoomWidth; - @ObfuscatedName("sn") + @ObfuscatedName("ps") @ObfuscatedGetter( - intValue = 1224473793 - ) - static int field945; - @ObfuscatedName("oh") - @ObfuscatedGetter( - intValue = 1755181415 - ) - @Export("chatCycle") - static int chatCycle; - @ObfuscatedName("pr") - @ObfuscatedGetter( - intValue = 1773187299 - ) - static int field894; - @ObfuscatedName("pq") - static int[] field896; - @ObfuscatedName("pf") - static int[] field920; - @ObfuscatedName("pa") - @ObfuscatedGetter( - intValue = 793298193 - ) - @Export("publicChatMode") - static int publicChatMode; - @ObfuscatedName("pm") - @ObfuscatedGetter( - intValue = -394353337 + intValue = -1158906153 ) @Export("tradeChatMode") static int tradeChatMode; - @ObfuscatedName("mx") - @Export("playerMod") - static boolean playerMod; - @ObfuscatedName("oj") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - static NodeDeque field891; - @ObfuscatedName("ot") - @ObfuscatedSignature( - descriptor = "Ljp;" - ) - static NodeDeque field691; - @ObfuscatedName("or") + @ObfuscatedName("pc") @ObfuscatedGetter( - intValue = -1554074511 + intValue = -1755840079 ) - static int field869; + @Export("publicChatMode") + static int publicChatMode; + @ObfuscatedName("rd") + @Export("zoomHeight") + static short zoomHeight; + @ObfuscatedName("rv") + @Export("zoomWidth") + static short zoomWidth; + @ObfuscatedName("su") + @ObfuscatedGetter( + intValue = 197263845 + ) + static int field949; + @ObfuscatedName("pa") + static int[] field900; + @ObfuscatedName("po") + static int[] field899; + @ObfuscatedName("oc") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + static NodeDeque field877; + @ObfuscatedName("sc") + @ObfuscatedSignature( + descriptor = "[Lv;" + ) + @Export("grandExchangeOffers") + static GrandExchangeOffer[] grandExchangeOffers; + @ObfuscatedName("ok") + @ObfuscatedSignature( + descriptor = "Lji;" + ) + static NodeDeque field912; + @ObfuscatedName("oi") + @ObfuscatedGetter( + intValue = -1452534743 + ) + static int field872; + @ObfuscatedName("rr") + static int[] field740; + @ObfuscatedName("rh") + static int[] field678; + @ObfuscatedName("rl") + static int[] field926; + @ObfuscatedName("rk") + static int[] field925; @ObfuscatedName("mw") @ObfuscatedGetter( - intValue = -947743503 + intValue = 250230651 ) - static int field835; - @ObfuscatedName("mm") + static int field865; + @ObfuscatedName("ms") @ObfuscatedGetter( - intValue = 378113837 + intValue = 2027886515 ) - static int field671; - @ObfuscatedName("pn") - static int[] field888; - @ObfuscatedName("pg") - static String field755; - @ObfuscatedName("sx") + static int field840; + @ObfuscatedName("mm") + @Export("playerMod") + static boolean playerMod; + @ObfuscatedName("pj") + static long[] field896; + @ObfuscatedName("nq") + @Export("changedSkills") + static int[] changedSkills; + @ObfuscatedName("nu") + @ObfuscatedGetter( + intValue = -1157540783 + ) + @Export("changedSkillsCount") + static int changedSkillsCount; + @ObfuscatedName("pt") + @ObfuscatedGetter( + intValue = -541473949 + ) + static int field794; + @ObfuscatedName("pr") + static int[] field892; + @ObfuscatedName("pm") + static String field913; + @ObfuscatedName("sd") @ObfuscatedSignature( - descriptor = "Lbj;" + descriptor = "Lbt;" ) @Export("GrandExchangeEvents_worldComparator") static GrandExchangeOfferOwnWorldComparator GrandExchangeEvents_worldComparator; + @ObfuscatedName("oe") + @ObfuscatedGetter( + intValue = -1163412349 + ) + @Export("chatCycle") + static int chatCycle; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lfz;" + descriptor = "[Lft;" ) @Export("collisionMaps") static CollisionMap[] collisionMaps; - @ObfuscatedName("aj") - static boolean field669; - @ObfuscatedName("bk") + @ObfuscatedName("ac") + static boolean field841; + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 2001872587 + intValue = 908915111 ) @Export("worldId") public static int worldId; - @ObfuscatedName("bh") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = 807704553 + intValue = -2146116225 ) @Export("worldProperties") static int worldProperties; - @ObfuscatedName("be") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -341861453 + intValue = -77282259 ) @Export("gameBuild") static int gameBuild; - @ObfuscatedName("bd") + @ObfuscatedName("bg") @Export("isMembersWorld") public static boolean isMembersWorld; - @ObfuscatedName("bb") + @ObfuscatedName("br") @Export("isLowDetail") static boolean isLowDetail; - @ObfuscatedName("bn") - static String field871; - @ObfuscatedName("bo") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -419209615 + intValue = -1456761211 ) @Export("clientType") static int clientType; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @Export("onMobile") static boolean onMobile; @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -176982947 + intValue = 1382758875 ) @Export("gameState") static int gameState; - @ObfuscatedName("ck") + @ObfuscatedName("cu") @Export("isLoading") static boolean isLoading; - @ObfuscatedName("cv") + @ObfuscatedName("cw") @ObfuscatedGetter( - intValue = 1130810935 + intValue = -925075011 ) @Export("cycle") static int cycle; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @ObfuscatedGetter( - longValue = -4780591351762996103L + longValue = -6291898819943529903L ) @Export("mouseLastLastPressedTimeMillis") static long mouseLastLastPressedTimeMillis; - @ObfuscatedName("cu") - @ObfuscatedGetter( - intValue = 1372131715 - ) - static int field683; - @ObfuscatedName("cq") - @ObfuscatedGetter( - intValue = 330959641 - ) - static int field684; - @ObfuscatedName("co") - @ObfuscatedGetter( - longValue = 6700383244029833147L - ) - static long field738; - @ObfuscatedName("ca") - @Export("hadFocus") - static boolean hadFocus; - @ObfuscatedName("cm") - @Export("displayFps") - static boolean displayFps; @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -883512619 + intValue = -359806485 + ) + static int field798; + @ObfuscatedName("cj") + @ObfuscatedGetter( + intValue = -40955973 + ) + static int field686; + @ObfuscatedName("cd") + @ObfuscatedGetter( + longValue = -3347850541832475541L + ) + static long field687; + @ObfuscatedName("cx") + @Export("hadFocus") + static boolean hadFocus; + @ObfuscatedName("cp") + @Export("displayFps") + static boolean displayFps; + @ObfuscatedName("ch") + @ObfuscatedGetter( + intValue = 1440208899 ) @Export("rebootTimer") static int rebootTimer; - @ObfuscatedName("ct") + @ObfuscatedName("cs") @ObfuscatedGetter( - intValue = -1769866173 + intValue = -1549228635 ) @Export("hintArrowType") static int hintArrowType; - @ObfuscatedName("cd") + @ObfuscatedName("ck") @ObfuscatedGetter( - intValue = -1512277987 + intValue = 748257717 ) @Export("hintArrowNpcIndex") static int hintArrowNpcIndex; - @ObfuscatedName("cy") + @ObfuscatedName("co") @ObfuscatedGetter( - intValue = -1664926141 + intValue = 1282268129 ) @Export("hintArrowPlayerIndex") static int hintArrowPlayerIndex; - @ObfuscatedName("cx") + @ObfuscatedName("cz") @ObfuscatedGetter( - intValue = -1602606573 + intValue = 1561023113 ) @Export("hintArrowX") static int hintArrowX; - @ObfuscatedName("cs") + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = -738703837 + intValue = 4072295 ) @Export("hintArrowY") static int hintArrowY; - @ObfuscatedName("cr") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 378352399 + intValue = -1130712819 ) @Export("hintArrowHeight") static int hintArrowHeight; @ObfuscatedName("cl") @ObfuscatedGetter( - intValue = -867258703 + intValue = 573846843 ) @Export("hintArrowSubX") static int hintArrowSubX; @ObfuscatedName("dx") @ObfuscatedGetter( - intValue = -954844719 + intValue = -1575899159 ) @Export("hintArrowSubY") static int hintArrowSubY; - @ObfuscatedName("dm") + @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcd;" ) @Export("playerAttackOption") static AttackOption playerAttackOption; - @ObfuscatedName("dd") + @ObfuscatedName("dh") @ObfuscatedSignature( - descriptor = "Lco;" + descriptor = "Lcd;" ) @Export("npcAttackOption") static AttackOption npcAttackOption; - @ObfuscatedName("dl") + @ObfuscatedName("db") @ObfuscatedGetter( - intValue = 1526205263 + intValue = -1866562123 ) @Export("titleLoadingStage") static int titleLoadingStage; - @ObfuscatedName("dr") - @ObfuscatedSignature( - descriptor = "Lfa;" - ) - @Export("js5SocketTask") - static Task js5SocketTask; - @ObfuscatedName("dp") + @ObfuscatedName("de") @ObfuscatedGetter( - intValue = -1037086785 + intValue = -1673766287 ) @Export("js5ConnectState") static int js5ConnectState; - @ObfuscatedName("dc") + @ObfuscatedName("da") @ObfuscatedGetter( - intValue = 174147835 + intValue = -1209579601 ) - static int field815; - @ObfuscatedName("ea") + static int field712; + @ObfuscatedName("dy") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive1") + static Archive archive1; + @ObfuscatedName("ek") @ObfuscatedGetter( - intValue = -331323577 + intValue = -55276913 ) @Export("js5Errors") static int js5Errors; - @ObfuscatedName("ei") + @ObfuscatedName("ep") @ObfuscatedGetter( - intValue = -972927187 + intValue = -789394093 ) @Export("loginState") static int loginState; - @ObfuscatedName("et") + @ObfuscatedName("eg") @ObfuscatedGetter( - intValue = -1222807213 + intValue = -600822047 ) - static int field705; + static int field822; @ObfuscatedName("eq") @ObfuscatedGetter( - intValue = -1645904359 + intValue = -1163587017 ) - static int field706; - @ObfuscatedName("ex") + static int field708; + @ObfuscatedName("em") @ObfuscatedGetter( - intValue = -92180293 + intValue = 1593310077 ) - static int field675; - @ObfuscatedName("er") + static int field709; + @ObfuscatedName("eh") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lff;" ) - static class169 field708; - @ObfuscatedName("el") + static class169 field710; + @ObfuscatedName("ej") @ObfuscatedGetter( - intValue = 1015918785 + intValue = -764965423 ) - @Export("port2") - static int port2; - @ObfuscatedName("ep") + @Export("port1") + static int port1; + @ObfuscatedName("ex") @Export("Login_isUsernameRemembered") static boolean Login_isUsernameRemembered; - @ObfuscatedName("ev") + @ObfuscatedName("ed") @ObfuscatedSignature( - descriptor = "Lct;" + descriptor = "Lcs;" ) @Export("secureRandomFuture") static SecureRandomFuture secureRandomFuture; - @ObfuscatedName("fe") + @ObfuscatedName("fq") @Export("randomDatData") static byte[] randomDatData; - @ObfuscatedName("fc") + @ObfuscatedName("fs") @ObfuscatedSignature( - descriptor = "[Lcv;" + descriptor = "[Lcw;" ) @Export("npcs") static NPC[] npcs; - @ObfuscatedName("ft") + @ObfuscatedName("fv") @ObfuscatedGetter( - intValue = 2041291171 + intValue = 1098794217 ) @Export("npcCount") static int npcCount; - @ObfuscatedName("fp") + @ObfuscatedName("fz") @Export("npcIndices") static int[] npcIndices; - @ObfuscatedName("fq") - @ObfuscatedGetter( - intValue = -1459583387 - ) - static int field718; @ObfuscatedName("fk") - static int[] field719; - @ObfuscatedName("fn") + @ObfuscatedGetter( + intValue = -1040652309 + ) + static int field702; + @ObfuscatedName("fe") + static int[] field721; + @ObfuscatedName("fm") @ObfuscatedSignature( descriptor = "Ldx;" ) @Export("packetWriter") public static final PacketWriter packetWriter; - @ObfuscatedName("fg") + @ObfuscatedName("ff") @ObfuscatedGetter( - intValue = 2002648973 + intValue = 1553785571 ) @Export("logoutTimer") static int logoutTimer; - @ObfuscatedName("fu") - static boolean field722; - @ObfuscatedName("ff") + @ObfuscatedName("fr") + static boolean field713; + @ObfuscatedName("fi") @Export("useBufferedSocket") static boolean useBufferedSocket; - @ObfuscatedName("fs") + @ObfuscatedName("fy") @ObfuscatedSignature( - descriptor = "Ljy;" + descriptor = "Ljz;" ) @Export("timer") static Timer timer; - @ObfuscatedName("fl") + @ObfuscatedName("fw") @Export("fontsMap") static HashMap fontsMap; - @ObfuscatedName("gq") + @ObfuscatedName("gj") @ObfuscatedGetter( - intValue = 416832453 + intValue = -621015009 ) - static int field822; - @ObfuscatedName("gb") + static int field728; + @ObfuscatedName("gm") @ObfuscatedGetter( - intValue = -1691657031 + intValue = -1370106321 ) - static int field759; - @ObfuscatedName("gd") - @ObfuscatedGetter( - intValue = -386652489 - ) - static int field690; - @ObfuscatedName("gc") - @ObfuscatedGetter( - intValue = -498328781 - ) - static int field729; + static int field711; @ObfuscatedName("gr") @ObfuscatedGetter( - intValue = -1249993183 + intValue = -814779395 ) - static int field809; - @ObfuscatedName("gg") + static int field895; + @ObfuscatedName("gv") + @ObfuscatedGetter( + intValue = -544516033 + ) + static int field791; + @ObfuscatedName("gw") + @ObfuscatedGetter( + intValue = 1012536071 + ) + static int field732; + @ObfuscatedName("gp") @Export("isInInstance") static boolean isInInstance; - @ObfuscatedName("gh") + @ObfuscatedName("gt") @Export("instanceChunkTemplates") static int[][][] instanceChunkTemplates; - @ObfuscatedName("gz") - static final int[] field734; - @ObfuscatedName("gy") + @ObfuscatedName("gn") + static final int[] field736; + @ObfuscatedName("gu") @ObfuscatedGetter( - intValue = -103852435 - ) - static int field747; - @ObfuscatedName("hq") - @ObfuscatedGetter( - intValue = 26866095 - ) - static int field736; - @ObfuscatedName("hk") - @ObfuscatedGetter( - intValue = 683906157 + intValue = -570359939 ) static int field737; - @ObfuscatedName("hy") - @ObfuscatedGetter( - intValue = 1193836409 + @ObfuscatedName("ge") + @ObfuscatedSignature( + descriptor = "[Llp;" ) - static int field694; - @ObfuscatedName("hn") + @Export("headIconPrayerSprites") + static Sprite[] headIconPrayerSprites; + @ObfuscatedName("hh") @ObfuscatedGetter( - intValue = -678810071 + intValue = 1066075353 ) static int field739; - @ObfuscatedName("he") - static boolean field740; - @ObfuscatedName("hr") + @ObfuscatedName("hi") @ObfuscatedGetter( - intValue = -708523843 + intValue = 41176893 + ) + static int field670; + @ObfuscatedName("hk") + @ObfuscatedGetter( + intValue = -50916181 + ) + static int field741; + @ObfuscatedName("hp") + @ObfuscatedGetter( + intValue = 1119037931 + ) + static int field742; + @ObfuscatedName("ht") + static boolean field743; + @ObfuscatedName("ho") + @ObfuscatedGetter( + intValue = -977399091 ) @Export("alternativeScrollbarWidth") static int alternativeScrollbarWidth; - @ObfuscatedName("hu") + @ObfuscatedName("hs") @ObfuscatedGetter( - intValue = -1899320339 + intValue = -1443068431 ) @Export("camAngleX") static int camAngleX; - @ObfuscatedName("ho") + @ObfuscatedName("hr") @ObfuscatedGetter( - intValue = 1115448517 + intValue = -711285885 ) @Export("camAngleY") static int camAngleY; - @ObfuscatedName("hp") + @ObfuscatedName("hl") @ObfuscatedGetter( - intValue = 217664287 + intValue = 1183878553 ) @Export("camAngleDY") static int camAngleDY; - @ObfuscatedName("hf") + @ObfuscatedName("hd") @ObfuscatedGetter( - intValue = -1231248307 + intValue = -1283166721 ) @Export("camAngleDX") static int camAngleDX; - @ObfuscatedName("hb") + @ObfuscatedName("hm") @ObfuscatedGetter( - intValue = 1991000361 + intValue = -759899857 ) @Export("mouseCamClickedX") static int mouseCamClickedX; - @ObfuscatedName("hs") + @ObfuscatedName("hw") @ObfuscatedGetter( - intValue = -56491575 + intValue = -1838293597 ) @Export("mouseCamClickedY") static int mouseCamClickedY; - @ObfuscatedName("hc") + @ObfuscatedName("hy") @ObfuscatedGetter( - intValue = 952453857 + intValue = 170315783 ) @Export("oculusOrbState") static int oculusOrbState; @ObfuscatedName("ia") @ObfuscatedGetter( - intValue = 899099377 + intValue = -1104542973 ) @Export("camFollowHeight") static int camFollowHeight; @ObfuscatedName("is") @ObfuscatedGetter( - intValue = 1234153475 + intValue = 692568591 ) - static int field717; - @ObfuscatedName("ij") + static int field753; + @ObfuscatedName("ig") @ObfuscatedGetter( - intValue = 2036163559 + intValue = -1371213621 ) - static int field751; - @ObfuscatedName("ib") + static int field796; + @ObfuscatedName("io") @ObfuscatedGetter( - intValue = 1474588135 + intValue = 1555483319 ) - static int field752; - @ObfuscatedName("iq") + static int field755; + @ObfuscatedName("ip") @ObfuscatedGetter( - intValue = -968086637 + intValue = 1271248647 ) @Export("oculusOrbNormalSpeed") static int oculusOrbNormalSpeed; - @ObfuscatedName("ic") + @ObfuscatedName("iw") @ObfuscatedGetter( - intValue = 312783465 + intValue = -883817203 ) @Export("oculusOrbSlowedSpeed") static int oculusOrbSlowedSpeed; - @ObfuscatedName("ip") + @ObfuscatedName("ii") @ObfuscatedGetter( - intValue = -1503339861 + intValue = 1521960939 ) - static int field836; - @ObfuscatedName("ig") - static boolean field756; + static int field758; + @ObfuscatedName("id") + static boolean field759; @ObfuscatedName("it") @Export("selectedItemName") static String selectedItemName; - @ObfuscatedName("if") + @ObfuscatedName("iq") @ObfuscatedGetter( - intValue = -855755453 + intValue = -1208339905 ) - static int field757; - @ObfuscatedName("il") - static boolean field758; - @ObfuscatedName("iy") + static int field829; + @ObfuscatedName("ik") + static boolean field761; + @ObfuscatedName("iv") @ObfuscatedGetter( - intValue = 457429091 + intValue = 1611520535 ) - static int field881; - @ObfuscatedName("ih") + static int field762; + @ObfuscatedName("ib") @ObfuscatedGetter( - intValue = 1649830223 + intValue = 997551691 ) @Export("overheadTextCount") static int overheadTextCount; - @ObfuscatedName("iu") + @ObfuscatedName("ih") @ObfuscatedGetter( - intValue = -1008916691 + intValue = -1325247089 ) @Export("overheadTextLimit") static int overheadTextLimit; - @ObfuscatedName("ie") + @ObfuscatedName("iu") @Export("overheadTextXs") static int[] overheadTextXs; - @ObfuscatedName("iw") + @ObfuscatedName("ie") @Export("overheadTextYs") static int[] overheadTextYs; @ObfuscatedName("ir") @Export("overheadTextAscents") static int[] overheadTextAscents; - @ObfuscatedName("ik") + @ObfuscatedName("in") @Export("overheadTextXOffsets") static int[] overheadTextXOffsets; - @ObfuscatedName("iv") + @ObfuscatedName("iy") @Export("overheadTextColors") static int[] overheadTextColors; - @ObfuscatedName("ii") + @ObfuscatedName("il") @Export("overheadTextEffects") static int[] overheadTextEffects; - @ObfuscatedName("je") + @ObfuscatedName("jj") @Export("overheadTextCyclesRemaining") static int[] overheadTextCyclesRemaining; - @ObfuscatedName("jr") + @ObfuscatedName("jp") @Export("overheadText") static String[] overheadText; - @ObfuscatedName("js") + @ObfuscatedName("jd") @Export("tileLastDrawnActor") static int[][] tileLastDrawnActor; @ObfuscatedName("jg") @ObfuscatedGetter( - intValue = 113367579 + intValue = -383835205 ) @Export("viewportDrawCount") static int viewportDrawCount; - @ObfuscatedName("jo") + @ObfuscatedName("jq") @ObfuscatedGetter( - intValue = -1896450279 + intValue = -22531197 ) @Export("viewportTempX") static int viewportTempX; - @ObfuscatedName("jc") + @ObfuscatedName("ju") @ObfuscatedGetter( - intValue = 1282867815 + intValue = -1575851953 ) @Export("viewportTempY") static int viewportTempY; - @ObfuscatedName("jz") + @ObfuscatedName("jx") @ObfuscatedGetter( - intValue = 601900271 + intValue = -693132223 ) @Export("mouseCrossX") static int mouseCrossX; @ObfuscatedName("jt") @ObfuscatedGetter( - intValue = 1179562767 + intValue = 1819425115 ) @Export("mouseCrossY") static int mouseCrossY; @ObfuscatedName("jm") @ObfuscatedGetter( - intValue = 125020733 + intValue = -1679326135 ) @Export("mouseCrossState") static int mouseCrossState; - @ObfuscatedName("jd") + @ObfuscatedName("jl") @ObfuscatedGetter( - intValue = -1956058299 + intValue = -1707383795 ) @Export("mouseCrossColor") static int mouseCrossColor; - @ObfuscatedName("jx") + @ObfuscatedName("jv") @Export("showMouseCross") static boolean showMouseCross; - @ObfuscatedName("jn") + @ObfuscatedName("jb") @ObfuscatedGetter( - intValue = 1621281143 + intValue = 505509921 ) - static int field808; - @ObfuscatedName("jl") + static int field782; + @ObfuscatedName("je") @ObfuscatedGetter( - intValue = -886925517 + intValue = 11951309 ) - static int field668; - @ObfuscatedName("ja") + static int field944; + @ObfuscatedName("jw") @ObfuscatedGetter( - intValue = -668604129 + intValue = 526374909 ) @Export("dragItemSlotSource") static int dragItemSlotSource; - @ObfuscatedName("jv") + @ObfuscatedName("jr") @ObfuscatedGetter( - intValue = -793315667 + intValue = -1126513777 ) @Export("draggedWidgetX") static int draggedWidgetX; - @ObfuscatedName("jj") + @ObfuscatedName("ja") @ObfuscatedGetter( - intValue = 1962512569 + intValue = -1580012453 ) @Export("draggedWidgetY") static int draggedWidgetY; - @ObfuscatedName("jh") + @ObfuscatedName("jk") @ObfuscatedGetter( - intValue = -952269611 + intValue = -1831513887 ) @Export("dragItemSlotDestination") static int dragItemSlotDestination; - @ObfuscatedName("jb") - static boolean field785; @ObfuscatedName("jy") + static boolean field788; + @ObfuscatedName("jz") @ObfuscatedGetter( - intValue = 1160990691 + intValue = -1995966425 ) @Export("itemDragDuration") static int itemDragDuration; - @ObfuscatedName("ji") + @ObfuscatedName("jf") @ObfuscatedGetter( - intValue = -713831637 + intValue = -331224419 ) - static int field787; - @ObfuscatedName("jk") + static int field790; + @ObfuscatedName("jn") @Export("showLoadingMessages") static boolean showLoadingMessages; - @ObfuscatedName("ku") + @ObfuscatedName("ka") @ObfuscatedSignature( - descriptor = "[Lby;" + descriptor = "[Lbf;" ) @Export("players") static Player[] players; - @ObfuscatedName("kx") + @ObfuscatedName("ko") @ObfuscatedGetter( - intValue = -2104761709 + intValue = -1852431749 ) @Export("localPlayerIndex") static int localPlayerIndex; @ObfuscatedName("kp") @ObfuscatedGetter( - intValue = 1712399345 + intValue = 648141605 ) - static int field791; - @ObfuscatedName("ki") + static int field888; + @ObfuscatedName("kw") @Export("renderSelf") static boolean renderSelf; - @ObfuscatedName("ks") + @ObfuscatedName("kh") @ObfuscatedGetter( - intValue = 1574229217 + intValue = -1302257309 ) @Export("drawPlayerNames") static int drawPlayerNames; - @ObfuscatedName("km") - @ObfuscatedGetter( - intValue = 1638972327 - ) - static int field687; @ObfuscatedName("kt") - static int[] field907; - @ObfuscatedName("kj") + @ObfuscatedGetter( + intValue = 157805175 + ) + static int field771; + @ObfuscatedName("ks") + static int[] field930; + @ObfuscatedName("kd") @Export("playerMenuOpcodes") static final int[] playerMenuOpcodes; - @ObfuscatedName("ke") + @ObfuscatedName("kz") @Export("playerMenuActions") static String[] playerMenuActions; - @ObfuscatedName("kv") + @ObfuscatedName("kl") @Export("playerOptionsPriorities") static boolean[] playerOptionsPriorities; - @ObfuscatedName("kw") + @ObfuscatedName("kv") @Export("defaultRotations") static int[] defaultRotations; - @ObfuscatedName("ko") + @ObfuscatedName("kr") @ObfuscatedGetter( - intValue = -1537500949 + intValue = 1152347413 ) @Export("combatTargetPlayerIndex") static int combatTargetPlayerIndex; - @ObfuscatedName("ka") + @ObfuscatedName("kj") @ObfuscatedSignature( - descriptor = "[[[Ljp;" + descriptor = "[[[Lji;" ) @Export("groundItems") static NodeDeque[][][] groundItems; - @ObfuscatedName("kg") + @ObfuscatedName("ki") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("pendingSpawns") static NodeDeque pendingSpawns; - @ObfuscatedName("ky") + @ObfuscatedName("kq") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("projectiles") static NodeDeque projectiles; - @ObfuscatedName("kb") + @ObfuscatedName("ky") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("graphicsObjects") static NodeDeque graphicsObjects; - @ObfuscatedName("kn") + @ObfuscatedName("kf") @Export("currentLevels") static int[] currentLevels; - @ObfuscatedName("kz") + @ObfuscatedName("kn") @Export("levels") static int[] levels; - @ObfuscatedName("kh") + @ObfuscatedName("kg") @Export("experience") static int[] experience; - @ObfuscatedName("lk") + @ObfuscatedName("li") @ObfuscatedGetter( - intValue = 1733687711 + intValue = -475626583 ) @Export("leftClickOpensMenu") static int leftClickOpensMenu; - @ObfuscatedName("ly") + @ObfuscatedName("ll") @Export("isMenuOpen") static boolean isMenuOpen; - @ObfuscatedName("ls") + @ObfuscatedName("lk") @ObfuscatedGetter( - intValue = 1259358681 + intValue = 366838629 + ) + @Export("menuY") + static int menuY; + @ObfuscatedName("ld") + @ObfuscatedGetter( + intValue = 1781251597 ) @Export("menuOptionsCount") static int menuOptionsCount; - @ObfuscatedName("lm") + @ObfuscatedName("la") @Export("menuArguments1") static int[] menuArguments1; - @ObfuscatedName("lq") + @ObfuscatedName("lb") @Export("menuArguments2") static int[] menuArguments2; - @ObfuscatedName("lx") + @ObfuscatedName("ly") @Export("menuOpcodes") static int[] menuOpcodes; - @ObfuscatedName("la") + @ObfuscatedName("lt") @Export("menuIdentifiers") static int[] menuIdentifiers; - @ObfuscatedName("lt") + @ObfuscatedName("lg") @Export("menuActions") static String[] menuActions; - @ObfuscatedName("lf") + @ObfuscatedName("lq") @Export("menuTargets") static String[] menuTargets; - @ObfuscatedName("ln") + @ObfuscatedName("lo") @Export("menuShiftClick") static boolean[] menuShiftClick; - @ObfuscatedName("le") + @ObfuscatedName("lc") @Export("followerOpsLowPriority") static boolean followerOpsLowPriority; - @ObfuscatedName("lr") + @ObfuscatedName("lu") @Export("shiftClickDrop") static boolean shiftClickDrop; - @ObfuscatedName("ld") + @ObfuscatedName("lv") @Export("tapToDrop") static boolean tapToDrop; - @ObfuscatedName("lo") + @ObfuscatedName("lw") @Export("showMouseOverText") static boolean showMouseOverText; - @ObfuscatedName("lw") + @ObfuscatedName("lm") @ObfuscatedGetter( - intValue = -1495458891 + intValue = 2121046681 ) @Export("viewportX") static int viewportX; - @ObfuscatedName("lh") + @ObfuscatedName("ls") @ObfuscatedGetter( - intValue = -1150774747 + intValue = -116000717 ) @Export("viewportY") static int viewportY; - @ObfuscatedName("lb") + @ObfuscatedName("lh") @ObfuscatedGetter( - intValue = 1221803191 + intValue = 1628287905 ) - static int field824; - @ObfuscatedName("ms") + static int field828; + @ObfuscatedName("mf") @ObfuscatedGetter( - intValue = -173401255 + intValue = -1310390487 ) - static int field825; - @ObfuscatedName("mk") + static int field770; + @ObfuscatedName("mo") @ObfuscatedGetter( - intValue = 698992553 + intValue = -1061875105 ) @Export("isItemSelected") static int isItemSelected; - @ObfuscatedName("ml") + @ObfuscatedName("md") @Export("isSpellSelected") static boolean isSpellSelected; - @ObfuscatedName("mu") + @ObfuscatedName("ma") @ObfuscatedGetter( - intValue = 1315575895 + intValue = -1613408879 ) @Export("selectedSpellChildIndex") static int selectedSpellChildIndex; - @ObfuscatedName("mh") + @ObfuscatedName("mc") @ObfuscatedGetter( - intValue = 1111856905 + intValue = -1738766663 ) - static int field830; - @ObfuscatedName("mi") + static int field834; + @ObfuscatedName("mp") @Export("selectedSpellActionName") static String selectedSpellActionName; - @ObfuscatedName("mo") + @ObfuscatedName("mu") @Export("selectedSpellName") static String selectedSpellName; - @ObfuscatedName("mj") + @ObfuscatedName("mi") @ObfuscatedGetter( - intValue = -1547224129 + intValue = -1035655229 ) @Export("rootInterface") static int rootInterface; - @ObfuscatedName("md") + @ObfuscatedName("mg") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("interfaceParents") static NodeHashTable interfaceParents; - @ObfuscatedName("ec") + @ObfuscatedName("el") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkf;" ) - Buffer field929; - @ObfuscatedName("ee") + Buffer field754; + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "Lz;" + descriptor = "Lm;" ) - class9 field851; + class9 field714; static { - field669 = true; - worldId = 1; - worldProperties = 0; - gameBuild = 0; - isMembersWorld = false; - isLowDetail = false; - clientType = -1; - onMobile = false; - gameState = 0; - isLoading = true; - cycle = 0; - mouseLastLastPressedTimeMillis = -1L; - field683 = -1; - field684 = -1; - field738 = -1L; - hadFocus = true; - displayFps = false; - rebootTimer = 0; - hintArrowType = 0; - hintArrowNpcIndex = 0; - hintArrowPlayerIndex = 0; - hintArrowX = 0; - hintArrowY = 0; - hintArrowHeight = 0; - hintArrowSubX = 0; - hintArrowSubY = 0; - playerAttackOption = AttackOption.AttackOption_hidden; - npcAttackOption = AttackOption.AttackOption_hidden; - titleLoadingStage = 0; - js5ConnectState = 0; - field815 = 0; - js5Errors = 0; - loginState = 0; - field705 = 0; - field706 = 0; - field675 = 0; - field708 = class169.field2024; - Login_isUsernameRemembered = false; - secureRandomFuture = new SecureRandomFuture(); - randomDatData = null; - npcs = new NPC[32768]; - npcCount = 0; - npcIndices = new int[32768]; - field718 = 0; - field719 = new int[250]; - packetWriter = new PacketWriter(); - logoutTimer = 0; - field722 = false; - useBufferedSocket = true; - timer = new Timer(); - fontsMap = new HashMap(); - field822 = 0; - field759 = 1; - field690 = 0; - field729 = 1; - field809 = 0; - collisionMaps = new CollisionMap[4]; - isInInstance = false; - instanceChunkTemplates = new int[4][13][13]; - field734 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; - field747 = 0; - field736 = 2301979; - field737 = 5063219; - field694 = 3353893; - field739 = 7759444; - field740 = false; - alternativeScrollbarWidth = 0; - camAngleX = 128; - camAngleY = 0; - camAngleDY = 0; - camAngleDX = 0; - mouseCamClickedX = 0; - mouseCamClickedY = 0; - oculusOrbState = 0; - camFollowHeight = 50; - field717 = 0; - field751 = 0; - field752 = 0; - oculusOrbNormalSpeed = 12; - oculusOrbSlowedSpeed = 6; - field836 = 0; - field756 = false; - field757 = 0; - field758 = false; - field881 = 0; - overheadTextCount = 0; - overheadTextLimit = 50; - overheadTextXs = new int[overheadTextLimit]; - overheadTextYs = new int[overheadTextLimit]; - overheadTextAscents = new int[overheadTextLimit]; - overheadTextXOffsets = new int[overheadTextLimit]; - overheadTextColors = new int[overheadTextLimit]; - overheadTextEffects = new int[overheadTextLimit]; - overheadTextCyclesRemaining = new int[overheadTextLimit]; - overheadText = new String[overheadTextLimit]; - tileLastDrawnActor = new int[104][104]; - viewportDrawCount = 0; - viewportTempX = -1; - viewportTempY = -1; - mouseCrossX = 0; - mouseCrossY = 0; - mouseCrossState = 0; - mouseCrossColor = 0; - showMouseCross = true; - field808 = 0; - field668 = 0; - dragItemSlotSource = 0; - draggedWidgetX = 0; - draggedWidgetY = 0; - dragItemSlotDestination = 0; - field785 = false; - itemDragDuration = 0; - field787 = 0; - showLoadingMessages = true; - players = new Player[2048]; - localPlayerIndex = -1; - field791 = 0; - renderSelf = true; - drawPlayerNames = 0; - field687 = 0; - field907 = new int[1000]; - playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; - playerMenuActions = new String[8]; - playerOptionsPriorities = new boolean[8]; - defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; - combatTargetPlayerIndex = -1; - groundItems = new NodeDeque[4][104][104]; - pendingSpawns = new NodeDeque(); - projectiles = new NodeDeque(); - graphicsObjects = new NodeDeque(); - currentLevels = new int[25]; - levels = new int[25]; - experience = new int[25]; - leftClickOpensMenu = 0; - isMenuOpen = false; - menuOptionsCount = 0; - menuArguments1 = new int[500]; - menuArguments2 = new int[500]; - menuOpcodes = new int[500]; - menuIdentifiers = new int[500]; - menuActions = new String[500]; - menuTargets = new String[500]; - menuShiftClick = new boolean[500]; - followerOpsLowPriority = false; - shiftClickDrop = false; - tapToDrop = false; - showMouseOverText = true; - viewportX = -1; - viewportY = -1; - field824 = 0; - field825 = 50; - isItemSelected = 0; - selectedItemName = null; - isSpellSelected = false; - selectedSpellChildIndex = -1; - field830 = -1; - selectedSpellActionName = null; - selectedSpellName = null; - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - field835 = 0; - field671 = -1; - chatEffects = 0; - field838 = 0; - meslayerContinueWidget = null; - runEnergy = 0; - weight = 0; - staffModLevel = 0; - followerIndex = -1; - playerMod = false; - viewportWidget = null; - clickedWidget = null; - clickedWidgetParent = null; - widgetClickX = 0; - widgetClickY = 0; - draggedOnWidget = null; - field692 = false; - field852 = -1; - field853 = -1; - field854 = false; - field855 = -1; - field856 = -1; - isDraggingWidget = false; - cycleCntr = 1; - field859 = new int[32]; - field860 = 0; - changedItemContainers = new int[32]; - field878 = 0; - changedSkills = new int[32]; - changedSkillsCount = 0; - chatCycle = 0; - field866 = 0; - field943 = 0; - field818 = 0; - field869 = 0; - field870 = 0; - mouseWheelRotation = 0; - scriptEvents = new NodeDeque(); - field891 = new NodeDeque(); - field691 = new NodeDeque(); - widgetFlags = new NodeHashTable(512); - rootWidgetCount = 0; - field877 = -2; - field813 = new boolean[100]; - field879 = new boolean[100]; - field880 = new boolean[100]; - rootWidgetXs = new int[100]; - rootWidgetYs = new int[100]; - rootWidgetWidths = new int[100]; - rootWidgetHeights = new int[100]; - gameDrawingMode = 0; - field886 = 0L; - isResizable = true; - field888 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; - publicChatMode = 0; - tradeChatMode = 0; - field755 = ""; - field892 = new long[100]; - field730 = 0; - field894 = 0; - field920 = new int[128]; - field896 = new int[128]; - field897 = -1L; - field937 = -1; - mapIconCount = 0; - mapIconXs = new int[1000]; - mapIconYs = new int[1000]; - mapIcons = new Sprite[1000]; - destinationX = 0; - destinationY = 0; - minimapState = 0; - musicVolume = 255; - currentTrackGroupId = -1; - field743 = false; - soundEffectVolume = 127; - areaSoundEffectVolume = 127; - soundEffectCount = 0; - soundEffectIds = new int[50]; - queuedSoundEffectLoops = new int[50]; - queuedSoundEffectDelays = new int[50]; - soundLocations = new int[50]; - soundEffects = new SoundEffect[50]; - isCameraLocked = false; - field918 = new boolean[5]; - field919 = new int[5]; - field775 = new int[5]; - field778 = new int[5]; - field922 = new int[5]; - field727 = 256; - field924 = 205; - zoomHeight = 256; - zoomWidth = 320; - field927 = 1; - field928 = 32767; - field685 = 1; - field861 = 32767; - viewportOffsetX = 0; - viewportOffsetY = 0; - viewportWidth = 0; - viewportHeight = 0; - viewportZoom = 0; - playerAppearance = new PlayerAppearance(); - field868 = -1; - field938 = -1; - platformInfoProvider = new DesktopPlatformInfoProvider(); - grandExchangeOffers = new GrandExchangeOffer[8]; - GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); - field942 = -1; - archiveLoaders = new ArrayList(10); - archiveLoadersDone = 0; - field945 = 0; - field905 = new ApproximateRouteStrategy(); - field947 = new int[50]; - field948 = new int[50]; + field841 = true; // L: 183 + worldId = 1; // L: 184 + worldProperties = 0; // L: 185 + gameBuild = 0; // L: 187 + isMembersWorld = false; // L: 190 + isLowDetail = false; // L: 191 + clientType = -1; // L: 196 + onMobile = false; // L: 197 + gameState = 0; // L: 198 + isLoading = true; // L: 219 + cycle = 0; // L: 220 + mouseLastLastPressedTimeMillis = -1L; // L: 221 + field798 = -1; // L: 223 + field686 = -1; // L: 224 + field687 = -1L; // L: 225 + hadFocus = true; // L: 226 + displayFps = false; // L: 227 + rebootTimer = 0; // L: 228 + hintArrowType = 0; // L: 229 + hintArrowNpcIndex = 0; // L: 230 + hintArrowPlayerIndex = 0; // L: 231 + hintArrowX = 0; // L: 232 + hintArrowY = 0; // L: 233 + hintArrowHeight = 0; // L: 234 + hintArrowSubX = 0; // L: 235 + hintArrowSubY = 0; // L: 236 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 238 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 239 + titleLoadingStage = 0; // L: 241 + js5ConnectState = 0; // L: 244 + field712 = 0; // L: 245 + js5Errors = 0; // L: 267 + loginState = 0; // L: 269 + field822 = 0; // L: 270 + field708 = 0; // L: 271 + field709 = 0; // L: 272 + field710 = class169.field2043; // L: 273 + Login_isUsernameRemembered = false; // L: 282 + secureRandomFuture = new SecureRandomFuture(); // L: 283 + randomDatData = null; // L: 288 + npcs = new NPC[32768]; // L: 292 + npcCount = 0; // L: 293 + npcIndices = new int[32768]; // L: 294 + field702 = 0; // L: 295 + field721 = new int[250]; // L: 296 + packetWriter = new PacketWriter(); // L: 299 + logoutTimer = 0; // L: 301 + field713 = false; // L: 302 + useBufferedSocket = true; // L: 303 + timer = new Timer(); // L: 304 + fontsMap = new HashMap(); // L: 310 + field728 = 0; // L: 317 + field711 = 1; // L: 318 + field895 = 0; // L: 319 + field791 = 1; // L: 320 + field732 = 0; // L: 321 + collisionMaps = new CollisionMap[4]; // L: 329 + isInInstance = false; // L: 330 + instanceChunkTemplates = new int[4][13][13]; // L: 331 + field736 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; // L: 332 + field737 = 0; // L: 335 + field739 = 2301979; // L: 347 + field670 = 5063219; // L: 348 + field741 = 3353893; // L: 349 + field742 = 7759444; // L: 350 + field743 = false; // L: 351 + alternativeScrollbarWidth = 0; // L: 352 + camAngleX = 128; // L: 360 + camAngleY = 0; // L: 361 + camAngleDY = 0; // L: 362 + camAngleDX = 0; // L: 363 + mouseCamClickedX = 0; // L: 364 + mouseCamClickedY = 0; // L: 365 + oculusOrbState = 0; // L: 366 + camFollowHeight = 50; // L: 367 + field753 = 0; // L: 371 + field796 = 0; // L: 372 + field755 = 0; // L: 373 + oculusOrbNormalSpeed = 12; // L: 375 + oculusOrbSlowedSpeed = 6; // L: 376 + field758 = 0; // L: 377 + field759 = false; // L: 378 + field829 = 0; // L: 379 + field761 = false; // L: 380 + field762 = 0; // L: 381 + overheadTextCount = 0; // L: 382 + overheadTextLimit = 50; // L: 383 + overheadTextXs = new int[overheadTextLimit]; // L: 384 + overheadTextYs = new int[overheadTextLimit]; // L: 385 + overheadTextAscents = new int[overheadTextLimit]; // L: 386 + overheadTextXOffsets = new int[overheadTextLimit]; // L: 387 + overheadTextColors = new int[overheadTextLimit]; // L: 388 + overheadTextEffects = new int[overheadTextLimit]; // L: 389 + overheadTextCyclesRemaining = new int[overheadTextLimit]; // L: 390 + overheadText = new String[overheadTextLimit]; // L: 391 + tileLastDrawnActor = new int[104][104]; // L: 392 + viewportDrawCount = 0; // L: 393 + viewportTempX = -1; // L: 394 + viewportTempY = -1; // L: 395 + mouseCrossX = 0; // L: 396 + mouseCrossY = 0; // L: 397 + mouseCrossState = 0; // L: 398 + mouseCrossColor = 0; // L: 399 + showMouseCross = true; // L: 400 + field782 = 0; // L: 402 + field944 = 0; // L: 403 + dragItemSlotSource = 0; // L: 406 + draggedWidgetX = 0; // L: 407 + draggedWidgetY = 0; // L: 408 + dragItemSlotDestination = 0; // L: 409 + field788 = false; // L: 410 + itemDragDuration = 0; // L: 411 + field790 = 0; // L: 412 + showLoadingMessages = true; // L: 414 + players = new Player[2048]; // L: 416 + localPlayerIndex = -1; // L: 418 + field888 = 0; // L: 419 + renderSelf = true; // L: 421 + drawPlayerNames = 0; // L: 426 + field771 = 0; // L: 427 + field930 = new int[1000]; // L: 428 + playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51}; // L: 430 + playerMenuActions = new String[8]; // L: 431 + playerOptionsPriorities = new boolean[8]; // L: 432 + defaultRotations = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792}; // L: 433 + combatTargetPlayerIndex = -1; // L: 434 + groundItems = new NodeDeque[4][104][104]; // L: 435 + pendingSpawns = new NodeDeque(); // L: 436 + projectiles = new NodeDeque(); // L: 437 + graphicsObjects = new NodeDeque(); // L: 438 + currentLevels = new int[25]; // L: 439 + levels = new int[25]; // L: 440 + experience = new int[25]; // L: 441 + leftClickOpensMenu = 0; // L: 442 + isMenuOpen = false; // L: 443 + menuOptionsCount = 0; // L: 449 + menuArguments1 = new int[500]; // L: 450 + menuArguments2 = new int[500]; // L: 451 + menuOpcodes = new int[500]; // L: 452 + menuIdentifiers = new int[500]; // L: 453 + menuActions = new String[500]; // L: 454 + menuTargets = new String[500]; // L: 455 + menuShiftClick = new boolean[500]; // L: 456 + followerOpsLowPriority = false; // L: 457 + shiftClickDrop = false; // L: 459 + tapToDrop = false; // L: 460 + showMouseOverText = true; // L: 461 + viewportX = -1; // L: 462 + viewportY = -1; // L: 463 + field828 = 0; // L: 467 + field770 = 50; // L: 468 + isItemSelected = 0; // L: 469 + selectedItemName = null; // L: 473 + isSpellSelected = false; // L: 474 + selectedSpellChildIndex = -1; // L: 476 + field834 = -1; // L: 477 + selectedSpellActionName = null; // L: 479 + selectedSpellName = null; // L: 480 + rootInterface = -1; // L: 481 + interfaceParents = new NodeHashTable(8); // L: 482 + field865 = 0; // L: 487 + field840 = -1; // L: 488 + chatEffects = 0; // L: 489 + field707 = 0; // L: 490 + meslayerContinueWidget = null; // L: 491 + runEnergy = 0; // L: 492 + weight = 0; // L: 493 + staffModLevel = 0; // L: 494 + followerIndex = -1; // L: 495 + playerMod = false; // L: 496 + viewportWidget = null; // L: 497 + clickedWidget = null; // L: 498 + clickedWidgetParent = null; // L: 499 + widgetClickX = 0; // L: 500 + widgetClickY = 0; // L: 501 + draggedOnWidget = null; // L: 502 + field799 = false; // L: 503 + field856 = -1; // L: 504 + field785 = -1; // L: 505 + field880 = false; // L: 506 + field859 = -1; // L: 507 + field795 = -1; // L: 508 + isDraggingWidget = false; // L: 509 + cycleCntr = 1; // L: 514 + field863 = new int[32]; // L: 517 + field864 = 0; // L: 518 + changedItemContainers = new int[32]; // L: 519 + field903 = 0; // L: 520 + changedSkills = new int[32]; // L: 521 + changedSkillsCount = 0; // L: 522 + chatCycle = 0; // L: 523 + field870 = 0; // L: 524 + field871 = 0; // L: 525 + field872 = 0; // L: 526 + field873 = 0; // L: 527 + field775 = 0; // L: 528 + mouseWheelRotation = 0; // L: 531 + scriptEvents = new NodeDeque(); // L: 532 + field877 = new NodeDeque(); // L: 533 + field912 = new NodeDeque(); // L: 534 + widgetFlags = new NodeHashTable(512); // L: 535 + rootWidgetCount = 0; // L: 537 + field881 = -2; // L: 538 + field882 = new boolean[100]; // L: 539 + field883 = new boolean[100]; // L: 540 + field884 = new boolean[100]; // L: 541 + rootWidgetXs = new int[100]; // L: 542 + rootWidgetYs = new int[100]; // L: 543 + rootWidgetWidths = new int[100]; // L: 544 + rootWidgetHeights = new int[100]; // L: 545 + gameDrawingMode = 0; // L: 546 + field890 = 0L; // L: 547 + isResizable = true; // L: 548 + field892 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215}; // L: 555 + publicChatMode = 0; // L: 556 + tradeChatMode = 0; // L: 558 + field913 = ""; // L: 559 + field896 = new long[100]; // L: 561 + field794 = 0; // L: 562 + field898 = 0; // L: 564 + field899 = new int[128]; // L: 565 + field900 = new int[128]; // L: 566 + field901 = -1L; // L: 567 + field902 = -1; // L: 570 + mapIconCount = 0; // L: 571 + mapIconXs = new int[1000]; // L: 572 + mapIconYs = new int[1000]; // L: 573 + mapIcons = new Sprite[1000]; // L: 574 + destinationX = 0; // L: 575 + destinationY = 0; // L: 576 + minimapState = 0; // L: 583 + musicVolume = 255; // L: 584 + currentTrackGroupId = -1; // L: 585 + field704 = false; // L: 586 + soundEffectVolume = 127; // L: 588 + areaSoundEffectVolume = 127; // L: 589 + soundEffectCount = 0; // L: 594 + soundEffectIds = new int[50]; // L: 595 + queuedSoundEffectLoops = new int[50]; // L: 596 + queuedSoundEffectDelays = new int[50]; // L: 597 + soundLocations = new int[50]; // L: 598 + soundEffects = new SoundEffect[50]; // L: 599 + isCameraLocked = false; // L: 601 + field922 = new boolean[5]; // L: 613 + field678 = new int[5]; // L: 614 + field740 = new int[5]; // L: 615 + field925 = new int[5]; // L: 616 + field926 = new int[5]; // L: 617 + field769 = 256; // L: 618 + field928 = 205; // L: 619 + zoomHeight = 256; // L: 620 + zoomWidth = 320; // L: 621 + field931 = 1; // L: 622 + field932 = 32767; // L: 623 + field938 = 1; // L: 624 + field934 = 32767; // L: 625 + viewportOffsetX = 0; // L: 626 + viewportOffsetY = 0; // L: 627 + viewportWidth = 0; // L: 628 + viewportHeight = 0; // L: 629 + viewportZoom = 0; // L: 630 + playerAppearance = new PlayerAppearance(); // L: 632 + field937 = -1; // L: 633 + field942 = -1; // L: 634 + platformInfoProvider = new DesktopPlatformInfoProvider(); // L: 636 + grandExchangeOffers = new GrandExchangeOffer[8]; // L: 638 + GrandExchangeEvents_worldComparator = new GrandExchangeOfferOwnWorldComparator(); // L: 641 + field946 = -1; // L: 648 + archiveLoaders = new ArrayList(10); // L: 649 + archiveLoadersDone = 0; // L: 650 + field949 = 0; // L: 651 + field950 = new ApproximateRouteStrategy(); // L: 660 + field830 = new int[50]; // L: 661 + field952 = new int[50]; // L: 662 } - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1805213007" + garbageValue = "912814062" ) @Export("resizeGame") protected final void resizeGame() { - field886 = MilliClock.currentTimeMillis() + 500L; - this.resizeJS(); - if (rootInterface != -1) { + field890 = PacketWriter.currentTimeMillis() + 500L; // L: 3888 + this.resizeJS(); // L: 3889 + if (rootInterface != -1) { // L: 3890 this.resizeRoot(true); } - } + } // L: 3891 - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "108465933" + garbageValue = "1974240025" ) @Export("setUp") protected final void setUp() { - class277.method5157(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); - class90.port1 = gameBuild == 0 ? 43594 : worldId + 40000; - port2 = gameBuild == 0 ? 443 : worldId + 50000; - WorldMapLabel.port3 = class90.port1; - PlayerAppearance.field2574 = class224.field2579; - PlayerAppearance.field2575 = class224.field2580; - PlayerAppearance.field2569 = class224.field2584; - Messages.field1308 = class224.field2582; - WorldMapLabelSize.urlRequester = new UrlRequester(); - this.setUpKeyboard(); - this.setUpMouse(); - class7.mouseWheel = this.mouseWheel(); - FloorUnderlayDefinition.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); - AccessFile var2 = null; - ClientPreferences var3 = new ClientPreferences(); + class277.method5089(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 784 + port1 = gameBuild == 0 ? 43594 : worldId + 40000; // L: 785 + class23.port2 = gameBuild == 0 ? 443 : worldId + 50000; // L: 786 + WorldMapScaleHandler.port3 = port1; // L: 787 + Calendar.field2535 = class224.field2587; // L: 788 + WorldMapSprite.field253 = class224.field2589; // L: 789 + GrandExchangeOfferTotalQuantityComparator.field83 = class224.field2584; // L: 790 + UserComparator7.field2021 = class224.field2586; // L: 791 + UserComparator4.urlRequester = new UrlRequester(); // L: 792 + this.setUpKeyboard(); // L: 793 + this.setUpMouse(); // L: 794 + Player.mouseWheel = this.mouseWheel(); // L: 795 + Skeleton.masterDisk = new ArchiveDisk(255, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idx255File, 500000); // L: 796 + AccessFile var2 = null; // L: 799 + ClientPreferences var3 = new ClientPreferences(); // L: 800 try { - var2 = GameShell.getPreferencesFile("", GrandExchangeOfferWorldComparator.field54.name, false); - byte[] var4 = new byte[(int)var2.length()]; + var2 = class2.getPreferencesFile("", Tiles.field532.name, false); // L: 802 + byte[] var4 = new byte[(int)var2.length()]; // L: 803 int var6; - for (int var5 = 0; var5 < var4.length; var5 += var6) { - var6 = var2.read(var4, var5, var4.length - var5); - if (var6 == -1) { + for (int var5 = 0; var5 < var4.length; var5 += var6) { // L: 804 805 808 + var6 = var2.read(var4, var5, var4.length - var5); // L: 806 + if (var6 == -1) { // L: 807 throw new IOException(); } } - var3 = new ClientPreferences(new Buffer(var4)); - } catch (Exception var8) { + var3 = new ClientPreferences(new Buffer(var4)); // L: 810 + } catch (Exception var8) { // L: 812 } try { - if (var2 != null) { + if (var2 != null) { // L: 814 var2.close(); } - } catch (Exception var7) { + } catch (Exception var7) { // L: 816 } - NetSocket.clientPreferences = var3; - this.setUpClipboard(); - TaskHandler.method3606(this, TileItemPile.null_string); - if (gameBuild != 0) { + Tile.clientPreferences = var3; // L: 819 + this.setUpClipboard(); // L: 820 + VarbitDefinition.method4593(this, class60.null_string); // L: 821 + if (gameBuild != 0) { // L: 822 displayFps = true; } - ScriptEvent.setWindowedMode(NetSocket.clientPreferences.windowMode); - ModeWhere.friendSystem = new FriendSystem(class195.loginType); - } + FontName.setWindowedMode(Tile.clientPreferences.windowMode); // L: 823 + class60.friendSystem = new FriendSystem(WorldMapAreaData.loginType); // L: 824 + } // L: 825 - @ObfuscatedName("ab") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "202919973" + garbageValue = "-720509728" ) @Export("doCycle") protected final void doCycle() { - ++cycle; - this.doCycleJs5(); - class195.method3749(); - - int var1; - try { - if (class206.field2439 == 1) { - var1 = WorldMapSprite.midiPcmStream.method3837(); - if (var1 > 0 && WorldMapSprite.midiPcmStream.isReady()) { - var1 -= class206.field2442; - if (var1 < 0) { - var1 = 0; - } - - WorldMapSprite.midiPcmStream.setPcmStreamVolume(var1); - } else { - WorldMapSprite.midiPcmStream.clear(); - WorldMapSprite.midiPcmStream.removeAll(); - if (Huffman.musicTrackArchive != null) { - class206.field2439 = 2; + ++cycle; // L: 828 + this.doCycleJs5(); // L: 829 + class58.method907(); // L: 830 + GraphicsObject.method2095(); // L: 831 + RouteStrategy.playPcmPlayers(); // L: 832 + int var2; + synchronized(KeyHandler.KeyHandler_instance) { // L: 834 + ++KeyHandler.KeyHandler_idleCycles; // L: 835 + KeyHandler.field423 = KeyHandler.field399; // L: 836 + KeyHandler.field422 = 0; // L: 837 + if (KeyHandler.field418 >= 0) { // L: 838 + while (KeyHandler.field418 != KeyHandler.field417) { // L: 843 + var2 = KeyHandler.field409[KeyHandler.field417]; // L: 844 + KeyHandler.field417 = KeyHandler.field417 + 1 & 127; // L: 845 + if (var2 < 0) { // L: 846 + KeyHandler.KeyHandler_pressedKeys[~var2] = false; } else { - class206.field2439 = 0; + if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field422 < KeyHandler.field421.length - 1) { // L: 848 + KeyHandler.field421[++KeyHandler.field422 - 1] = var2; // L: 849 + } + + KeyHandler.KeyHandler_pressedKeys[var2] = true; // L: 851 } - - DevicePcmPlayerProvider.musicTrack = null; - Clock.soundCache = null; } - } - } catch (Exception var5) { - var5.printStackTrace(); - WorldMapSprite.midiPcmStream.clear(); - class206.field2439 = 0; - DevicePcmPlayerProvider.musicTrack = null; - Clock.soundCache = null; - Huffman.musicTrackArchive = null; - } + } else { + for (var2 = 0; var2 < 112; ++var2) { // L: 839 + KeyHandler.KeyHandler_pressedKeys[var2] = false; + } - Timer.playPcmPlayers(); - MidiPcmStream.method3918(); - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; - MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; - MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; - MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; - MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; - MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; - MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; - MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; - MouseHandler.MouseHandler_lastButtonVolatile = 0; - } - - if (class7.mouseWheel != null) { - var1 = class7.mouseWheel.useRotation(); - mouseWheelRotation = var1; - } - - if (gameState == 0) { - HealthBar.load(); - MidiPcmStream.method3905(); - } else if (gameState == 5) { - GrandExchangeEvent.doCycleTitle(this); - HealthBar.load(); - FriendLoginUpdate.clock.mark(); - - for (var1 = 0; var1 < 32; ++var1) { - GameShell.graphicsTickTimes[var1] = 0L; + KeyHandler.field418 = KeyHandler.field417; // L: 840 } - for (var1 = 0; var1 < 32; ++var1) { - GameShell.clientTickTimes[var1] = 0L; + if (KeyHandler.field422 > 0) { // L: 855 + KeyHandler.KeyHandler_idleCycles = 0; } - GameShell.gameCyclesToDo = 0; - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - GrandExchangeEvent.doCycleTitle(this); - this.doCycleLoggedOut(); - } else if (gameState == 25) { - class23.method229(); - } - } else { - GrandExchangeEvent.doCycleTitle(this); + KeyHandler.field399 = KeyHandler.field424; // L: 856 } - if (gameState == 30) { - this.doCycleLoggedIn(); - } else if (gameState == 40 || gameState == 45) { - this.doCycleLoggedOut(); + WallDecoration.method3409(); // L: 859 + if (Player.mouseWheel != null) { // L: 860 + int var43 = Player.mouseWheel.useRotation(); // L: 861 + mouseWheelRotation = var43; // L: 862 } - } + if (gameState == 0) { // L: 864 + class3.load(); // L: 865 + WorldMapLabel.method498(); // L: 866 + } else if (gameState == 5) { // L: 868 + class3.doCycleTitle(this); // L: 869 + class3.load(); // L: 870 + WorldMapLabel.method498(); // L: 871 + } else if (gameState != 10 && gameState != 11) { // L: 873 + if (gameState == 20) { // L: 874 + class3.doCycleTitle(this); // L: 875 + this.doCycleLoggedOut(); // L: 876 + } else if (gameState == 25) { // L: 878 + AttackOption.method2154(false); // L: 879 + field728 = 0; // L: 880 + boolean var54 = true; // L: 881 - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "255" - ) - @Export("draw") - protected final void draw(boolean var1) { - boolean var2; - label165: { - try { - if (class206.field2439 == 2) { - if (DevicePcmPlayerProvider.musicTrack == null) { - DevicePcmPlayerProvider.musicTrack = MusicTrack.readTrack(Huffman.musicTrackArchive, class206.musicTrackGroupId, MilliClock.musicTrackFileId); - if (DevicePcmPlayerProvider.musicTrack == null) { - var2 = false; - break label165; + for (var2 = 0; var2 < AbstractUserComparator.regionLandArchives.length; ++var2) { // L: 882 + if (GrandExchangeEvents.regionMapArchiveIds[var2] != -1 && AbstractUserComparator.regionLandArchives[var2] == null) { // L: 883 884 + AbstractUserComparator.regionLandArchives[var2] = WorldMapLabel.archive5.takeFile(GrandExchangeEvents.regionMapArchiveIds[var2], 0); // L: 885 + if (AbstractUserComparator.regionLandArchives[var2] == null) { // L: 886 + var54 = false; // L: 887 + ++field728; // L: 888 } } - if (Clock.soundCache == null) { - Clock.soundCache = new SoundCache(class206.soundEffectsArchive, class206.musicSamplesArchive); - } - - if (WorldMapSprite.midiPcmStream.loadMusicTrack(DevicePcmPlayerProvider.musicTrack, class206.musicPatchesArchive, Clock.soundCache, 22050)) { - WorldMapSprite.midiPcmStream.clearAll(); - WorldMapSprite.midiPcmStream.setPcmStreamVolume(class206.musicTrackVolume); - WorldMapSprite.midiPcmStream.setMusicTrack(DevicePcmPlayerProvider.musicTrack, class336.musicTrackBoolean); - class206.field2439 = 0; - DevicePcmPlayerProvider.musicTrack = null; - Clock.soundCache = null; - Huffman.musicTrackArchive = null; - var2 = true; - break label165; + if (Skeleton.regionLandArchiveIds[var2] != -1 && AbstractWorldMapData.regionMapArchives[var2] == null) { // L: 892 893 + AbstractWorldMapData.regionMapArchives[var2] = WorldMapLabel.archive5.takeFileEncrypted(Skeleton.regionLandArchiveIds[var2], 0, BoundaryObject.xteaKeys[var2]); // L: 894 + if (AbstractWorldMapData.regionMapArchives[var2] == null) { // L: 895 + var54 = false; // L: 896 + ++field728; // L: 897 + } } } - } catch (Exception var6) { - var6.printStackTrace(); - WorldMapSprite.midiPcmStream.clear(); - class206.field2439 = 0; - DevicePcmPlayerProvider.musicTrack = null; - Clock.soundCache = null; - Huffman.musicTrackArchive = null; - } - var2 = false; - } - - if (var2 && field743 && class2.pcmPlayer0 != null) { - class2.pcmPlayer0.tryDiscard(); - } - - if ((gameState == 10 || gameState == 20 || gameState == 30) && 0L != field886 && MilliClock.currentTimeMillis() > field886) { - ScriptEvent.setWindowedMode(class58.getWindowedMode()); - } - - int var4; - if (var1) { - for (var4 = 0; var4 < 100; ++var4) { - field813[var4] = true; - } - } - - if (gameState == 0) { - this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); - } else if (gameState == 5) { - World.drawTitle(GrandExchangeOfferNameComparator.fontBold12, WorldMapLabel.fontPlain11, MusicPatchNode2.fontPlain12); - } else if (gameState != 10 && gameState != 11) { - if (gameState == 20) { - World.drawTitle(GrandExchangeOfferNameComparator.fontBold12, WorldMapLabel.fontPlain11, MusicPatchNode2.fontPlain12); - } else if (gameState == 25) { - if (field809 == 1) { - if (field822 > field759) { - field759 = field822; - } - - var4 = (field759 * 50 - field822 * 50) / field759; - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); - } else if (field809 == 2) { - if (field690 > field729) { - field729 = field690; - } - - var4 = (field729 * 50 - field690 * 50) / field729 + 50; - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + var4 + "%" + ")", false); + if (!var54) { // L: 902 + field732 = 1; // L: 903 } else { - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); + field895 = 0; // L: 906 + var54 = true; // L: 907 + + int var4; + int var5; + for (var2 = 0; var2 < AbstractUserComparator.regionLandArchives.length; ++var2) { // L: 908 + byte[] var3 = AbstractWorldMapData.regionMapArchives[var2]; // L: 909 + if (var3 != null) { // L: 910 + var4 = (class90.regions[var2] >> 8) * 64 - WorldMapManager.baseX; // L: 911 + var5 = (class90.regions[var2] & 255) * 64 - WorldMapLabel.baseY; // L: 912 + if (isInInstance) { // L: 913 + var4 = 10; // L: 914 + var5 = 10; // L: 915 + } + + var54 &= class224.method4117(var3, var4, var5); // L: 917 + } + } + + if (!var54) { // L: 920 + field732 = 2; // L: 921 + } else { + if (field732 != 0) { // L: 924 + Actor.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); + } + + RouteStrategy.playPcmPlayers(); // L: 925 + ScriptEvent.scene.clear(); // L: 926 + + for (var2 = 0; var2 < 4; ++var2) { // L: 927 + collisionMaps[var2].clear(); + } + + int var44; + for (var2 = 0; var2 < 4; ++var2) { // L: 928 + for (var44 = 0; var44 < 104; ++var44) { // L: 929 + for (var4 = 0; var4 < 104; ++var4) { // L: 930 + Tiles.Tiles_renderFlags[var2][var44][var4] = 0; // L: 931 + } + } + } + + RouteStrategy.playPcmPlayers(); // L: 935 + MidiPcmStream.method3920(); // L: 936 + var2 = AbstractUserComparator.regionLandArchives.length; // L: 937 + ModeWhere.method3772(); // L: 938 + AttackOption.method2154(true); // L: 939 + int var7; + int var8; + int var10; + int var11; + int var12; + int var13; + int[] var10000; + int var47; + if (!isInInstance) { // L: 940 + var44 = 0; + + label624: + while (true) { + byte[] var6; + if (var44 >= var2) { + for (var44 = 0; var44 < var2; ++var44) { // L: 969 + var4 = (class90.regions[var44] >> 8) * 64 - WorldMapManager.baseX; // L: 970 + var5 = (class90.regions[var44] & 255) * 64 - WorldMapLabel.baseY; // L: 971 + var6 = AbstractUserComparator.regionLandArchives[var44]; // L: 972 + if (var6 == null && SpotAnimationDefinition.field3261 < 800) { // L: 973 + RouteStrategy.playPcmPlayers(); // L: 974 + Player.method1327(var4, var5, 64, 64); // L: 975 + } + } + + AttackOption.method2154(true); // L: 978 + var44 = 0; + + while (true) { + if (var44 >= var2) { + break label624; + } + + byte[] var46 = AbstractWorldMapData.regionMapArchives[var44]; // L: 980 + if (var46 != null) { // L: 981 + var5 = (class90.regions[var44] >> 8) * 64 - WorldMapManager.baseX; // L: 982 + var47 = (class90.regions[var44] & 255) * 64 - WorldMapLabel.baseY; // L: 983 + RouteStrategy.playPcmPlayers(); // L: 984 + BuddyRankComparator.method3524(var46, var5, var47, ScriptEvent.scene, collisionMaps); // L: 985 + } + + ++var44; // L: 979 + } + } + + var4 = (class90.regions[var44] >> 8) * 64 - WorldMapManager.baseX; // L: 942 + var5 = (class90.regions[var44] & 255) * 64 - WorldMapLabel.baseY; // L: 943 + var6 = AbstractUserComparator.regionLandArchives[var44]; // L: 944 + if (var6 != null) { // L: 945 + RouteStrategy.playPcmPlayers(); // L: 946 + var7 = class52.field396 * 8 - 48; // L: 947 + var8 = SpotAnimationDefinition.field3261 * 8 - 48; // L: 948 + CollisionMap[] var9 = collisionMaps; // L: 949 + var10 = 0; + + label621: + while (true) { + if (var10 >= 4) { + Buffer var45 = new Buffer(var6); // L: 958 + var11 = 0; + + while (true) { + if (var11 >= 4) { + break label621; + } + + for (var12 = 0; var12 < 64; ++var12) { // L: 960 + for (var13 = 0; var13 < 64; ++var13) { // L: 961 + DynamicObject.loadTerrain(var45, var11, var4 + var12, var5 + var13, var7, var8, 0); // L: 962 + } + } + + ++var11; // L: 959 + } + } + + for (var11 = 0; var11 < 64; ++var11) { // L: 952 + for (var12 = 0; var12 < 64; ++var12) { // L: 953 + if (var4 + var11 > 0 && var4 + var11 < 103 && var12 + var5 > 0 && var5 + var12 < 103) { // L: 954 + var10000 = var9[var10].flags[var11 + var4]; + var10000[var12 + var5] &= -16777217; + } + } + } + + ++var10; // L: 951 + } + } + + ++var44; // L: 941 + } + } + + int var48; + if (isInInstance) { // L: 989 + var44 = 0; + + label570: + while (true) { + int var15; + int var16; + int var17; + CollisionMap[] var19; + int var21; + int var22; + int var23; + Buffer var49; + if (var44 >= 4) { + for (var44 = 0; var44 < 13; ++var44) { // L: 1039 + for (var4 = 0; var4 < 13; ++var4) { // L: 1040 + var5 = instanceChunkTemplates[0][var44][var4]; // L: 1041 + if (var5 == -1) { // L: 1042 + Player.method1327(var44 * 8, var4 * 8, 8, 8); // L: 1043 + } + } + } + + AttackOption.method2154(true); // L: 1047 + var44 = 0; + + while (true) { + if (var44 >= 4) { + break label570; + } + + RouteStrategy.playPcmPlayers(); // L: 1049 + + for (var4 = 0; var4 < 13; ++var4) { // L: 1050 + label493: + for (var5 = 0; var5 < 13; ++var5) { // L: 1051 + var47 = instanceChunkTemplates[var44][var4][var5]; // L: 1052 + if (var47 != -1) { // L: 1053 + var7 = var47 >> 24 & 3; // L: 1054 + var8 = var47 >> 1 & 3; // L: 1055 + var48 = var47 >> 14 & 1023; // L: 1056 + var10 = var47 >> 3 & 2047; // L: 1057 + var11 = (var48 / 8 << 8) + var10 / 8; // L: 1058 + + for (var12 = 0; var12 < class90.regions.length; ++var12) { // L: 1059 + if (class90.regions[var12] == var11 && AbstractWorldMapData.regionMapArchives[var12] != null) { // L: 1060 + byte[] var50 = AbstractWorldMapData.regionMapArchives[var12]; // L: 1061 + int var51 = var4 * 8; // L: 1062 + var15 = var5 * 8; // L: 1063 + var16 = (var48 & 7) * 8; // L: 1064 + var17 = (var10 & 7) * 8; // L: 1065 + Scene var52 = ScriptEvent.scene; // L: 1066 + var19 = collisionMaps; // L: 1067 + var49 = new Buffer(var50); // L: 1069 + var21 = -1; // L: 1070 + + while (true) { + var22 = var49.method5632(); // L: 1072 + if (var22 == 0) { // L: 1073 + continue label493; + } + + var21 += var22; // L: 1074 + var23 = 0; // L: 1075 + + while (true) { + int var24 = var49.readUShortSmart(); // L: 1077 + if (var24 == 0) { // L: 1078 + break; + } + + var23 += var24 - 1; // L: 1079 + int var25 = var23 & 63; // L: 1080 + int var26 = var23 >> 6 & 63; // L: 1081 + int var27 = var23 >> 12; // L: 1082 + int var28 = var49.readUnsignedByte(); // L: 1083 + int var29 = var28 >> 2; // L: 1084 + int var30 = var28 & 3; // L: 1085 + if (var7 == var27 && var26 >= var16 && var26 < var16 + 8 && var25 >= var17 && var25 < var17 + 8) { // L: 1086 + ObjectDefinition var31 = MidiPcmStream.getObjectDefinition(var21); // L: 1087 + int var34 = var26 & 7; // L: 1090 + int var35 = var25 & 7; // L: 1091 + int var37 = var31.sizeX; // L: 1093 + int var38 = var31.sizeY; // L: 1094 + int var39; + if ((var30 & 1) == 1) { // L: 1096 + var39 = var37; // L: 1097 + var37 = var38; // L: 1098 + var38 = var39; // L: 1099 + } + + int var36 = var8 & 3; // L: 1101 + int var33; + if (var36 == 0) { // L: 1102 + var33 = var34; // L: 1103 + } else if (var36 == 1) { // L: 1106 + var33 = var35; // L: 1107 + } else if (var36 == 2) { // L: 1110 + var33 = 7 - var34 - (var37 - 1); // L: 1111 + } else { + var33 = 7 - var35 - (var38 - 1); // L: 1114 + } + + var39 = var51 + var33; // L: 1116 + int var40 = var15 + class58.method912(var26 & 7, var25 & 7, var8, var31.sizeX, var31.sizeY, var30); // L: 1117 + if (var39 > 0 && var40 > 0 && var39 < 103 && var40 < 103) { // L: 1118 + int var41 = var44; // L: 1119 + if ((Tiles.Tiles_renderFlags[1][var39][var40] & 2) == 2) { // L: 1120 + var41 = var44 - 1; + } + + CollisionMap var42 = null; // L: 1121 + if (var41 >= 0) { // L: 1122 + var42 = var19[var41]; + } + + GrandExchangeOfferWorldComparator.method137(var44, var39, var40, var21, var8 + var30 & 3, var29, var52, var42); // L: 1123 + } + } + } + } + } + } + } + } + } + + ++var44; // L: 1048 + } + } + + RouteStrategy.playPcmPlayers(); // L: 991 + + for (var4 = 0; var4 < 13; ++var4) { // L: 992 + for (var5 = 0; var5 < 13; ++var5) { // L: 993 + boolean var57 = false; // L: 994 + var7 = instanceChunkTemplates[var44][var4][var5]; // L: 995 + if (var7 != -1) { // L: 996 + var8 = var7 >> 24 & 3; // L: 997 + var48 = var7 >> 1 & 3; // L: 998 + var10 = var7 >> 14 & 1023; // L: 999 + var11 = var7 >> 3 & 2047; // L: 1000 + var12 = (var10 / 8 << 8) + var11 / 8; // L: 1001 + + for (var13 = 0; var13 < class90.regions.length; ++var13) { // L: 1002 + if (class90.regions[var13] == var12 && AbstractUserComparator.regionLandArchives[var13] != null) { // L: 1003 + byte[] var14 = AbstractUserComparator.regionLandArchives[var13]; // L: 1004 + var15 = var4 * 8; // L: 1005 + var16 = var5 * 8; // L: 1006 + var17 = (var10 & 7) * 8; // L: 1007 + int var18 = (var11 & 7) * 8; // L: 1008 + var19 = collisionMaps; // L: 1009 + + for (int var20 = 0; var20 < 8; ++var20) { // L: 1011 + for (var21 = 0; var21 < 8; ++var21) { // L: 1012 + if (var15 + var20 > 0 && var15 + var20 < 103 && var21 + var16 > 0 && var16 + var21 < 103) { // L: 1013 + var10000 = var19[var44].flags[var15 + var20]; + var10000[var16 + var21] &= -16777217; + } + } + } + + var49 = new Buffer(var14); // L: 1016 + + for (var21 = 0; var21 < 4; ++var21) { // L: 1017 + for (var22 = 0; var22 < 64; ++var22) { // L: 1018 + for (var23 = 0; var23 < 64; ++var23) { // L: 1019 + if (var8 == var21 && var22 >= var17 && var22 < var17 + 8 && var23 >= var18 && var23 < var18 + 8) { // L: 1020 + DynamicObject.loadTerrain(var49, var44, var15 + TaskHandler.method3568(var22 & 7, var23 & 7, var48), var16 + Huffman.method4041(var22 & 7, var23 & 7, var48), 0, 0, var48); // L: 1021 + } else { + DynamicObject.loadTerrain(var49, 0, -1, -1, 0, 0, 0); // L: 1023 + } + } + } + } + + var57 = true; // L: 1028 + break; // L: 1029 + } + } + } + + if (!var57) { // L: 1033 + class58.method914(var44, var4 * 8, var5 * 8); // L: 1034 + } + } + } + + ++var44; // L: 990 + } + } + + AttackOption.method2154(true); // L: 1137 + RouteStrategy.playPcmPlayers(); // L: 1138 + HealthBar.method2113(ScriptEvent.scene, collisionMaps); // L: 1139 + AttackOption.method2154(true); // L: 1140 + var44 = Tiles.Tiles_minPlane; // L: 1141 + if (var44 > Huffman.Client_plane) { // L: 1142 + var44 = Huffman.Client_plane; + } + + if (var44 < Huffman.Client_plane - 1) { // L: 1143 + var44 = Huffman.Client_plane - 1; + } + + if (isLowDetail) { // L: 1144 + ScriptEvent.scene.init(Tiles.Tiles_minPlane); + } else { + ScriptEvent.scene.init(0); // L: 1145 + } + + for (var4 = 0; var4 < 104; ++var4) { // L: 1146 + for (var5 = 0; var5 < 104; ++var5) { // L: 1147 + class13.updateItemPile(var4, var5); // L: 1148 + } + } + + RouteStrategy.playPcmPlayers(); // L: 1151 + + for (PendingSpawn var55 = (PendingSpawn)pendingSpawns.last(); var55 != null; var55 = (PendingSpawn)pendingSpawns.previous()) { // L: 1153 1154 1160 + if (var55.hitpoints == -1) { // L: 1155 + var55.delay = 0; // L: 1156 + WorldMapIcon_1.method375(var55); // L: 1157 + } else { + var55.remove(); // L: 1159 + } + } + + ObjectDefinition.ObjectDefinition_cachedModelData.clear(); // L: 1163 + PacketBufferNode var56; + if (class2.client.hasFrame()) { // L: 1164 + var56 = getPacketBufferNode(ClientPacket.field2251, packetWriter.isaacCipher); // L: 1166 + var56.packetBuffer.writeInt(1057001181); // L: 1167 + packetWriter.addNode(var56); // L: 1168 + } + + if (!isInInstance) { // L: 1170 + var4 = (class52.field396 - 6) / 8; // L: 1171 + var5 = (class52.field396 + 6) / 8; // L: 1172 + var47 = (SpotAnimationDefinition.field3261 - 6) / 8; // L: 1173 + var7 = (SpotAnimationDefinition.field3261 + 6) / 8; // L: 1174 + + for (var8 = var4 - 1; var8 <= var5 + 1; ++var8) { // L: 1175 + for (var48 = var47 - 1; var48 <= var7 + 1; ++var48) { // L: 1176 + if (var8 < var4 || var8 > var5 || var48 < var47 || var48 > var7) { // L: 1177 + WorldMapLabel.archive5.loadRegionFromName("m" + var8 + "_" + var48); // L: 1178 + WorldMapLabel.archive5.loadRegionFromName("l" + var8 + "_" + var48); // L: 1179 + } + } + } + } + + CollisionMap.updateGameState(30); // L: 1183 + RouteStrategy.playPcmPlayers(); // L: 1184 + Messages.method2288(); // L: 1185 + var56 = getPacketBufferNode(ClientPacket.field2318, packetWriter.isaacCipher); // L: 1186 + packetWriter.addNode(var56); // L: 1187 + WorldMapLabel.method498(); // L: 1188 + } } - } else if (gameState == 30) { - this.drawLoggedIn(); - } else if (gameState == 40) { - ArchiveDiskActionHandler.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); - } else if (gameState == 45) { - ArchiveDiskActionHandler.drawLoadingMessage("Please wait...", false); } } else { - World.drawTitle(GrandExchangeOfferNameComparator.fontBold12, WorldMapLabel.fontPlain11, MusicPatchNode2.fontPlain12); + class3.doCycleTitle(this); } - if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { - for (var4 = 0; var4 < rootWidgetCount; ++var4) { - if (field879[var4]) { - ArchiveLoader.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]); - field879[var4] = false; + if (gameState == 30) { // L: 1190 + this.doCycleLoggedIn(); + } else if (gameState == 40 || gameState == 45) { // L: 1191 + this.doCycleLoggedOut(); + } + + } // L: 1192 + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "-63" + ) + @Export("draw") + protected final void draw(boolean var1) { + boolean var2 = Script.method2326(); // L: 1195 + if (var2 && field704 && WorldMapManager.pcmPlayer0 != null) { // L: 1196 1197 + WorldMapManager.pcmPlayer0.tryDiscard(); + } + + if ((gameState == 10 || gameState == 20 || gameState == 30) && field890 != 0L && PacketWriter.currentTimeMillis() > field890) { // L: 1199 1200 + FontName.setWindowedMode(class39.getWindowedMode()); // L: 1201 + } + + int var3; + if (var1) { // L: 1204 + for (var3 = 0; var3 < 100; ++var3) { // L: 1205 + field882[var3] = true; + } + } + + if (gameState == 0) { // L: 1207 + this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1); + } else if (gameState == 5) { // L: 1208 + Player.drawTitle(class4.fontBold12, DynamicObject.fontPlain11, ItemDefinition.fontPlain12); + } else if (gameState != 10 && gameState != 11) { // L: 1209 + if (gameState == 20) { // L: 1210 + Player.drawTitle(class4.fontBold12, DynamicObject.fontPlain11, ItemDefinition.fontPlain12); + } else if (gameState == 25) { // L: 1211 + if (field732 == 1) { // L: 1212 + if (field728 > field711) { // L: 1213 + field711 = field728; + } + + var3 = (field711 * 50 - field728 * 50) / field711; // L: 1214 + Actor.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1215 + } else if (field732 == 2) { // L: 1217 + if (field895 > field791) { // L: 1218 + field791 = field895; + } + + var3 = (field791 * 50 - field895 * 50) / field791 + 50; // L: 1219 + Actor.drawLoadingMessage("Loading - please wait." + "
" + " (" + var3 + "%" + ")", false); // L: 1220 + } else { + Actor.drawLoadingMessage("Loading - please wait.", false); // L: 1222 + } + } else if (gameState == 30) { // L: 1224 + this.drawLoggedIn(); + } else if (gameState == 40) { // L: 1225 + Actor.drawLoadingMessage("Connection lost" + "
" + "Please wait - attempting to reestablish", false); + } else if (gameState == 45) { // L: 1226 + Actor.drawLoadingMessage("Please wait...", false); + } + } else { + Player.drawTitle(class4.fontBold12, DynamicObject.fontPlain11, ItemDefinition.fontPlain12); // L: 1216 + } + + if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) { // L: 1227 + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1228 + if (field883[var3]) { // L: 1229 + WorldMapSprite.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]); // L: 1230 + field883[var3] = false; // L: 1231 } } - } else if (gameState > 0) { - ArchiveLoader.rasterProvider.drawFull(0, 0); + } else if (gameState > 0) { // L: 1235 + WorldMapSprite.rasterProvider.drawFull(0, 0); // L: 1236 - for (var4 = 0; var4 < rootWidgetCount; ++var4) { - field879[var4] = false; + for (var3 = 0; var3 < rootWidgetCount; ++var3) { // L: 1237 + field883[var3] = false; } } - } + } // L: 1239 - @ObfuscatedName("ak") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1432958229" + garbageValue = "-645621446" ) @Export("kill0") protected final void kill0() { - if (AttackOption.varcs.hasUnwrittenChanges()) { - AttackOption.varcs.write(); + if (ClientPreferences.varcs.hasUnwrittenChanges()) { // L: 1242 + ClientPreferences.varcs.write(); } - if (class219.mouseRecorder != null) { - class219.mouseRecorder.isRunning = false; + if (ByteArrayPool.mouseRecorder != null) { // L: 1243 + ByteArrayPool.mouseRecorder.isRunning = false; } - class219.mouseRecorder = null; - packetWriter.close(); - TilePaint.method3186(); - UserComparator9.method3509(); - class7.mouseWheel = null; - if (class2.pcmPlayer0 != null) { - class2.pcmPlayer0.shutdown(); + ByteArrayPool.mouseRecorder = null; // L: 1244 + packetWriter.close(); // L: 1245 + class195.method3714(); // L: 1246 + PacketWriter.method2357(); // L: 1247 + Player.mouseWheel = null; // L: 1248 + if (WorldMapManager.pcmPlayer0 != null) { // L: 1249 + WorldMapManager.pcmPlayer0.shutdown(); } - if (class58.pcmPlayer1 != null) { - class58.pcmPlayer1.shutdown(); + if (IntHashTable.pcmPlayer1 != null) { // L: 1250 + IntHashTable.pcmPlayer1.shutdown(); } - WorldMapSectionType.method312(); - AbstractWorldMapIcon.method687(); - if (WorldMapLabelSize.urlRequester != null) { - WorldMapLabelSize.urlRequester.close(); - WorldMapLabelSize.urlRequester = null; + GameObject.method3411(); // L: 1251 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 1253 + if (ArchiveDiskActionHandler.field3179 != 0) { // L: 1254 + ArchiveDiskActionHandler.field3179 = 1; // L: 1255 + + try { + ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait(); // L: 1257 + } catch (InterruptedException var5) { // L: 1259 + } + } } - SoundSystem.method2629(); - } + if (UserComparator4.urlRequester != null) { // L: 1263 + UserComparator4.urlRequester.close(); // L: 1264 + UserComparator4.urlRequester = null; // L: 1265 + } - @ObfuscatedName("av") + try { + JagexCache.JagexCache_dat2File.close(); // L: 1269 + + for (int var4 = 0; var4 < GZipDecompressor.idxCount; ++var4) { // L: 1270 + JagexCache.JagexCache_idxFiles[var4].close(); + } + + JagexCache.JagexCache_idx255File.close(); // L: 1271 + JagexCache.JagexCache_randomDat.close(); // L: 1272 + } catch (Exception var6) { // L: 1274 + } + + } // L: 1276 + + @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-453140820" + descriptor = "(B)V", + garbageValue = "28" ) - protected final void vmethod1570() { - } + protected final void vmethod1761() { + } // L: 669 public final void init() { try { - if (this.checkHost()) { - for (int var1 = 0; var1 <= 19; ++var1) { - String var2 = this.getParameter(Integer.toString(var1)); - if (var2 != null) { - switch(var1) { + if (this.checkHost()) { // L: 675 + for (int var1 = 0; var1 <= 19; ++var1) { // L: 676 + String var2 = this.getParameter(Integer.toString(var1)); // L: 677 + if (var2 != null) { // L: 678 + switch(var1) { // L: 679 case 1: - useBufferedSocket = Integer.parseInt(var2) != 0; + useBufferedSocket = Integer.parseInt(var2) != 0; // L: 692 case 2: case 11: case 13: @@ -1916,3860 +2312,3576 @@ public final class Client extends GameShell implements Usernamed { default: break; case 3: - if (var2.equalsIgnoreCase("true")) { + if (var2.equalsIgnoreCase("true")) { // L: 697 isMembersWorld = true; } else { - isMembersWorld = false; + isMembersWorld = false; // L: 698 } break; case 4: - if (clientType == -1) { - clientType = Integer.parseInt(var2); + if (clientType == -1) { // L: 755 + clientType = Integer.parseInt(var2); // L: 756 } break; case 5: - worldProperties = Integer.parseInt(var2); - break; + worldProperties = Integer.parseInt(var2); // L: 730 + break; // L: 731 case 6: - UserComparator9.clientLanguage = Language.Language_get(Integer.parseInt(var2)); - break; - case 7: - int var4 = Integer.parseInt(var2); - GameBuild[] var5 = new GameBuild[]{GameBuild.LIVE, GameBuild.WIP, GameBuild.BUILDLIVE, GameBuild.RC}; - GameBuild[] var6 = var5; - int var7 = 0; - - GameBuild var3; - while (true) { - if (var7 >= var6.length) { - var3 = null; - break; - } - - GameBuild var8 = var6[var7]; - if (var4 == var8.buildId) { - var3 = var8; - break; - } - - ++var7; + int var4 = Integer.parseInt(var2); // L: 736 + Language var3; + if (var4 >= 0 && var4 < Language.Language_valuesOrdered.length) { // L: 738 + var3 = Language.Language_valuesOrdered[var4]; // L: 742 + } else { + var3 = null; // L: 739 } - PlayerType.field3130 = var3; - break; + class58.clientLanguage = var3; // L: 744 + break; // L: 745 + case 7: + DirectByteArrayCopier.field2525 = TextureProvider.method2863(Integer.parseInt(var2)); // L: 687 + break; // L: 688 case 8: - if (var2.equalsIgnoreCase("true")) { + if (var2.equalsIgnoreCase("true")) { // L: 749 } break; case 9: - field871 = var2; - break; + class200.field2403 = var2; // L: 715 + break; // L: 716 case 10: - GrandExchangeOfferWorldComparator.field54 = (StudioGame)FaceNormal.findEnumerated(Skills.method4272(), Integer.parseInt(var2)); - if (StudioGame.oldscape == GrandExchangeOfferWorldComparator.field54) { - class195.loginType = LoginType.oldscape; + Tiles.field532 = (StudioGame)TextureProvider.findEnumerated(class41.method624(), Integer.parseInt(var2)); // L: 703 + if (StudioGame.oldscape == Tiles.field532) { // L: 704 + WorldMapAreaData.loginType = LoginType.oldscape; } else { - class195.loginType = LoginType.field4059; + WorldMapAreaData.loginType = LoginType.field4062; // L: 705 } break; case 12: - worldId = Integer.parseInt(var2); - break; + worldId = Integer.parseInt(var2); // L: 710 + break; // L: 711 case 14: - class228.field2754 = Integer.parseInt(var2); - break; + GrandExchangeOffer.field99 = Integer.parseInt(var2); // L: 725 + break; // L: 726 case 15: - gameBuild = Integer.parseInt(var2); - break; + gameBuild = Integer.parseInt(var2); // L: 720 + break; // L: 721 case 17: - HorizontalAlignment.worldListURL = var2; + BZip2State.worldListURL = var2; // L: 682 } } } - Scene.Scene_isLowDetail = false; - isLowDetail = false; - class169.worldHost = this.getCodeBase().getHost(); - String var9 = PlayerType.field3130.name; - byte var10 = 0; + HealthBarUpdate.method1818(); // L: 763 + ItemContainer.worldHost = this.getCodeBase().getHost(); // L: 764 + String var5 = DirectByteArrayCopier.field2525.name; // L: 765 + byte var6 = 0; // L: 766 try { - HealthBar.method2137("oldschool", var9, var10, 21); - } catch (Exception var11) { - class197.RunException_sendStackTrace((String)null, var11); + class90.method2138("oldschool", var5, var6, 21); // L: 768 + } catch (Exception var7) { // L: 770 + Decimator.RunException_sendStackTrace((String)null, var7); // L: 771 } - WorldMapSectionType.client = this; - RunException.clientType = clientType; - this.startThread(765, 503, 190); + class2.client = this; // L: 773 + WorldMapID.clientType = clientType; // L: 774 + this.startThread(765, 503, 191); // L: 775 } - } catch (RuntimeException var12) { - throw class1.newRunException(var12, "client.init(" + ')'); + } catch (RuntimeException var8) { + throw class25.newRunException(var8, "client.init(" + ')'); } - } + } // L: 776 - @ObfuscatedName("eg") + @ObfuscatedName("eb") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-61" + descriptor = "(I)V", + garbageValue = "858164113" ) @Export("doCycleJs5") void doCycleJs5() { - if (gameState != 1000) { - long var2 = MilliClock.currentTimeMillis(); - int var4 = (int)(var2 - FriendSystem.field1093); - FriendSystem.field1093 = var2; - if (var4 > 200) { - var4 = 200; - } - - NetCache.NetCache_loadTime += var4; - boolean var1; - if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { - var1 = true; - } else if (NetCache.NetCache_socket == null) { - var1 = false; - } else { - try { - label240: { - if (NetCache.NetCache_loadTime > 30000) { - throw new IOException(); - } - - NetFileRequest var5; - Buffer var6; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { - var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); - var6 = new Buffer(4); - var6.writeByte(1); - var6.writeMedium((int)var5.key); - NetCache.NetCache_socket.write(var6.array, 0, 4); - NetCache.NetCache_pendingPriorityResponses.put(var5, var5.key); - --NetCache.NetCache_pendingPriorityWritesCount; - ++NetCache.NetCache_pendingPriorityResponsesCount; - } - - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { - var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); - var6 = new Buffer(4); - var6.writeByte(0); - var6.writeMedium((int)var5.key); - NetCache.NetCache_socket.write(var6.array, 0, 4); - var5.removeDual(); - NetCache.NetCache_pendingResponses.put(var5, var5.key); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingResponsesCount; - } - - for (int var17 = 0; var17 < 100; ++var17) { - int var18 = NetCache.NetCache_socket.available(); - if (var18 < 0) { - throw new IOException(); - } - - if (var18 == 0) { - break; - } - - NetCache.NetCache_loadTime = 0; - byte var7 = 0; - if (PlayerType.NetCache_currentResponse == null) { - var7 = 8; - } else if (NetCache.field3214 == 0) { - var7 = 1; - } - - int var8; - int var9; - int var10; - int var12; - byte[] var10000; - int var10001; - Buffer var25; - if (var7 > 0) { - var8 = var7 - NetCache.NetCache_responseHeaderBuffer.offset; - if (var8 > var18) { - var8 = var18; - } - - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var8); - if (NetCache.field3213 != 0) { - for (var9 = 0; var9 < var8; ++var9) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var9 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3213; - } - } - - var25 = NetCache.NetCache_responseHeaderBuffer; - var25.offset += var8; - if (NetCache.NetCache_responseHeaderBuffer.offset < var7) { - break; - } - - if (PlayerType.NetCache_currentResponse == null) { - NetCache.NetCache_responseHeaderBuffer.offset = 0; - var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var10 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); - int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var12 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var13 = (long)(var10 + (var9 << 16)); - NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13); - NetCache.field3208 = true; - if (var15 == null) { - var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13); - NetCache.field3208 = false; - } - - if (var15 == null) { - throw new IOException(); - } - - int var16 = var11 == 0 ? 5 : 9; - PlayerType.NetCache_currentResponse = var15; - CollisionMap.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + PlayerType.NetCache_currentResponse.padding); - CollisionMap.NetCache_responseArchiveBuffer.writeByte(var11); - CollisionMap.NetCache_responseArchiveBuffer.writeInt(var12); - NetCache.field3214 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3214 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3214 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else { - PlayerType.NetCache_currentResponse = null; - } - } - } else { - var8 = CollisionMap.NetCache_responseArchiveBuffer.array.length - PlayerType.NetCache_currentResponse.padding; - var9 = 512 - NetCache.field3214; - if (var9 > var8 - CollisionMap.NetCache_responseArchiveBuffer.offset) { - var9 = var8 - CollisionMap.NetCache_responseArchiveBuffer.offset; - } - - if (var9 > var18) { - var9 = var18; - } - - NetCache.NetCache_socket.read(CollisionMap.NetCache_responseArchiveBuffer.array, CollisionMap.NetCache_responseArchiveBuffer.offset, var9); - if (NetCache.field3213 != 0) { - for (var10 = 0; var10 < var9; ++var10) { - var10000 = CollisionMap.NetCache_responseArchiveBuffer.array; - var10001 = CollisionMap.NetCache_responseArchiveBuffer.offset + var10; - var10000[var10001] ^= NetCache.field3213; - } - } - - var25 = CollisionMap.NetCache_responseArchiveBuffer; - var25.offset += var9; - NetCache.field3214 += var9; - if (var8 == CollisionMap.NetCache_responseArchiveBuffer.offset) { - if (16711935L == PlayerType.NetCache_currentResponse.key) { - UserComparator9.NetCache_reference = CollisionMap.NetCache_responseArchiveBuffer; - - for (var10 = 0; var10 < 256; ++var10) { - Archive var19 = NetCache.NetCache_archives[var10]; - if (var19 != null) { - UserComparator9.NetCache_reference.offset = var10 * 8 + 5; - var12 = UserComparator9.NetCache_reference.readInt(); - int var20 = UserComparator9.NetCache_reference.readInt(); - var19.loadIndex(var12, var20); - } - } - } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(CollisionMap.NetCache_responseArchiveBuffer.array, 0, var8); - var10 = (int)NetCache.NetCache_crc.getValue(); - if (var10 != PlayerType.NetCache_currentResponse.crc) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var23) { - } - - ++NetCache.NetCache_crcMismatches; - NetCache.NetCache_socket = null; - NetCache.field3213 = (byte)((int)(Math.random() * 255.0D + 1.0D)); - var1 = false; - break label240; - } - - NetCache.NetCache_crcMismatches = 0; - NetCache.NetCache_ioExceptions = 0; - PlayerType.NetCache_currentResponse.archive.write((int)(PlayerType.NetCache_currentResponse.key & 65535L), CollisionMap.NetCache_responseArchiveBuffer.array, 16711680L == (PlayerType.NetCache_currentResponse.key & 16711680L), NetCache.field3208); - } - - PlayerType.NetCache_currentResponse.remove(); - if (NetCache.field3208) { - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; - } - - NetCache.field3214 = 0; - PlayerType.NetCache_currentResponse = null; - CollisionMap.NetCache_responseArchiveBuffer = null; - } else { - if (NetCache.field3214 != 512) { - break; - } - - NetCache.field3214 = 0; - } - } - } - - var1 = true; - } - } catch (IOException var24) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var22) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - var1 = false; - } - } - - if (!var1) { + if (gameState != 1000) { // L: 1315 + boolean var1 = BoundaryObject.method3384(); // L: 1316 + if (!var1) { // L: 1317 this.doCycleJs5Connect(); } } - } + } // L: 1318 - @ObfuscatedName("ey") + @ObfuscatedName("et") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "20" + descriptor = "(I)V", + garbageValue = "-32277298" ) @Export("doCycleJs5Connect") void doCycleJs5Connect() { - if (NetCache.NetCache_crcMismatches >= 4) { - this.error("js5crc"); - gameState = 1000; + if (NetCache.NetCache_crcMismatches >= 4) { // L: 1321 + this.error("js5crc"); // L: 1322 + gameState = 1000; // L: 1323 } else { - if (NetCache.NetCache_ioExceptions >= 4) { - if (gameState <= 5) { - this.error("js5io"); - gameState = 1000; - return; + if (NetCache.NetCache_ioExceptions >= 4) { // L: 1326 + if (gameState <= 5) { // L: 1327 + this.error("js5io"); // L: 1328 + gameState = 1000; // L: 1329 + return; // L: 1330 } - field815 = 3000; - NetCache.NetCache_ioExceptions = 3; + field712 = 3000; // L: 1333 + NetCache.NetCache_ioExceptions = 3; // L: 1334 } - if (--field815 + 1 <= 0) { + if (--field712 + 1 <= 0) { // L: 1337 try { - if (js5ConnectState == 0) { - js5SocketTask = GrandExchangeOfferAgeComparator.taskHandler.newSocketTask(class169.worldHost, WorldMapLabel.port3); - ++js5ConnectState; + if (js5ConnectState == 0) { // L: 1339 + UserComparator7.js5SocketTask = GameShell.taskHandler.newSocketTask(ItemContainer.worldHost, WorldMapScaleHandler.port3); // L: 1340 + ++js5ConnectState; // L: 1341 } - if (js5ConnectState == 1) { - if (js5SocketTask.status == 2) { - this.js5Error(-1); - return; + if (js5ConnectState == 1) { // L: 1343 + if (UserComparator7.js5SocketTask.status == 2) { // L: 1344 + this.js5Error(-1); // L: 1345 + return; // L: 1346 } - if (js5SocketTask.status == 1) { + if (UserComparator7.js5SocketTask.status == 1) { // L: 1348 ++js5ConnectState; } } - if (js5ConnectState == 2) { - if (useBufferedSocket) { - GameObject.js5Socket = ClanChat.method5441((Socket)js5SocketTask.result, 40000, 5000); + if (js5ConnectState == 2) { // L: 1350 + if (useBufferedSocket) { // L: 1351 + ItemContainer.js5Socket = ModelData0.method3375((Socket)UserComparator7.js5SocketTask.result, 40000, 5000); // L: 1352 } else { - GameObject.js5Socket = new NetSocket((Socket)js5SocketTask.result, GrandExchangeOfferAgeComparator.taskHandler, 5000); + ItemContainer.js5Socket = new NetSocket((Socket)UserComparator7.js5SocketTask.result, GameShell.taskHandler, 5000); // L: 1355 } - Buffer var1 = new Buffer(5); - var1.writeByte(15); - var1.writeInt(190); - GameObject.js5Socket.write(var1.array, 0, 5); - ++js5ConnectState; - WorldMapSprite.field261 = MilliClock.currentTimeMillis(); + Buffer var1 = new Buffer(5); // L: 1357 + var1.writeByte(15); // L: 1358 + var1.writeInt(191); // L: 1359 + ItemContainer.js5Socket.write(var1.array, 0, 5); // L: 1360 + ++js5ConnectState; // L: 1361 + KeyHandler.field428 = PacketWriter.currentTimeMillis(); // L: 1362 } - if (js5ConnectState == 3) { - if (GameObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { - int var5 = GameObject.js5Socket.readUnsignedByte(); - if (var5 != 0) { - this.js5Error(var5); - return; + if (js5ConnectState == 3) { // L: 1364 + if (ItemContainer.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) { // L: 1365 + int var2 = ItemContainer.js5Socket.readUnsignedByte(); // L: 1366 + if (var2 != 0) { // L: 1367 + this.js5Error(var2); // L: 1368 + return; // L: 1369 } - ++js5ConnectState; - } else if (MilliClock.currentTimeMillis() - WorldMapSprite.field261 > 30000L) { - this.js5Error(-2); - return; + ++js5ConnectState; // L: 1371 + } else if (PacketWriter.currentTimeMillis() - KeyHandler.field428 > 30000L) { // L: 1374 + this.js5Error(-2); // L: 1375 + return; // L: 1376 } } - if (js5ConnectState == 4) { - AbstractSocket var10 = GameObject.js5Socket; - boolean var2 = gameState > 20; - if (NetCache.NetCache_socket != null) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var8) { - } - - NetCache.NetCache_socket = null; - } - - NetCache.NetCache_socket = var10; - class41.method624(var2); - NetCache.NetCache_responseHeaderBuffer.offset = 0; - PlayerType.NetCache_currentResponse = null; - CollisionMap.NetCache_responseArchiveBuffer = null; - NetCache.field3214 = 0; - - while (true) { - NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); - if (var3 == null) { - while (true) { - var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); - if (var3 == null) { - if (NetCache.field3213 != 0) { - try { - Buffer var11 = new Buffer(4); - var11.writeByte(4); - var11.writeByte(NetCache.field3213); - var11.writeShort(0); - NetCache.NetCache_socket.write(var11.array, 0, 4); - } catch (IOException var7) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var6) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - } - - NetCache.NetCache_loadTime = 0; - FriendSystem.field1093 = MilliClock.currentTimeMillis(); - js5SocketTask = null; - GameObject.js5Socket = null; - js5ConnectState = 0; - js5Errors = 0; - return; - } - - NetCache.NetCache_pendingWritesQueue.addLast(var3); - NetCache.NetCache_pendingWrites.put(var3, var3.key); - ++NetCache.NetCache_pendingWritesCount; - --NetCache.NetCache_pendingResponsesCount; - } - } - - NetCache.NetCache_pendingPriorityWrites.put(var3, var3.key); - ++NetCache.NetCache_pendingPriorityWritesCount; - --NetCache.NetCache_pendingPriorityResponsesCount; - } + if (js5ConnectState == 4) { // L: 1380 + Widget.method4173(ItemContainer.js5Socket, gameState > 20); // L: 1381 + UserComparator7.js5SocketTask = null; // L: 1382 + ItemContainer.js5Socket = null; // L: 1383 + js5ConnectState = 0; // L: 1384 + js5Errors = 0; // L: 1385 } - } catch (IOException var9) { - this.js5Error(-3); + } catch (IOException var3) { // L: 1388 + this.js5Error(-3); // L: 1389 } } } - } + } // L: 1324 1391 - @ObfuscatedName("ew") + @ObfuscatedName("ef") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "35" + descriptor = "(II)V", + garbageValue = "1255510114" ) @Export("js5Error") void js5Error(int var1) { - js5SocketTask = null; - GameObject.js5Socket = null; - js5ConnectState = 0; - if (WorldMapLabel.port3 == class90.port1) { - WorldMapLabel.port3 = port2; + UserComparator7.js5SocketTask = null; // L: 1394 + ItemContainer.js5Socket = null; // L: 1395 + js5ConnectState = 0; // L: 1396 + if (WorldMapScaleHandler.port3 == port1) { // L: 1397 + WorldMapScaleHandler.port3 = class23.port2; } else { - WorldMapLabel.port3 = class90.port1; + WorldMapScaleHandler.port3 = port1; // L: 1398 } - ++js5Errors; - if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { - if (gameState <= 5) { - this.error("js5connect_full"); - gameState = 1000; + ++js5Errors; // L: 1399 + if (js5Errors >= 2 && (var1 == 7 || var1 == 9)) { // L: 1400 + if (gameState <= 5) { // L: 1401 + this.error("js5connect_full"); // L: 1402 + gameState = 1000; // L: 1403 } else { - field815 = 3000; + field712 = 3000; // L: 1405 } - } else if (js5Errors >= 2 && var1 == 6) { - this.error("js5connect_outofdate"); - gameState = 1000; - } else if (js5Errors >= 4) { - if (gameState <= 5) { - this.error("js5connect"); - gameState = 1000; + } else if (js5Errors >= 2 && var1 == 6) { // L: 1407 + this.error("js5connect_outofdate"); // L: 1408 + gameState = 1000; // L: 1409 + } else if (js5Errors >= 4) { // L: 1411 + if (gameState <= 5) { // L: 1412 + this.error("js5connect"); // L: 1413 + gameState = 1000; // L: 1414 } else { - field815 = 3000; + field712 = 3000; // L: 1416 } } - } + } // L: 1418 - @ObfuscatedName("ee") + @ObfuscatedName("ei") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "599725078" + garbageValue = "-407945770" ) @Export("doCycleLoggedOut") final void doCycleLoggedOut() { - Object var1 = packetWriter.getSocket(); - PacketBuffer var2 = packetWriter.packetBuffer; + Object var1 = packetWriter.getSocket(); // L: 1853 + PacketBuffer var2 = packetWriter.packetBuffer; // L: 1854 try { - if (loginState == 0) { - if (ChatChannel.secureRandom == null && (secureRandomFuture.isDone() || field705 > 250)) { - ChatChannel.secureRandom = secureRandomFuture.get(); - secureRandomFuture.shutdown(); - secureRandomFuture = null; + if (loginState == 0) { // L: 1856 + if (WorldMapID.secureRandom == null && (secureRandomFuture.isDone() || field822 > 250)) { // L: 1857 + WorldMapID.secureRandom = secureRandomFuture.get(); // L: 1858 + secureRandomFuture.shutdown(); // L: 1859 + secureRandomFuture = null; // L: 1860 } - if (ChatChannel.secureRandom != null) { - if (var1 != null) { - ((AbstractSocket)var1).close(); - var1 = null; + if (WorldMapID.secureRandom != null) { // L: 1862 + if (var1 != null) { // L: 1863 + ((AbstractSocket)var1).close(); // L: 1864 + var1 = null; // L: 1865 } - ArchiveLoader.socketTask = null; - field722 = false; - field705 = 0; - loginState = 1; + MouseRecorder.socketTask = null; // L: 1867 + field713 = false; // L: 1868 + field822 = 0; // L: 1869 + loginState = 1; // L: 1870 } } - if (loginState == 1) { - if (ArchiveLoader.socketTask == null) { - ArchiveLoader.socketTask = GrandExchangeOfferAgeComparator.taskHandler.newSocketTask(class169.worldHost, WorldMapLabel.port3); + if (loginState == 1) { // L: 1873 + if (MouseRecorder.socketTask == null) { // L: 1874 + MouseRecorder.socketTask = GameShell.taskHandler.newSocketTask(ItemContainer.worldHost, WorldMapScaleHandler.port3); // L: 1875 } - if (ArchiveLoader.socketTask.status == 2) { + if (MouseRecorder.socketTask.status == 2) { // L: 1877 throw new IOException(); } - if (ArchiveLoader.socketTask.status == 1) { - if (useBufferedSocket) { - var1 = ClanChat.method5441((Socket)ArchiveLoader.socketTask.result, 40000, 5000); + if (MouseRecorder.socketTask.status == 1) { // L: 1878 + if (useBufferedSocket) { // L: 1879 + var1 = ModelData0.method3375((Socket)MouseRecorder.socketTask.result, 40000, 5000); // L: 1880 } else { - var1 = new NetSocket((Socket)ArchiveLoader.socketTask.result, GrandExchangeOfferAgeComparator.taskHandler, 5000); + var1 = new NetSocket((Socket)MouseRecorder.socketTask.result, GameShell.taskHandler, 5000); // L: 1883 } - packetWriter.setSocket((AbstractSocket)var1); - ArchiveLoader.socketTask = null; - loginState = 2; + packetWriter.setSocket((AbstractSocket)var1); // L: 1885 + MouseRecorder.socketTask = null; // L: 1886 + loginState = 2; // L: 1887 } } PacketBufferNode var3; - if (loginState == 2) { - packetWriter.clearBuffer(); - var3 = Tile.method2990(); - var3.packetBuffer.writeByte(LoginPacket.field2352.id); - packetWriter.addNode(var3); - packetWriter.flush(); - var2.offset = 0; - loginState = 3; + if (loginState == 2) { // L: 1890 + packetWriter.clearBuffer(); // L: 1891 + var3 = Archive.method4385(); // L: 1892 + var3.packetBuffer.writeByte(LoginPacket.field2360.id); // L: 1893 + packetWriter.addNode(var3); // L: 1894 + packetWriter.flush(); // L: 1895 + var2.offset = 0; // L: 1896 + loginState = 3; // L: 1897 } int var4; - boolean var13; - if (loginState == 3) { - if (class2.pcmPlayer0 != null) { - class2.pcmPlayer0.method2560(); + boolean var12; + if (loginState == 3) { // L: 1899 + if (WorldMapManager.pcmPlayer0 != null) { // L: 1900 + WorldMapManager.pcmPlayer0.method2517(); } - if (class58.pcmPlayer1 != null) { - class58.pcmPlayer1.method2560(); + if (IntHashTable.pcmPlayer1 != null) { // L: 1901 + IntHashTable.pcmPlayer1.method2517(); } - var13 = true; - if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { - var13 = false; + var12 = true; // L: 1902 + if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) { // L: 1903 1904 + var12 = false; } - if (var13) { - var4 = ((AbstractSocket)var1).readUnsignedByte(); - if (class2.pcmPlayer0 != null) { - class2.pcmPlayer0.method2560(); + if (var12) { // L: 1906 + var4 = ((AbstractSocket)var1).readUnsignedByte(); // L: 1907 + if (WorldMapManager.pcmPlayer0 != null) { // L: 1908 + WorldMapManager.pcmPlayer0.method2517(); } - if (class58.pcmPlayer1 != null) { - class58.pcmPlayer1.method2560(); + if (IntHashTable.pcmPlayer1 != null) { // L: 1909 + IntHashTable.pcmPlayer1.method2517(); } - if (var4 != 0) { - class22.getLoginError(var4); - return; + if (var4 != 0) { // L: 1910 + class58.getLoginError(var4); // L: 1911 + return; // L: 1912 } - var2.offset = 0; - loginState = 4; + var2.offset = 0; // L: 1914 + loginState = 4; // L: 1915 } } - int var32; - if (loginState == 4) { - if (var2.offset < 8) { - var32 = ((AbstractSocket)var1).available(); - if (var32 > 8 - var2.offset) { - var32 = 8 - var2.offset; + int var34; + if (loginState == 4) { // L: 1918 + if (var2.offset < 8) { // L: 1919 + var34 = ((AbstractSocket)var1).available(); // L: 1920 + if (var34 > 8 - var2.offset) { // L: 1921 + var34 = 8 - var2.offset; } - if (var32 > 0) { - ((AbstractSocket)var1).read(var2.array, var2.offset, var32); - var2.offset += var32; + if (var34 > 0) { // L: 1922 + ((AbstractSocket)var1).read(var2.array, var2.offset, var34); // L: 1923 + var2.offset += var34; // L: 1924 } } - if (var2.offset == 8) { - var2.offset = 0; - MilliClock.field2046 = var2.readLong(); - loginState = 5; + if (var2.offset == 8) { // L: 1927 + var2.offset = 0; // L: 1928 + PcmPlayer.field1430 = var2.readLong(); // L: 1929 + loginState = 5; // L: 1930 } } - int var6; - if (loginState == 5) { - packetWriter.packetBuffer.offset = 0; - packetWriter.clearBuffer(); - PacketBuffer var23 = new PacketBuffer(500); - int[] var14 = new int[]{ChatChannel.secureRandom.nextInt(), ChatChannel.secureRandom.nextInt(), ChatChannel.secureRandom.nextInt(), ChatChannel.secureRandom.nextInt()}; - var23.offset = 0; - var23.writeByte(1); - var23.writeInt(var14[0]); - var23.writeInt(var14[1]); - var23.writeInt(var14[2]); - var23.writeInt(var14[3]); - var23.writeLong(MilliClock.field2046); - if (gameState == 40) { - var23.writeInt(class7.field28[0]); - var23.writeInt(class7.field28[1]); - var23.writeInt(class7.field28[2]); - var23.writeInt(class7.field28[3]); + int var7; + int var9; + int var14; + if (loginState == 5) { // L: 1933 + packetWriter.packetBuffer.offset = 0; // L: 1934 + packetWriter.clearBuffer(); // L: 1935 + PacketBuffer var22 = new PacketBuffer(500); // L: 1936 + int[] var13 = new int[]{WorldMapID.secureRandom.nextInt(), WorldMapID.secureRandom.nextInt(), WorldMapID.secureRandom.nextInt(), WorldMapID.secureRandom.nextInt()}; // L: 1937 1938 1939 1940 1941 + var22.offset = 0; // L: 1942 + var22.writeByte(1); // L: 1943 + var22.writeInt(var13[0]); // L: 1944 + var22.writeInt(var13[1]); // L: 1945 + var22.writeInt(var13[2]); // L: 1946 + var22.writeInt(var13[3]); // L: 1947 + var22.writeLong(PcmPlayer.field1430); // L: 1948 + int var10; + if (gameState == 40) { // L: 1949 + var22.writeInt(UserComparator10.field2017[0]); // L: 1950 + var22.writeInt(UserComparator10.field2017[1]); // L: 1951 + var22.writeInt(UserComparator10.field2017[2]); // L: 1952 + var22.writeInt(UserComparator10.field2017[3]); // L: 1953 } else { - var23.writeByte(field708.rsOrdinal()); - switch(field708.field2026) { + var22.writeByte(field710.rsOrdinal()); // L: 1956 + switch(field710.field2042) { // L: 1957 case 0: - var23.writeInt((Integer)NetSocket.clientPreferences.parameters.get(WorldMapAreaData.method759(Login.Login_username))); - break; case 1: - case 3: - var23.writeMedium(WorldMapSprite.field264); - ++var23.offset; - break; + var22.writeMedium(LoginScreenAnimation.field1070); // L: 1966 + ++var22.offset; // L: 1967 + break; // L: 1968 case 2: - var23.offset += 4; + var22.offset += 4; // L: 1960 + break; // L: 1961 + case 3: + LinkedHashMap var6 = Tile.clientPreferences.parameters; // L: 1973 + String var8 = Login.Login_username; // L: 1975 + var9 = var8.length(); // L: 1977 + var10 = 0; // L: 1978 + + for (int var11 = 0; var11 < var9; ++var11) { // L: 1979 + var10 = (var10 << 5) - var10 + var8.charAt(var11); + } + + var22.writeInt((Integer)var6.get(var10)); // L: 1982 } - var23.writeByte(class322.field3841.rsOrdinal()); - var23.writeStringCp1252NullTerminated(Login.Login_password); + var22.writeByte(class322.field3841.rsOrdinal()); // L: 1986 + var22.writeStringCp1252NullTerminated(Login.Login_password); // L: 1987 } - var23.encryptRsa(class92.field1188, class92.field1189); - class7.field28 = var14; - PacketBufferNode var5 = Tile.method2990(); - var5.packetBuffer.offset = 0; - if (gameState == 40) { - var5.packetBuffer.writeByte(LoginPacket.field2348.id); + var22.encryptRsa(class92.field1186, class92.field1187); // L: 1989 + UserComparator10.field2017 = var13; // L: 1990 + PacketBufferNode var5 = Archive.method4385(); // L: 1991 + var5.packetBuffer.offset = 0; // L: 1992 + if (gameState == 40) { // L: 1993 + var5.packetBuffer.writeByte(LoginPacket.field2352.id); // L: 1994 } else { - var5.packetBuffer.writeByte(LoginPacket.field2347.id); + var5.packetBuffer.writeByte(LoginPacket.field2351.id); // L: 1997 } - var5.packetBuffer.writeShort(0); - var6 = var5.packetBuffer.offset; - var5.packetBuffer.writeInt(190); - var5.packetBuffer.writeInt(1); - var5.packetBuffer.writeByte(clientType); - var5.packetBuffer.writeBytes(var23.array, 0, var23.offset); - int var7 = var5.packetBuffer.offset; - var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); - var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); - var5.packetBuffer.writeShort(Varcs.canvasWidth); - var5.packetBuffer.writeShort(class52.canvasHeight); - PacketBuffer var8 = var5.packetBuffer; - int var11; - if (randomDatData != null) { - var8.writeBytes(randomDatData, 0, randomDatData.length); - } else { - byte[] var10 = new byte[24]; + var5.packetBuffer.writeShort(0); // L: 1999 + var14 = var5.packetBuffer.offset; // L: 2000 + var5.packetBuffer.writeInt(191); // L: 2001 + var5.packetBuffer.writeInt(1); // L: 2002 + var5.packetBuffer.writeByte(clientType); // L: 2003 + var5.packetBuffer.writeBytes(var22.array, 0, var22.offset); // L: 2004 + var7 = var5.packetBuffer.offset; // L: 2005 + var5.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username); // L: 2006 + var5.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0)); // L: 2007 + var5.packetBuffer.writeShort(FloorDecoration.canvasWidth); // L: 2008 + var5.packetBuffer.writeShort(GameShell.canvasHeight); // L: 2009 + WorldMapData_1.method783(var5.packetBuffer); // L: 2010 + var5.packetBuffer.writeStringCp1252NullTerminated(class200.field2403); // L: 2011 + var5.packetBuffer.writeInt(GrandExchangeOffer.field99); // L: 2012 + Buffer var32 = new Buffer(WorldMapArea.platformInfo.size()); // L: 2013 + WorldMapArea.platformInfo.write(var32); // L: 2014 + var5.packetBuffer.writeBytes(var32.array, 0, var32.array.length); // L: 2015 + var5.packetBuffer.writeByte(clientType); // L: 2016 + var5.packetBuffer.writeInt(0); // L: 2017 + var5.packetBuffer.method5663(WorldMapData_1.archive19.hash); // L: 2018 + var5.packetBuffer.method5663(PlayerAppearance.archive14.hash); // L: 2019 + var5.packetBuffer.writeShortLE(Occluder.archive10.hash); // L: 2020 + var5.packetBuffer.method5662(Huffman.archive8.hash); // L: 2021 + var5.packetBuffer.writeInt(FontName.archive20.hash); // L: 2022 + var5.packetBuffer.method5663(MouseRecorder.archive18.hash); // L: 2023 + var5.packetBuffer.writeShortLE(GrandExchangeOfferUnitPriceComparator.archive4.hash); // L: 2024 + var5.packetBuffer.writeShortLE(PlayerAppearance.archive15.hash); // L: 2025 + var5.packetBuffer.method5662(GrandExchangeEvent.archive11.hash); // L: 2026 + var5.packetBuffer.method5663(WorldMapID.archive3.hash); // L: 2027 + var5.packetBuffer.method5663(TilePaint.archive13.hash); // L: 2028 + var5.packetBuffer.method5663(WorldMapSection1.archive7.hash); // L: 2029 + var5.packetBuffer.writeShortLE(class3.archive17.hash); // L: 2030 + var5.packetBuffer.writeInt(archive1.hash); // L: 2031 + var5.packetBuffer.method5663(0); // L: 2032 + var5.packetBuffer.writeInt(ApproximateRouteStrategy.archive12.hash); // L: 2033 + var5.packetBuffer.method5663(UrlRequester.archive9.hash); // L: 2034 + var5.packetBuffer.method5663(class182.archive0.hash); // L: 2035 + var5.packetBuffer.writeInt(NetFileRequest.archive2.hash); // L: 2036 + var5.packetBuffer.writeInt(CollisionMap.archive6.hash); // L: 2037 + var5.packetBuffer.method5663(WorldMapLabel.archive5.hash); // L: 2038 + var5.packetBuffer.xteaEncrypt(var13, var7, var5.packetBuffer.offset); // L: 2039 + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 2040 + packetWriter.addNode(var5); // L: 2041 + packetWriter.flush(); // L: 2042 + packetWriter.isaacCipher = new IsaacCipher(var13); // L: 2043 + int[] var15 = new int[4]; // L: 2044 - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var10); - - for (var11 = 0; var11 < 24 && var10[var11] == 0; ++var11) { - } - - if (var11 >= 24) { - throw new IOException(); - } - } catch (Exception var21) { - for (int var12 = 0; var12 < 24; ++var12) { - var10[var12] = -1; - } - } - - var8.writeBytes(var10, 0, var10.length); + for (var10 = 0; var10 < 4; ++var10) { // L: 2045 + var15[var10] = var13[var10] + 50; } - var5.packetBuffer.writeStringCp1252NullTerminated(field871); - var5.packetBuffer.writeInt(class228.field2754); - Buffer var9 = new Buffer(class13.platformInfo.size()); - class13.platformInfo.write(var9); - var5.packetBuffer.writeBytes(var9.array, 0, var9.array.length); - var5.packetBuffer.writeByte(clientType); - var5.packetBuffer.writeInt(0); - var5.packetBuffer.method5764(UserComparator7.archive6.hash); - var5.packetBuffer.method5762(Clock.archive2.hash); - var5.packetBuffer.writeShortLE(WorldMapData_0.archive11.hash); - var5.packetBuffer.method5764(Projectile.archive7.hash); - var5.packetBuffer.writeShortLE(GrandExchangeEvent.archive8.hash); - var5.packetBuffer.writeShortLE(Message.archive12.hash); - var5.packetBuffer.method5764(WorldMapData_0.archive19.hash); - var5.packetBuffer.method5762(GameBuild.archive13.hash); - var5.packetBuffer.writeShortLE(VarcInt.archive18.hash); - var5.packetBuffer.method5764(WorldMapIcon_1.archive14.hash); - var5.packetBuffer.method5762(AbstractWorldMapIcon.archive17.hash); - var5.packetBuffer.writeShortLE(Tile.archive9.hash); - var5.packetBuffer.method5762(WorldMapRectangle.archive5.hash); - var5.packetBuffer.writeShortLE(Message.archive1.hash); - var5.packetBuffer.method5762(ClientPacket.archive20.hash); - var5.packetBuffer.method5762(0); - var5.packetBuffer.writeInt(WorldMapLabel.archive15.hash); - var5.packetBuffer.method5762(GraphicsObject.archive10.hash); - var5.packetBuffer.method5762(class105.archive3.hash); - var5.packetBuffer.writeInt(GrandExchangeOffer.archive4.hash); - var5.packetBuffer.method5762(MilliClock.archive0.hash); - var5.packetBuffer.xteaEncrypt(var14, var7, var5.packetBuffer.offset); - var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var6); - packetWriter.addNode(var5); - packetWriter.flush(); - packetWriter.isaacCipher = new IsaacCipher(var14); - int[] var31 = new int[4]; - - for (var11 = 0; var11 < 4; ++var11) { - var31[var11] = var14[var11] + 50; - } - - var2.newIsaacCipher(var31); - loginState = 6; + var2.newIsaacCipher(var15); // L: 2046 + loginState = 6; // L: 2047 } - if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { - var32 = ((AbstractSocket)var1).readUnsignedByte(); - if (var32 == 21 && gameState == 20) { - loginState = 12; - } else if (var32 == 2) { - loginState = 14; - } else if (var32 == 15 && gameState == 40) { - packetWriter.serverPacketLength = -1; - loginState = 19; - } else if (var32 == 64) { - loginState = 10; - } else if (var32 == 23 && field706 < 1) { - ++field706; - loginState = 0; - } else if (var32 == 29) { - loginState = 17; + if (loginState == 6 && ((AbstractSocket)var1).available() > 0) { // L: 2049 2050 + var34 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2051 + if (var34 == 21 && gameState == 20) { // L: 2052 + loginState = 12; // L: 2053 + } else if (var34 == 2) { // L: 2055 + loginState = 14; // L: 2056 + } else if (var34 == 15 && gameState == 40) { // L: 2058 + packetWriter.serverPacketLength = -1; // L: 2059 + loginState = 19; // L: 2060 + } else if (var34 == 64) { // L: 2062 + loginState = 10; // L: 2063 + } else if (var34 == 23 && field708 < 1) { // L: 2065 + ++field708; // L: 2066 + loginState = 0; // L: 2067 + } else if (var34 == 29) { // L: 2069 + loginState = 17; // L: 2070 } else { - if (var32 != 69) { - class22.getLoginError(var32); - return; + if (var34 != 69) { // L: 2072 + class58.getLoginError(var34); // L: 2076 + return; // L: 2077 } - loginState = 7; + loginState = 7; // L: 2073 } } - if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - WorldMapSectionType.field174 = var2.readUnsignedShort(); - loginState = 8; + if (loginState == 7 && ((AbstractSocket)var1).available() >= 2) { // L: 2081 2082 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2083 + var2.offset = 0; // L: 2084 + WorldMapIcon_1.field212 = var2.readUnsignedShort(); // L: 2085 + loginState = 8; // L: 2086 } - if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSectionType.field174) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, var2.offset, WorldMapSectionType.field174); - class7 var24 = class3.method41()[var2.readUnsignedByte()]; + if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapIcon_1.field212) { // L: 2089 2090 + var2.offset = 0; // L: 2091 + ((AbstractSocket)var1).read(var2.array, var2.offset, WorldMapIcon_1.field212); // L: 2092 + class7[] var23 = new class7[]{class7.field37}; // L: 2095 + class7 var35 = var23[var2.readUnsignedByte()]; // L: 2097 try { - switch(var24.field26) { - case 0: - class5 var33 = new class5(); - this.field851 = new class9(var2, var33); - loginState = 9; - break; - default: - throw new IllegalArgumentException(); - } - } catch (Exception var20) { - class22.getLoginError(22); - return; + class12 var27 = class7.method102(var35); // L: 2099 + this.field714 = new class9(var2, var27); // L: 2100 + loginState = 9; // L: 2101 + } catch (Exception var20) { // L: 2103 + class58.getLoginError(22); // L: 2104 + return; // L: 2105 } } - if (loginState == 9 && this.field851.method106()) { - this.field929 = this.field851.method108(); - this.field851.method107(); - this.field851 = null; - if (this.field929 == null) { - class22.getLoginError(22); - return; + if (loginState == 9 && this.field714.method109()) { // L: 2109 2110 + this.field754 = this.field714.method122(); // L: 2111 + this.field714.method110(); // L: 2112 + this.field714 = null; // L: 2113 + if (this.field754 == null) { // L: 2114 + class58.getLoginError(22); // L: 2115 + return; // L: 2116 } - packetWriter.clearBuffer(); - var3 = Tile.method2990(); - var3.packetBuffer.writeByte(LoginPacket.field2345.id); - var3.packetBuffer.writeShort(this.field929.offset); - var3.packetBuffer.method5711(this.field929); - packetWriter.addNode(var3); - packetWriter.flush(); - this.field929 = null; - loginState = 6; + packetWriter.clearBuffer(); // L: 2118 + var3 = Archive.method4385(); // L: 2119 + var3.packetBuffer.writeByte(LoginPacket.field2353.id); // L: 2120 + var3.packetBuffer.writeShort(this.field754.offset); // L: 2121 + var3.packetBuffer.method5611(this.field754); // L: 2122 + packetWriter.addNode(var3); // L: 2123 + packetWriter.flush(); // L: 2124 + this.field754 = null; // L: 2125 + loginState = 6; // L: 2126 } - if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { - WorldMapDecoration.field238 = ((AbstractSocket)var1).readUnsignedByte(); - loginState = 11; + if (loginState == 10 && ((AbstractSocket)var1).available() > 0) { // L: 2129 2130 + class60.field456 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2131 + loginState = 11; // L: 2132 } - if (loginState == 11 && ((AbstractSocket)var1).available() >= WorldMapDecoration.field238) { - ((AbstractSocket)var1).read(var2.array, 0, WorldMapDecoration.field238); - var2.offset = 0; - loginState = 6; + if (loginState == 11 && ((AbstractSocket)var1).available() >= class60.field456) { // L: 2135 2136 + ((AbstractSocket)var1).read(var2.array, 0, class60.field456); // L: 2137 + var2.offset = 0; // L: 2138 + loginState = 6; // L: 2139 } - if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { - field675 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; - loginState = 13; + if (loginState == 12 && ((AbstractSocket)var1).available() > 0) { // L: 2142 2143 + field709 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60; // L: 2144 + loginState = 13; // L: 2145 } - if (loginState == 13) { - field705 = 0; - MusicPatchPcmStream.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field675 / 60 + " seconds."); - if (--field675 <= 0) { + if (loginState == 13) { // L: 2148 + field822 = 0; // L: 2149 + UrlRequester.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field709 / 60 + " seconds."); // L: 2150 + if (--field709 <= 0) { // L: 2151 loginState = 0; } } else { - if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { - WorldMapSprite.field254 = ((AbstractSocket)var1).readUnsignedByte(); - loginState = 15; + if (loginState == 14 && ((AbstractSocket)var1).available() >= 1) { // L: 2154 2155 + LoginScreenAnimation.field1076 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2156 + loginState = 15; // L: 2157 } - int var16; - if (loginState == 15 && ((AbstractSocket)var1).available() >= WorldMapSprite.field254) { - var13 = ((AbstractSocket)var1).readUnsignedByte() == 1; - ((AbstractSocket)var1).read(var2.array, 0, 4); - var2.offset = 0; - boolean var25 = false; - if (var13) { - var4 = var2.readByteIsaac() << 24; - var4 |= var2.readByteIsaac() << 16; - var4 |= var2.readByteIsaac() << 8; - var4 |= var2.readByteIsaac(); - var16 = WorldMapAreaData.method759(Login.Login_username); - if (NetSocket.clientPreferences.parameters.size() >= 10 && !NetSocket.clientPreferences.parameters.containsKey(var16)) { - Iterator var17 = NetSocket.clientPreferences.parameters.entrySet().iterator(); - var17.next(); - var17.remove(); + if (loginState == 15 && ((AbstractSocket)var1).available() >= LoginScreenAnimation.field1076) { // L: 2160 2161 + var12 = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2162 + ((AbstractSocket)var1).read(var2.array, 0, 4); // L: 2163 + var2.offset = 0; // L: 2164 + boolean var24 = false; // L: 2165 + if (var12) { // L: 2166 + var4 = var2.readByteIsaac() << 24; // L: 2167 + var4 |= var2.readByteIsaac() << 16; // L: 2168 + var4 |= var2.readByteIsaac() << 8; // L: 2169 + var4 |= var2.readByteIsaac(); // L: 2170 + String var30 = Login.Login_username; // L: 2172 + var7 = var30.length(); // L: 2174 + int var16 = 0; // L: 2175 + var9 = 0; // L: 2176 + + while (true) { + if (var9 >= var7) { + if (Tile.clientPreferences.parameters.size() >= 10 && !Tile.clientPreferences.parameters.containsKey(var16)) { // L: 2180 2181 + Iterator var33 = Tile.clientPreferences.parameters.entrySet().iterator(); // L: 2182 + var33.next(); // L: 2183 + var33.remove(); // L: 2184 + } + + Tile.clientPreferences.parameters.put(var16, var4); // L: 2187 + break; + } + + var16 = (var16 << 5) - var16 + var30.charAt(var9); + ++var9; } - - NetSocket.clientPreferences.parameters.put(var16, var4); } - if (Login_isUsernameRemembered) { - NetSocket.clientPreferences.rememberedUsername = Login.Login_username; + if (Login_isUsernameRemembered) { // L: 2189 + Tile.clientPreferences.rememberedUsername = Login.Login_username; // L: 2190 } else { - NetSocket.clientPreferences.rememberedUsername = null; + Tile.clientPreferences.rememberedUsername = null; // L: 2193 } - SpriteMask.savePreferences(); - staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); - playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; - localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); - localPlayerIndex <<= 8; - localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); - field791 = ((AbstractSocket)var1).readUnsignedByte(); - ((AbstractSocket)var1).read(var2.array, 0, 1); - var2.offset = 0; - ServerPacket[] var28 = StructDefinition.ServerPacket_values(); - var6 = var2.readSmartByteShortIsaac(); - if (var6 < 0 || var6 >= var28.length) { - throw new IOException(var6 + " " + var2.offset); + WorldMapData_1.savePreferences(); // L: 2195 + staffModLevel = ((AbstractSocket)var1).readUnsignedByte(); // L: 2196 + playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1; // L: 2197 + localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte(); // L: 2198 + localPlayerIndex <<= 8; // L: 2199 + localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte(); // L: 2200 + field888 = ((AbstractSocket)var1).readUnsignedByte(); // L: 2201 + ((AbstractSocket)var1).read(var2.array, 0, 1); // L: 2202 + var2.offset = 0; // L: 2203 + ServerPacket[] var28 = class198.ServerPacket_values(); // L: 2204 + var14 = var2.readSmartByteShortIsaac(); // L: 2205 + if (var14 < 0 || var14 >= var28.length) { // L: 2206 + throw new IOException(var14 + " " + var2.offset); } - packetWriter.serverPacket = var28[var6]; - packetWriter.serverPacketLength = packetWriter.serverPacket.length; - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - packetWriter.serverPacketLength = var2.readUnsignedShort(); + packetWriter.serverPacket = var28[var14]; // L: 2207 + packetWriter.serverPacketLength = packetWriter.serverPacket.length; // L: 2208 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2209 + var2.offset = 0; // L: 2210 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2211 try { - Client var18 = WorldMapSectionType.client; - JSObject.getWindow(var18).call("zap", (Object[])null); - } catch (Throwable var19) { + Client var18 = class2.client; // L: 2213 + JSObject.getWindow(var18).call("zap", (Object[])null); // L: 2216 + } catch (Throwable var19) { // L: 2219 } - loginState = 16; + loginState = 16; // L: 2220 } - if (loginState == 16) { - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - timer.method5178(); - mouseLastLastPressedTimeMillis = -1L; - class219.mouseRecorder.index = 0; - WorldMapArea.hasFocus = true; - hadFocus = true; - field897 = -1L; - class90.method2164(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1350 = null; - packetWriter.field1351 = null; - packetWriter.field1342 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1348 = 0; - rebootTimer = 0; - logoutTimer = 0; - hintArrowType = 0; - menuOptionsCount = 0; - isMenuOpen = false; - MouseHandler.MouseHandler_idleCycles = 0; - LoginScreenAnimation.method1906(); - isItemSelected = 0; - isSpellSelected = false; - soundEffectCount = 0; - camAngleY = 0; - oculusOrbState = 0; - class278.field3585 = null; - minimapState = 0; - field937 = -1; - destinationX = 0; - destinationY = 0; - playerAttackOption = AttackOption.AttackOption_hidden; - npcAttackOption = AttackOption.AttackOption_hidden; - npcCount = 0; - NPC.method2156(); + if (loginState == 16) { // L: 2223 + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2224 + var2.offset = 0; // L: 2225 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2226 + timer.method5100(); // L: 2227 + mouseLastLastPressedTimeMillis = -1L; // L: 2230 + ByteArrayPool.mouseRecorder.index = 0; // L: 2231 + GameShell.hasFocus = true; // L: 2232 + hadFocus = true; // L: 2233 + field901 = -1L; // L: 2234 + class171.method3543(); // L: 2235 + packetWriter.clearBuffer(); // L: 2236 + packetWriter.packetBuffer.offset = 0; // L: 2237 + packetWriter.serverPacket = null; // L: 2238 + packetWriter.field1336 = null; // L: 2239 + packetWriter.field1348 = null; // L: 2240 + packetWriter.field1346 = null; // L: 2241 + packetWriter.serverPacketLength = 0; // L: 2242 + packetWriter.field1345 = 0; // L: 2243 + rebootTimer = 0; // L: 2244 + logoutTimer = 0; // L: 2245 + hintArrowType = 0; // L: 2246 + class279.method5091(); // L: 2247 + MouseHandler.MouseHandler_idleCycles = 0; // L: 2249 + Messages.Messages_channels.clear(); // L: 2252 + Messages.Messages_hashTable.clear(); // L: 2253 + Messages.Messages_queue.clear(); // L: 2254 + Messages.Messages_count = 0; // L: 2255 + isItemSelected = 0; // L: 2257 + isSpellSelected = false; // L: 2258 + soundEffectCount = 0; // L: 2259 + camAngleY = 0; // L: 2260 + oculusOrbState = 0; // L: 2261 + ModelData0.field1901 = null; // L: 2262 + minimapState = 0; // L: 2263 + field902 = -1; // L: 2264 + destinationX = 0; // L: 2265 + destinationY = 0; // L: 2266 + playerAttackOption = AttackOption.AttackOption_hidden; // L: 2267 + npcAttackOption = AttackOption.AttackOption_hidden; // L: 2268 + npcCount = 0; // L: 2269 + WorldMapRectangle.method361(); // L: 2270 - for (var32 = 0; var32 < 2048; ++var32) { - players[var32] = null; + for (var34 = 0; var34 < 2048; ++var34) { // L: 2271 + players[var34] = null; } - for (var32 = 0; var32 < 32768; ++var32) { - npcs[var32] = null; + for (var34 = 0; var34 < 32768; ++var34) { // L: 2272 + npcs[var34] = null; } - combatTargetPlayerIndex = -1; - projectiles.clear(); - graphicsObjects.clear(); + combatTargetPlayerIndex = -1; // L: 2273 + projectiles.clear(); // L: 2274 + graphicsObjects.clear(); // L: 2275 - for (var32 = 0; var32 < 4; ++var32) { - for (var4 = 0; var4 < 104; ++var4) { - for (var16 = 0; var16 < 104; ++var16) { - groundItems[var32][var4][var16] = null; + for (var34 = 0; var34 < 4; ++var34) { // L: 2276 + for (var4 = 0; var4 < 104; ++var4) { // L: 2277 + for (int var17 = 0; var17 < 104; ++var17) { // L: 2278 + groundItems[var34][var4][var17] = null; // L: 2279 } } } - pendingSpawns = new NodeDeque(); - ModeWhere.friendSystem.clear(); + pendingSpawns = new NodeDeque(); // L: 2283 + class60.friendSystem.clear(); // L: 2284 - for (var32 = 0; var32 < VarpDefinition.VarpDefinition_fileCount; ++var32) { - VarpDefinition var36 = class219.VarpDefinition_get(var32); - if (var36 != null) { - Varps.Varps_temp[var32] = 0; - Varps.Varps_main[var32] = 0; + for (var34 = 0; var34 < VarpDefinition.VarpDefinition_fileCount; ++var34) { // L: 2285 + VarpDefinition var37 = class195.VarpDefinition_get(var34); // L: 2286 + if (var37 != null) { // L: 2287 + Varps.Varps_temp[var34] = 0; // L: 2288 + Varps.Varps_main[var34] = 0; // L: 2289 } } - AttackOption.varcs.clearTransient(); - followerIndex = -1; - if (rootInterface != -1) { - Tiles.method1200(rootInterface); + ClientPreferences.varcs.clearTransient(); // L: 2292 + followerIndex = -1; // L: 2293 + if (rootInterface != -1) { // L: 2294 + SecureRandomFuture.method2225(rootInterface); } - for (InterfaceParent var27 = (InterfaceParent)interfaceParents.first(); var27 != null; var27 = (InterfaceParent)interfaceParents.next()) { - class41.closeInterface(var27, true); + for (InterfaceParent var26 = (InterfaceParent)interfaceParents.first(); var26 != null; var26 = (InterfaceParent)interfaceParents.next()) { // L: 2295 + class58.closeInterface(var26, true); // L: 2296 } - rootInterface = -1; - interfaceParents = new NodeHashTable(8); - meslayerContinueWidget = null; - menuOptionsCount = 0; - isMenuOpen = false; - playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); + rootInterface = -1; // L: 2298 + interfaceParents = new NodeHashTable(8); // L: 2299 + meslayerContinueWidget = null; // L: 2300 + class279.method5091(); // L: 2301 + playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1); // L: 2302 - for (var32 = 0; var32 < 8; ++var32) { - playerMenuActions[var32] = null; - playerOptionsPriorities[var32] = false; + for (var34 = 0; var34 < 8; ++var34) { // L: 2303 + playerMenuActions[var34] = null; // L: 2304 + playerOptionsPriorities[var34] = false; // L: 2305 } - ItemContainer.itemContainers = new NodeHashTable(32); - isLoading = true; + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2308 + isLoading = true; // L: 2310 - for (var32 = 0; var32 < 100; ++var32) { - field813[var32] = true; + for (var34 = 0; var34 < 100; ++var34) { // L: 2311 + field882[var34] = true; } - var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2279, packetWriter.isaacCipher); - var3.packetBuffer.writeByte(class58.getWindowedMode()); - var3.packetBuffer.writeShort(Varcs.canvasWidth); - var3.packetBuffer.writeShort(class52.canvasHeight); - packetWriter.addNode(var3); - ClientPreferences.clanChat = null; + GrandExchangeEvent.method160(); // L: 2312 + Entity.clanChat = null; // L: 2313 - for (var32 = 0; var32 < 8; ++var32) { - grandExchangeOffers[var32] = new GrandExchangeOffer(); + for (var34 = 0; var34 < 8; ++var34) { // L: 2314 + grandExchangeOffers[var34] = new GrandExchangeOffer(); } - WorldMapIcon_0.grandExchangeEvents = null; - HitSplatDefinition.updatePlayer(var2); - WorldMapCacheName.field328 = -1; - class8.loadRegions(false, var2); - packetWriter.serverPacket = null; + WorldMapSection1.grandExchangeEvents = null; // L: 2315 + HorizontalAlignment.updatePlayer(var2); // L: 2317 + class52.field396 = -1; // L: 2318 + WorldMapID.loadRegions(false, var2); // L: 2319 + packetWriter.serverPacket = null; // L: 2320 } } else { - if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - WorldMapLabelSize.field134 = var2.readUnsignedShort(); - loginState = 18; + if (loginState == 17 && ((AbstractSocket)var1).available() >= 2) { // L: 2324 2325 + var2.offset = 0; // L: 2326 + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2327 + var2.offset = 0; // L: 2328 + WorldMapAreaData.field352 = var2.readUnsignedShort(); // L: 2329 + loginState = 18; // L: 2330 } - if (loginState == 18 && ((AbstractSocket)var1).available() >= WorldMapLabelSize.field134) { - var2.offset = 0; - ((AbstractSocket)var1).read(var2.array, 0, WorldMapLabelSize.field134); - var2.offset = 0; - String var26 = var2.readStringCp1252NullTerminated(); - String var34 = var2.readStringCp1252NullTerminated(); - String var29 = var2.readStringCp1252NullTerminated(); - MusicPatchPcmStream.setLoginResponseString(var26, var34, var29); - ClientPreferences.updateGameState(10); + if (loginState == 18 && ((AbstractSocket)var1).available() >= WorldMapAreaData.field352) { // L: 2333 2334 + var2.offset = 0; // L: 2335 + ((AbstractSocket)var1).read(var2.array, 0, WorldMapAreaData.field352); // L: 2336 + var2.offset = 0; // L: 2337 + String var25 = var2.readStringCp1252NullTerminated(); // L: 2338 + String var36 = var2.readStringCp1252NullTerminated(); // L: 2339 + String var29 = var2.readStringCp1252NullTerminated(); // L: 2340 + UrlRequester.setLoginResponseString(var25, var36, var29); // L: 2341 + CollisionMap.updateGameState(10); // L: 2342 } - if (loginState != 19) { - ++field705; - if (field705 > 2000) { - if (field706 < 1) { - if (WorldMapLabel.port3 == class90.port1) { - WorldMapLabel.port3 = port2; + if (loginState != 19) { // L: 2345 + ++field822; // L: 2392 + if (field822 > 2000) { // L: 2393 + if (field708 < 1) { // L: 2394 + if (port1 == WorldMapScaleHandler.port3) { // L: 2395 + WorldMapScaleHandler.port3 = class23.port2; } else { - WorldMapLabel.port3 = class90.port1; + WorldMapScaleHandler.port3 = port1; // L: 2396 } - ++field706; - loginState = 0; + ++field708; // L: 2397 + loginState = 0; // L: 2398 } else { - class22.getLoginError(-3); + class58.getLoginError(-3); // L: 2401 } } } else { - if (packetWriter.serverPacketLength == -1) { - if (((AbstractSocket)var1).available() < 2) { + if (packetWriter.serverPacketLength == -1) { // L: 2346 + if (((AbstractSocket)var1).available() < 2) { // L: 2347 return; } - ((AbstractSocket)var1).read(var2.array, 0, 2); - var2.offset = 0; - packetWriter.serverPacketLength = var2.readUnsignedShort(); + ((AbstractSocket)var1).read(var2.array, 0, 2); // L: 2348 + var2.offset = 0; // L: 2349 + packetWriter.serverPacketLength = var2.readUnsignedShort(); // L: 2350 } - if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { - ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); - var2.offset = 0; - var32 = packetWriter.serverPacketLength; - timer.method5166(); - packetWriter.clearBuffer(); - packetWriter.packetBuffer.offset = 0; - packetWriter.serverPacket = null; - packetWriter.field1350 = null; - packetWriter.field1351 = null; - packetWriter.field1342 = null; - packetWriter.serverPacketLength = 0; - packetWriter.field1348 = 0; - rebootTimer = 0; - menuOptionsCount = 0; - isMenuOpen = false; - minimapState = 0; - destinationX = 0; + if (((AbstractSocket)var1).available() >= packetWriter.serverPacketLength) { // L: 2352 + ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacketLength); // L: 2353 + var2.offset = 0; // L: 2354 + var34 = packetWriter.serverPacketLength; // L: 2355 + timer.method5099(); // L: 2356 + packetWriter.clearBuffer(); // L: 2358 + packetWriter.packetBuffer.offset = 0; // L: 2359 + packetWriter.serverPacket = null; // L: 2360 + packetWriter.field1336 = null; // L: 2361 + packetWriter.field1348 = null; // L: 2362 + packetWriter.field1346 = null; // L: 2363 + packetWriter.serverPacketLength = 0; // L: 2364 + packetWriter.field1345 = 0; // L: 2365 + rebootTimer = 0; // L: 2366 + class279.method5091(); // L: 2367 + minimapState = 0; // L: 2368 + destinationX = 0; // L: 2369 - for (var4 = 0; var4 < 2048; ++var4) { + for (var4 = 0; var4 < 2048; ++var4) { // L: 2370 players[var4] = null; } - class60.localPlayer = null; + WorldMapLabelSize.localPlayer = null; // L: 2371 - for (var4 = 0; var4 < npcs.length; ++var4) { - NPC var30 = npcs[var4]; - if (var30 != null) { - var30.targetIndex = -1; - var30.false0 = false; + for (var4 = 0; var4 < npcs.length; ++var4) { // L: 2372 + NPC var31 = npcs[var4]; // L: 2373 + if (var31 != null) { // L: 2374 + var31.targetIndex = -1; // L: 2375 + var31.false0 = false; // L: 2376 } } - ItemContainer.itemContainers = new NodeHashTable(32); - ClientPreferences.updateGameState(30); + ItemContainer.itemContainers = new NodeHashTable(32); // L: 2380 + CollisionMap.updateGameState(30); // L: 2382 - for (var4 = 0; var4 < 100; ++var4) { - field813[var4] = true; + for (var4 = 0; var4 < 100; ++var4) { // L: 2383 + field882[var4] = true; } - PacketBufferNode var35 = UserComparator4.getPacketBufferNode(ClientPacket.field2279, packetWriter.isaacCipher); - var35.packetBuffer.writeByte(class58.getWindowedMode()); - var35.packetBuffer.writeShort(Varcs.canvasWidth); - var35.packetBuffer.writeShort(class52.canvasHeight); - packetWriter.addNode(var35); - HitSplatDefinition.updatePlayer(var2); - if (var32 != var2.offset) { - throw new RuntimeException(); + GrandExchangeEvent.method160(); // L: 2384 + HorizontalAlignment.updatePlayer(var2); // L: 2386 + if (var34 != var2.offset) { // L: 2387 + throw new RuntimeException(); // L: 2388 } } } } } - } catch (IOException var22) { - if (field706 < 1) { - if (WorldMapLabel.port3 == class90.port1) { - WorldMapLabel.port3 = port2; + } catch (IOException var21) { // L: 2405 + if (field708 < 1) { // L: 2406 + if (WorldMapScaleHandler.port3 == port1) { // L: 2407 + WorldMapScaleHandler.port3 = class23.port2; } else { - WorldMapLabel.port3 = class90.port1; + WorldMapScaleHandler.port3 = port1; // L: 2408 } - ++field706; - loginState = 0; + ++field708; // L: 2409 + loginState = 0; // L: 2410 } else { - class22.getLoginError(-2); + class58.getLoginError(-2); // L: 2413 } } - } + } // L: 2152 2322 2390 2399 2402 2411 2414 2416 - @ObfuscatedName("ft") + @ObfuscatedName("fs") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-873982601" + garbageValue = "-634429203" ) @Export("doCycleLoggedIn") final void doCycleLoggedIn() { - if (rebootTimer > 1) { + if (rebootTimer > 1) { // L: 2614 --rebootTimer; } - if (logoutTimer > 0) { + if (logoutTimer > 0) { // L: 2615 --logoutTimer; } - if (field722) { - field722 = false; - CollisionMap.method3707(); + if (field713) { // L: 2616 + field713 = false; // L: 2617 + ArchiveLoader.method1208(); // L: 2618 } else { - if (!isMenuOpen) { - FontName.addCancelMenuEntry(); + if (!isMenuOpen) { // L: 2621 + WorldMapAreaData.addCancelMenuEntry(); } int var1; - for (var1 = 0; var1 < 100 && this.method1768(packetWriter); ++var1) { + for (var1 = 0; var1 < 100 && this.method1707(packetWriter); ++var1) { // L: 2622 2623 } - if (gameState == 30) { - int var2; - PacketBufferNode var14; - while (MusicPatchNode.method3966()) { - var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2286, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var2 = var14.packetBuffer.offset; - TriBool.performReflectionCheck(var14.packetBuffer); - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - } + if (gameState == 30) { // L: 2625 + while (true) { + ReflectionCheck var2 = (ReflectionCheck)class105.reflectionChecks.last(); // L: 2629 + boolean var29; + if (var2 == null) { // L: 2630 + var29 = false; // L: 2631 + } else { + var29 = true; // L: 2634 + } - if (timer.field3618) { - var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2310, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - var2 = var14.packetBuffer.offset; - timer.write(var14.packetBuffer); - var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - timer.method5165(); - } + int var3; + PacketBufferNode var30; + if (!var29) { // L: 2636 + PacketBufferNode var14; + int var15; + if (timer.field3598) { // L: 2644 + var14 = getPacketBufferNode(ClientPacket.field2271, packetWriter.isaacCipher); // L: 2646 + var14.packetBuffer.writeByte(0); // L: 2647 + var15 = var14.packetBuffer.offset; // L: 2648 + timer.write(var14.packetBuffer); // L: 2649 + var14.packetBuffer.writeLengthByte(var14.packetBuffer.offset - var15); // L: 2650 + packetWriter.addNode(var14); // L: 2651 + timer.method5101(); // L: 2652 + } - int var3; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var12; - PacketBuffer var10000; - synchronized(class219.mouseRecorder.lock) { - if (!field669) { - class219.mouseRecorder.index = 0; - } else if (MouseHandler.MouseHandler_lastButton != 0 || class219.mouseRecorder.index >= 40) { - PacketBufferNode var15 = null; - var3 = 0; - var4 = 0; - var5 = 0; - var6 = 0; + int var4; + int var5; + int var6; + int var7; + int var8; + int var9; + int var10; + int var11; + int var12; + PacketBuffer var10000; + synchronized(ByteArrayPool.mouseRecorder.lock) { // L: 2655 + if (!field841) { // L: 2656 + ByteArrayPool.mouseRecorder.index = 0; // L: 2742 + } else if (MouseHandler.MouseHandler_lastButton != 0 || ByteArrayPool.mouseRecorder.index >= 40) { // L: 2657 + var30 = null; // L: 2659 + var3 = 0; // L: 2660 + var4 = 0; // L: 2661 + var5 = 0; // L: 2662 + var6 = 0; // L: 2663 - for (var7 = 0; var7 < class219.mouseRecorder.index && (var15 == null || var15.packetBuffer.offset - var3 < 246); ++var7) { - var4 = var7; - var8 = class219.mouseRecorder.ys[var7]; - if (var8 < -1) { - var8 = -1; - } else if (var8 > 65534) { - var8 = 65534; - } + for (var7 = 0; var7 < ByteArrayPool.mouseRecorder.index && (var30 == null || var30.packetBuffer.offset - var3 < 246); ++var7) { // L: 2664 2665 + var4 = var7; // L: 2666 + var8 = ByteArrayPool.mouseRecorder.ys[var7]; // L: 2667 + if (var8 < -1) { // L: 2668 + var8 = -1; + } else if (var8 > 65534) { // L: 2669 + var8 = 65534; + } - var9 = class219.mouseRecorder.xs[var7]; - if (var9 < -1) { - var9 = -1; - } else if (var9 > 65534) { - var9 = 65534; - } + var9 = ByteArrayPool.mouseRecorder.xs[var7]; // L: 2670 + if (var9 < -1) { // L: 2671 + var9 = -1; + } else if (var9 > 65534) { // L: 2672 + var9 = 65534; + } - if (var9 != field683 || var8 != field684) { - if (var15 == null) { - var15 = UserComparator4.getPacketBufferNode(ClientPacket.field2253, packetWriter.isaacCipher); - var15.packetBuffer.writeByte(0); - var3 = var15.packetBuffer.offset; - var10000 = var15.packetBuffer; - var10000.offset += 2; - var5 = 0; - var6 = 0; + if (var9 != field798 || var8 != field686) { // L: 2673 + if (var30 == null) { // L: 2676 + var30 = getPacketBufferNode(ClientPacket.field2269, packetWriter.isaacCipher); // L: 2677 + var30.packetBuffer.writeByte(0); // L: 2678 + var3 = var30.packetBuffer.offset; // L: 2679 + var10000 = var30.packetBuffer; // L: 2680 + var10000.offset += 2; + var5 = 0; // L: 2681 + var6 = 0; // L: 2682 + } + + if (field687 != -1L) { // L: 2687 + var10 = var9 - field798; // L: 2688 + var11 = var8 - field686; // L: 2689 + var12 = (int)((ByteArrayPool.mouseRecorder.millis[var7] - field687) / 20L); // L: 2690 + var5 = (int)((long)var5 + (ByteArrayPool.mouseRecorder.millis[var7] - field687) % 20L); // L: 2691 + } else { + var10 = var9; // L: 2694 + var11 = var8; // L: 2695 + var12 = Integer.MAX_VALUE; // L: 2696 + } + + field798 = var9; // L: 2698 + field686 = var8; // L: 2699 + if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { // L: 2700 + var10 += 32; // L: 2701 + var11 += 32; // L: 2702 + var30.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); // L: 2703 + } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { // L: 2705 + var10 += 128; // L: 2706 + var11 += 128; // L: 2707 + var30.packetBuffer.writeByte(var12 + 128); // L: 2708 + var30.packetBuffer.writeShort(var11 + (var10 << 8)); // L: 2709 + } else if (var12 < 32) { // L: 2711 + var30.packetBuffer.writeByte(var12 + 192); // L: 2712 + if (var9 != -1 && var8 != -1) { // L: 2713 + var30.packetBuffer.writeInt(var9 | var8 << 16); // L: 2714 + } else { + var30.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } else { + var30.packetBuffer.writeShort((var12 & 8191) + 57344); // L: 2717 + if (var9 != -1 && var8 != -1) { // L: 2718 + var30.packetBuffer.writeInt(var9 | var8 << 16); // L: 2719 + } else { + var30.packetBuffer.writeInt(Integer.MIN_VALUE); + } + } + + ++var6; // L: 2721 + field687 = ByteArrayPool.mouseRecorder.millis[var7]; // L: 2722 + } } - if (field738 != -1L) { - var10 = var9 - field683; - var11 = var8 - field684; - var12 = (int)((class219.mouseRecorder.millis[var7] - field738) / 20L); - var5 = (int)((long)var5 + (class219.mouseRecorder.millis[var7] - field738) % 20L); + if (var30 != null) { // L: 2724 + var30.packetBuffer.writeLengthByte(var30.packetBuffer.offset - var3); // L: 2725 + var7 = var30.packetBuffer.offset; // L: 2726 + var30.packetBuffer.offset = var3; // L: 2727 + var30.packetBuffer.writeByte(var5 / var6); // L: 2728 + var30.packetBuffer.writeByte(var5 % var6); // L: 2729 + var30.packetBuffer.offset = var7; // L: 2730 + packetWriter.addNode(var30); // L: 2731 + } + + if (var4 >= ByteArrayPool.mouseRecorder.index) { // L: 2733 + ByteArrayPool.mouseRecorder.index = 0; } else { - var10 = var9; - var11 = var8; - var12 = Integer.MAX_VALUE; + MouseRecorder var49 = ByteArrayPool.mouseRecorder; // L: 2735 + var49.index -= var4; + System.arraycopy(ByteArrayPool.mouseRecorder.xs, var4, ByteArrayPool.mouseRecorder.xs, 0, ByteArrayPool.mouseRecorder.index); // L: 2736 + System.arraycopy(ByteArrayPool.mouseRecorder.ys, var4, ByteArrayPool.mouseRecorder.ys, 0, ByteArrayPool.mouseRecorder.index); // L: 2737 + System.arraycopy(ByteArrayPool.mouseRecorder.millis, var4, ByteArrayPool.mouseRecorder.millis, 0, ByteArrayPool.mouseRecorder.index); // L: 2738 } - - field683 = var9; - field684 = var8; - if (var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) { - var10 += 32; - var11 += 32; - var15.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6)); - } else if (var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) { - var10 += 128; - var11 += 128; - var15.packetBuffer.writeByte(var12 + 128); - var15.packetBuffer.writeShort(var11 + (var10 << 8)); - } else if (var12 < 32) { - var15.packetBuffer.writeByte(var12 + 192); - if (var9 != -1 && var8 != -1) { - var15.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } else { - var15.packetBuffer.writeShort((var12 & 8191) + 57344); - if (var9 != -1 && var8 != -1) { - var15.packetBuffer.writeInt(var9 | var8 << 16); - } else { - var15.packetBuffer.writeInt(Integer.MIN_VALUE); - } - } - - ++var6; - field738 = class219.mouseRecorder.millis[var7]; } } - if (var15 != null) { - var15.packetBuffer.writeLengthByte(var15.packetBuffer.offset - var3); - var7 = var15.packetBuffer.offset; - var15.packetBuffer.offset = var3; - var15.packetBuffer.writeByte(var5 / var6); - var15.packetBuffer.writeByte(var5 % var6); - var15.packetBuffer.offset = var7; - packetWriter.addNode(var15); - } - - if (var4 >= class219.mouseRecorder.index) { - class219.mouseRecorder.index = 0; - } else { - MouseRecorder var44 = class219.mouseRecorder; - var44.index -= var4; - System.arraycopy(class219.mouseRecorder.xs, var4, class219.mouseRecorder.xs, 0, class219.mouseRecorder.index); - System.arraycopy(class219.mouseRecorder.ys, var4, class219.mouseRecorder.ys, 0, class219.mouseRecorder.index); - System.arraycopy(class219.mouseRecorder.millis, var4, class219.mouseRecorder.millis, 0, class219.mouseRecorder.index); - } - } - } - - PacketBufferNode var18; - if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { - long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; - if (var16 > 32767L) { - var16 = 32767L; - } - - mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; - var3 = MouseHandler.MouseHandler_lastPressedY; - if (var3 < 0) { - var3 = 0; - } else if (var3 > class52.canvasHeight) { - var3 = class52.canvasHeight; - } - - var4 = MouseHandler.MouseHandler_lastPressedX; - if (var4 < 0) { - var4 = 0; - } else if (var4 > Varcs.canvasWidth) { - var4 = Varcs.canvasWidth; - } - - var5 = (int)var16; - var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2244, packetWriter.isaacCipher); - var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0)); - var18.packetBuffer.writeShort(var4); - var18.packetBuffer.writeShort(var3); - packetWriter.addNode(var18); - } - - if (KeyHandler.field425 > 0) { - var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2330, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(0); - var2 = var14.packetBuffer.offset; - long var19 = MilliClock.currentTimeMillis(); - - for (var5 = 0; var5 < KeyHandler.field425; ++var5) { - long var21 = var19 - field897; - if (var21 > 16777215L) { - var21 = 16777215L; - } - - field897 = var19; - var14.packetBuffer.writeIntME(KeyHandler.field429[var5]); - var14.packetBuffer.method5798((int)var21); - } - - var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var2); - packetWriter.addNode(var14); - } - - if (field757 > 0) { - --field757; - } - - if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { - field758 = true; - } - - if (field758 && field757 <= 0) { - field757 = 20; - field758 = false; - var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2258, packetWriter.isaacCipher); - var14.packetBuffer.writeShort(camAngleY); - var14.packetBuffer.writeShort(camAngleX); - packetWriter.addNode(var14); - } - - if (WorldMapArea.hasFocus && !hadFocus) { - hadFocus = true; - var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2290, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(1); - packetWriter.addNode(var14); - } - - if (!WorldMapArea.hasFocus && hadFocus) { - hadFocus = false; - var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2290, packetWriter.isaacCipher); - var14.packetBuffer.writeByte(0); - packetWriter.addNode(var14); - } - - if (class228.worldMap != null) { - class228.worldMap.method6696(); - } - - if (class4.ClanChat_inClanChat) { - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.sort(); - } - - class7.FriendSystem_invalidateFriends(); - class4.ClanChat_inClanChat = false; - } - - JagexCache.method3625(); - if (gameState == 30) { - Frames.method3396(); - - int var10002; - for (var1 = 0; var1 < soundEffectCount; ++var1) { - var10002 = queuedSoundEffectDelays[var1]--; - if (queuedSoundEffectDelays[var1] >= -10) { - SoundEffect var35 = soundEffects[var1]; - if (var35 == null) { - var10000 = null; - var35 = SoundEffect.readSoundEffect(GrandExchangeOffer.archive4, soundEffectIds[var1], 0); - if (var35 == null) { - continue; - } - - int[] var45 = queuedSoundEffectDelays; - var45[var1] += var35.calculateDelay(); - soundEffects[var1] = var35; + PacketBufferNode var18; + if (MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) { // L: 2744 + long var16 = MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis; // L: 2745 + if (var16 > 32767L) { // L: 2746 + var16 = 32767L; } - if (queuedSoundEffectDelays[var1] < 0) { - if (soundLocations[var1] != 0) { - var4 = (soundLocations[var1] & 255) * 128; - var5 = soundLocations[var1] >> 16 & 255; - var6 = var5 * 128 + 64 - class60.localPlayer.x; - if (var6 < 0) { - var6 = -var6; + mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis; // L: 2747 + var3 = MouseHandler.MouseHandler_lastPressedY; // L: 2748 + if (var3 < 0) { // L: 2749 + var3 = 0; + } else if (var3 > GameShell.canvasHeight) { // L: 2750 + var3 = GameShell.canvasHeight; + } + + var4 = MouseHandler.MouseHandler_lastPressedX; // L: 2751 + if (var4 < 0) { // L: 2752 + var4 = 0; + } else if (var4 > FloorDecoration.canvasWidth) { // L: 2753 + var4 = FloorDecoration.canvasWidth; + } + + var5 = (int)var16; // L: 2754 + var18 = getPacketBufferNode(ClientPacket.field2312, packetWriter.isaacCipher); // L: 2755 + var18.packetBuffer.writeShort((MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0) + (var5 << 1)); // L: 2756 + var18.packetBuffer.writeShort(var4); // L: 2757 + var18.packetBuffer.writeShort(var3); // L: 2758 + packetWriter.addNode(var18); // L: 2759 + } + + if (KeyHandler.field422 > 0) { // L: 2761 + var14 = getPacketBufferNode(ClientPacket.field2308, packetWriter.isaacCipher); // L: 2762 + var14.packetBuffer.writeShort(0); // L: 2763 + var15 = var14.packetBuffer.offset; // L: 2764 + long var19 = PacketWriter.currentTimeMillis(); // L: 2765 + + for (var5 = 0; var5 < KeyHandler.field422; ++var5) { // L: 2766 + long var21 = var19 - field901; // L: 2767 + if (var21 > 16777215L) { // L: 2768 + var21 = 16777215L; + } + + field901 = var19; // L: 2769 + var14.packetBuffer.method5660((int)var21); // L: 2770 + var14.packetBuffer.writeIntME(KeyHandler.field421[var5]); // L: 2771 + } + + var14.packetBuffer.writeLengthShort(var14.packetBuffer.offset - var15); // L: 2773 + packetWriter.addNode(var14); // L: 2774 + } + + if (field829 > 0) { // L: 2776 + --field829; + } + + if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) { // L: 2777 + field761 = true; + } + + if (field761 && field829 <= 0) { // L: 2778 + field829 = 20; // L: 2779 + field761 = false; // L: 2780 + var14 = getPacketBufferNode(ClientPacket.field2289, packetWriter.isaacCipher); // L: 2782 + var14.packetBuffer.method5654(camAngleY); // L: 2783 + var14.packetBuffer.method5653(camAngleX); // L: 2784 + packetWriter.addNode(var14); // L: 2785 + } + + if (GameShell.hasFocus && !hadFocus) { // L: 2787 + hadFocus = true; // L: 2788 + var14 = getPacketBufferNode(ClientPacket.field2299, packetWriter.isaacCipher); // L: 2790 + var14.packetBuffer.writeByte(1); // L: 2791 + packetWriter.addNode(var14); // L: 2792 + } + + if (!GameShell.hasFocus && hadFocus) { // L: 2794 + hadFocus = false; // L: 2795 + var14 = getPacketBufferNode(ClientPacket.field2299, packetWriter.isaacCipher); // L: 2797 + var14.packetBuffer.writeByte(0); // L: 2798 + packetWriter.addNode(var14); // L: 2799 + } + + if (Message.worldMap != null) { // L: 2802 + Message.worldMap.method6428(); + } + + if (class8.ClanChat_inClanChat) { // L: 2804 + if (Entity.clanChat != null) { // L: 2805 + Entity.clanChat.sort(); // L: 2806 + } + + for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 2809 + Player var31 = players[Players.Players_indices[var1]]; // L: 2810 + var31.clearIsInClanChat(); // L: 2811 + } + + class8.ClanChat_inClanChat = false; // L: 2814 + } + + AbstractWorldMapData.method354(); // L: 2817 + if (gameState != 30) { // L: 2818 + return; + } + + for (PendingSpawn var36 = (PendingSpawn)pendingSpawns.last(); var36 != null; var36 = (PendingSpawn)pendingSpawns.previous()) { // L: 2820 2821 2864 + if (var36.hitpoints > 0) { // L: 2822 + --var36.hitpoints; + } + + ObjectDefinition var23; + boolean var37; + if (var36.hitpoints == 0) { // L: 2823 + if (var36.objectId >= 0) { // L: 2825 + var3 = var36.objectId; // L: 2827 + var4 = var36.field961; // L: 2828 + var23 = MidiPcmStream.getObjectDefinition(var3); // L: 2830 + if (var4 == 11) { // L: 2831 + var4 = 10; } - var7 = soundLocations[var1] >> 8 & 255; - var8 = var7 * 128 + 64 - class60.localPlayer.y; - if (var8 < 0) { - var8 = -var8; + if (var4 >= 5 && var4 <= 8) { // L: 2832 + var4 = 4; } - var9 = var6 + var8 - 128; - if (var9 > var4) { - queuedSoundEffectDelays[var1] = -100; + var37 = var23.method4703(var4); // L: 2833 + if (!var37) { // L: 2835 + continue; + } + } + + WorldMapLabelSize.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.objectId, var36.field960, var36.field961); // L: 2837 + var36.remove(); // L: 2838 + } else { + if (var36.delay > 0) { // L: 2842 + --var36.delay; + } + + if (var36.delay == 0 && var36.x >= 1 && var36.y >= 1 && var36.x <= 102 && var36.y <= 102) { // L: 2843 + if (var36.id >= 0) { // L: 2845 + var3 = var36.id; // L: 2847 + var4 = var36.field964; // L: 2848 + var23 = MidiPcmStream.getObjectDefinition(var3); // L: 2850 + if (var4 == 11) { // L: 2851 + var4 = 10; + } + + if (var4 >= 5 && var4 <= 8) { // L: 2852 + var4 = 4; + } + + var37 = var23.method4703(var4); // L: 2853 + if (!var37) { // L: 2855 + continue; + } + } + + WorldMapLabelSize.addPendingSpawnToScene(var36.plane, var36.type, var36.x, var36.y, var36.id, var36.orientation, var36.field964); // L: 2857 + var36.delay = -1; // L: 2858 + if (var36.objectId == var36.id && var36.objectId == -1) { // L: 2859 + var36.remove(); + } else if (var36.id == var36.objectId && var36.field960 == var36.orientation && var36.field964 == var36.field961) { // L: 2860 + var36.remove(); + } + } + } + } + + int var10002; + for (var1 = 0; var1 < soundEffectCount; ++var1) { // L: 2868 + var10002 = queuedSoundEffectDelays[var1]--; // L: 2869 + if (queuedSoundEffectDelays[var1] >= -10) { // L: 2870 + SoundEffect var32 = soundEffects[var1]; // L: 2882 + if (var32 == null) { // L: 2883 + var10000 = null; // L: 2884 + var32 = SoundEffect.readSoundEffect(GrandExchangeOfferUnitPriceComparator.archive4, soundEffectIds[var1], 0); + if (var32 == null) { // L: 2885 continue; } - if (var9 < 0) { - var9 = 0; + int[] var50 = queuedSoundEffectDelays; // L: 2886 + var50[var1] += var32.calculateDelay(); + soundEffects[var1] = var32; // L: 2887 + } + + if (queuedSoundEffectDelays[var1] < 0) { // L: 2893 + if (soundLocations[var1] != 0) { // L: 2895 + var4 = (soundLocations[var1] & 255) * 128; // L: 2896 + var5 = soundLocations[var1] >> 16 & 255; // L: 2897 + var6 = var5 * 128 + 64 - WorldMapLabelSize.localPlayer.x; // L: 2898 + if (var6 < 0) { // L: 2899 + var6 = -var6; + } + + var7 = soundLocations[var1] >> 8 & 255; // L: 2900 + var8 = var7 * 128 + 64 - WorldMapLabelSize.localPlayer.y; // L: 2901 + if (var8 < 0) { // L: 2902 + var8 = -var8; + } + + var9 = var8 + var6 - 128; // L: 2903 + if (var9 > var4) { // L: 2904 + queuedSoundEffectDelays[var1] = -100; // L: 2905 + continue; // L: 2906 + } + + if (var9 < 0) { // L: 2908 + var9 = 0; + } + + var3 = (var4 - var9) * areaSoundEffectVolume / var4; // L: 2909 + } else { + var3 = soundEffectVolume; // L: 2911 } - var3 = (var4 - var9) * areaSoundEffectVolume / var4; - } else { - var3 = soundEffectVolume; + if (var3 > 0) { // L: 2912 + RawSound var24 = var32.toRawSound().resample(class9.decimator); // L: 2913 + RawPcmStream var40 = RawPcmStream.createRawPcmStream(var24, 100, var3); // L: 2914 + var40.setNumLoops(queuedSoundEffectLoops[var1] - 1); // L: 2915 + Players.pcmStreamMixer.addSubStream(var40); // L: 2916 + } + + queuedSoundEffectDelays[var1] = -100; // L: 2918 + } + } else { + --soundEffectCount; // L: 2871 + + for (var15 = var1; var15 < soundEffectCount; ++var15) { // L: 2872 + soundEffectIds[var15] = soundEffectIds[var15 + 1]; // L: 2873 + soundEffects[var15] = soundEffects[var15 + 1]; // L: 2874 + queuedSoundEffectLoops[var15] = queuedSoundEffectLoops[var15 + 1]; // L: 2875 + queuedSoundEffectDelays[var15] = queuedSoundEffectDelays[var15 + 1]; // L: 2876 + soundLocations[var15] = soundLocations[var15 + 1]; // L: 2877 } - if (var3 > 0) { - RawSound var23 = var35.toRawSound().resample(class197.decimator); - RawPcmStream var24 = RawPcmStream.createRawPcmStream(var23, 100, var3); - var24.setNumLoops(queuedSoundEffectLoops[var1] - 1); - class60.pcmStreamMixer.addSubStream(var24); - } - - queuedSoundEffectDelays[var1] = -100; + --var1; // L: 2879 } - } else { - --soundEffectCount; - - for (var2 = var1; var2 < soundEffectCount; ++var2) { - soundEffectIds[var2] = soundEffectIds[var2 + 1]; - soundEffects[var2] = soundEffects[var2 + 1]; - queuedSoundEffectLoops[var2] = queuedSoundEffectLoops[var2 + 1]; - queuedSoundEffectDelays[var2] = queuedSoundEffectDelays[var2 + 1]; - soundLocations[var2] = soundLocations[var2 + 1]; - } - - --var1; - } - } - - if (field743 && !WorldMapLabelSize.method251()) { - if (musicVolume != 0 && currentTrackGroupId != -1) { - UserComparator9.method3513(UserComparator7.archive6, currentTrackGroupId, 0, musicVolume, false); } - field743 = false; - } + if (field704 && !HealthBarUpdate.method1815()) { // L: 2921 + if (musicVolume != 0 && currentTrackGroupId != -1) { // L: 2922 + Script.method2322(CollisionMap.archive6, currentTrackGroupId, 0, musicVolume, false); + } - ++packetWriter.field1348; - if (packetWriter.field1348 > 750) { - CollisionMap.method3707(); - } else { - TileItem.method2260(); - class247.method4496(); - class3.method33(); - ++field747; - if (mouseCrossColor != 0) { - mouseCrossState += 20; - if (mouseCrossState >= 400) { + field704 = false; // L: 2923 + } + + ++packetWriter.field1345; // L: 2926 + if (packetWriter.field1345 > 750) { // L: 2927 + ArchiveLoader.method1208(); // L: 2928 + return; // L: 2929 + } + + var1 = Players.Players_count; // L: 2932 + int[] var33 = Players.Players_indices; // L: 2933 + + for (var3 = 0; var3 < var1; ++var3) { // L: 2934 + Player var42 = players[var33[var3]]; // L: 2935 + if (var42 != null) { // L: 2936 + CollisionMap.updateActorSequence(var42, 1); // L: 2937 + } + } + + for (var1 = 0; var1 < npcCount; ++var1) { // L: 2942 + var15 = npcIndices[var1]; // L: 2943 + NPC var25 = npcs[var15]; // L: 2944 + if (var25 != null) { // L: 2945 + CollisionMap.updateActorSequence(var25, var25.definition.size); // L: 2946 + } + } + + ClientPacket.method3706(); // L: 2950 + ++field737; // L: 2951 + if (mouseCrossColor != 0) { // L: 2952 + mouseCrossState += 20; // L: 2953 + if (mouseCrossState >= 400) { // L: 2954 mouseCrossColor = 0; } } - if (class194.field2356 != null) { - ++field808; - if (field808 >= 15) { - class234.invalidateWidget(class194.field2356); - class194.field2356 = null; + if (GrandExchangeEvent.field79 != null) { // L: 2956 + ++field782; // L: 2957 + if (field782 >= 15) { // L: 2958 + class52.invalidateWidget(GrandExchangeEvent.field79); // L: 2959 + GrandExchangeEvent.field79 = null; // L: 2960 } } - Widget var34 = WorldMapSection1.mousedOverWidgetIf1; - Widget var36 = SecureRandomCallable.field542; - WorldMapSection1.mousedOverWidgetIf1 = null; - SecureRandomCallable.field542 = null; - draggedOnWidget = null; - field854 = false; - field692 = false; - field894 = 0; + Widget var38 = TriBool.mousedOverWidgetIf1; // L: 2963 + Widget var34 = Occluder.field1950; // L: 2964 + TriBool.mousedOverWidgetIf1 = null; // L: 2965 + Occluder.field1950 = null; // L: 2966 + draggedOnWidget = null; // L: 2967 + field880 = false; // L: 2968 + field799 = false; // L: 2969 + field898 = 0; // L: 2970 - while (WorldMapManager.isKeyDown() && field894 < 128) { - if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && SecureRandomCallable.field546 == 66) { - String var39 = ""; + while (class60.isKeyDown() && field898 < 128) { // L: 2971 + if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && PlayerAppearance.field2581 == 66) { // L: 2972 + String var44 = ""; // L: 2975 - Message var37; - for (Iterator var41 = Messages.Messages_hashTable.iterator(); var41.hasNext(); var39 = var39 + var37.sender + ':' + var37.text + '\n') { - var37 = (Message)var41.next(); + Message var39; + for (Iterator var41 = Messages.Messages_hashTable.iterator(); var41.hasNext(); var44 = var44 + var39.sender + ':' + var39.text + '\n') { // L: 2976 2979 + var39 = (Message)var41.next(); // L: 2977 } - WorldMapSectionType.client.clipboardSetString(var39); - } else if (oculusOrbState != 1 || class58.field442 <= 0) { - field896[field894] = SecureRandomCallable.field546; - field920[field894] = class58.field442; - ++field894; + class2.client.clipboardSetString(var44); // L: 2985 + } else if (oculusOrbState != 1 || PacketWriter.field1350 <= 0) { // L: 2988 + field900[field898] = PlayerAppearance.field2581; // L: 2991 + field899[field898] = PacketWriter.field1350; // L: 2992 + ++field898; // L: 2993 } } - boolean var30 = staffModLevel >= 2; - if (var30 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { - var4 = class60.localPlayer.plane - mouseWheelRotation; - if (var4 < 0) { - var4 = 0; - } else if (var4 > 3) { - var4 = 3; + if (JagexCache.method3576() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) { // L: 2995 + var3 = WorldMapLabelSize.localPlayer.plane - mouseWheelRotation; // L: 2996 + if (var3 < 0) { // L: 2997 + var3 = 0; + } else if (var3 > 3) { // L: 2998 + var3 = 3; } - if (var4 != class60.localPlayer.plane) { - GrandExchangeOffer.method191(class60.localPlayer.pathX[0] + class182.baseX, class60.localPlayer.pathY[0] + SecureRandomFuture.baseY, var4, false); + if (var3 != WorldMapLabelSize.localPlayer.plane) { // L: 2999 + var4 = WorldMapLabelSize.localPlayer.pathX[0] + WorldMapManager.baseX; // L: 3000 + var5 = WorldMapLabelSize.localPlayer.pathY[0] + WorldMapLabel.baseY; // L: 3001 + var18 = getPacketBufferNode(ClientPacket.field2327, packetWriter.isaacCipher); // L: 3004 + var18.packetBuffer.writeShort(var5); // L: 3005 + var18.packetBuffer.method5662(0); // L: 3006 + var18.packetBuffer.writeShort(var4); // L: 3007 + var18.packetBuffer.method5644(var3); // L: 3008 + packetWriter.addNode(var18); // L: 3009 } - mouseWheelRotation = 0; + mouseWheelRotation = 0; // L: 3012 } - if (rootInterface != -1) { - MusicPatchNode.updateRootInterface(rootInterface, 0, 0, Varcs.canvasWidth, class52.canvasHeight, 0, 0); + if (rootInterface != -1) { // L: 3014 + GameObject.updateRootInterface(rootInterface, 0, 0, FloorDecoration.canvasWidth, GameShell.canvasHeight, 0, 0); } - ++cycleCntr; + ++cycleCntr; // L: 3015 while (true) { - Widget var38; - ScriptEvent var40; - Widget var42; + Widget var43; + ScriptEvent var45; + Widget var46; do { - var40 = (ScriptEvent)field891.removeLast(); - if (var40 == null) { + var45 = (ScriptEvent)field877.removeLast(); // L: 3017 + if (var45 == null) { // L: 3018 while (true) { do { - var40 = (ScriptEvent)field691.removeLast(); - if (var40 == null) { + var45 = (ScriptEvent)field912.removeLast(); // L: 3029 + if (var45 == null) { // L: 3030 while (true) { do { - var40 = (ScriptEvent)scriptEvents.removeLast(); - if (var40 == null) { - this.menu(); - if (class228.worldMap != null) { - class228.worldMap.method6532(TileItemPile.Client_plane, (class60.localPlayer.x >> 7) + class182.baseX, (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY, false); - class228.worldMap.loadCache(); + var45 = (ScriptEvent)scriptEvents.removeLast(); // L: 3041 + if (var45 == null) { // L: 3042 + this.menu(); // L: 3052 + if (Message.worldMap != null) { // L: 3054 + Message.worldMap.method6482(Huffman.Client_plane, (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX, (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY, false); // L: 3055 + Message.worldMap.loadCache(); // L: 3056 } - if (clickedWidget != null) { - this.method1372(); + if (clickedWidget != null) { // L: 3059 + this.method1458(); } - if (KeyHandler.dragInventoryWidget != null) { - class234.invalidateWidget(KeyHandler.dragInventoryWidget); - ++itemDragDuration; - if (MouseHandler.MouseHandler_currentButton == 0) { - if (field785) { - if (KeyHandler.dragInventoryWidget == TaskHandler.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { - Widget var43 = KeyHandler.dragInventoryWidget; - byte var31 = 0; - if (field838 == 1 && var43.contentType == 206) { - var31 = 1; + PacketBufferNode var47; + if (BuddyRankComparator.dragInventoryWidget != null) { // L: 3060 + class52.invalidateWidget(BuddyRankComparator.dragInventoryWidget); // L: 3061 + ++itemDragDuration; // L: 3062 + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 3063 + if (field788) { // L: 3064 + if (BuddyRankComparator.dragInventoryWidget == VerticalAlignment.hoveredItemContainer && dragItemSlotSource != dragItemSlotDestination) { // L: 3065 + Widget var48 = BuddyRankComparator.dragInventoryWidget; // L: 3066 + byte var35 = 0; // L: 3067 + if (field707 == 1 && var48.contentType == 206) { // L: 3068 + var35 = 1; } - if (var43.itemIds[dragItemSlotDestination] <= 0) { - var31 = 0; + if (var48.itemIds[dragItemSlotDestination] <= 0) { // L: 3069 + var35 = 0; } - if (Projectile.method2249(KeyHandler.getWidgetFlags(var43))) { - var6 = dragItemSlotSource; - var7 = dragItemSlotDestination; - var43.itemIds[var7] = var43.itemIds[var6]; - var43.itemQuantities[var7] = var43.itemQuantities[var6]; - var43.itemIds[var6] = -1; - var43.itemQuantities[var6] = 0; - } else if (var31 == 1) { - var6 = dragItemSlotSource; - var7 = dragItemSlotDestination; + if (Widget.method4172(WorldMapIcon_0.getWidgetFlags(var48))) { // L: 3070 + var5 = dragItemSlotSource; // L: 3071 + var6 = dragItemSlotDestination; // L: 3072 + var48.itemIds[var6] = var48.itemIds[var5]; // L: 3073 + var48.itemQuantities[var6] = var48.itemQuantities[var5]; // L: 3074 + var48.itemIds[var5] = -1; // L: 3075 + var48.itemQuantities[var5] = 0; // L: 3076 + } else if (var35 == 1) { // L: 3078 + var5 = dragItemSlotSource; // L: 3079 + var6 = dragItemSlotDestination; // L: 3080 - while (var7 != var6) { - if (var6 > var7) { - var43.swapItems(var6 - 1, var6); - --var6; - } else if (var6 < var7) { - var43.swapItems(var6 + 1, var6); - ++var6; + while (var6 != var5) { // L: 3081 + if (var5 > var6) { // L: 3082 + var48.swapItems(var5 - 1, var5); // L: 3083 + --var5; // L: 3084 + } else if (var5 < var6) { // L: 3086 + var48.swapItems(var5 + 1, var5); // L: 3087 + ++var5; // L: 3088 } } } else { - var43.swapItems(dragItemSlotDestination, dragItemSlotSource); + var48.swapItems(dragItemSlotDestination, dragItemSlotSource); // L: 3093 } - var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2256, packetWriter.isaacCipher); - var18.packetBuffer.method5837(var31); - var18.packetBuffer.writeInt(KeyHandler.dragInventoryWidget.id); - var18.packetBuffer.method5898(dragItemSlotDestination); - var18.packetBuffer.method5898(dragItemSlotSource); - packetWriter.addNode(var18); + var47 = getPacketBufferNode(ClientPacket.field2309, packetWriter.isaacCipher); // L: 3096 + var47.packetBuffer.method5662(BuddyRankComparator.dragInventoryWidget.id); // L: 3097 + var47.packetBuffer.writeShort(dragItemSlotDestination); // L: 3098 + var47.packetBuffer.writeByte(var35); // L: 3099 + var47.packetBuffer.method5654(dragItemSlotSource); // L: 3100 + packetWriter.addNode(var47); // L: 3101 } - } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(draggedWidgetX, draggedWidgetY); - } else if (menuOptionsCount > 0) { - GrandExchangeOffer.method189(draggedWidgetX, draggedWidgetY); + } else if (this.shouldLeftClickOpenMenu()) { // L: 3105 + this.openMenu(draggedWidgetX, draggedWidgetY); // L: 3106 + } else if (menuOptionsCount > 0) { // L: 3108 + SecureRandomFuture.method2211(draggedWidgetX, draggedWidgetY); // L: 3109 } - field808 = 10; - MouseHandler.MouseHandler_lastButton = 0; - KeyHandler.dragInventoryWidget = null; - } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { - field785 = true; + field782 = 10; // L: 3112 + MouseHandler.MouseHandler_lastButton = 0; // L: 3113 + BuddyRankComparator.dragInventoryWidget = null; // L: 3114 + } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > draggedWidgetX + 5 || MouseHandler.MouseHandler_x < draggedWidgetX - 5 || MouseHandler.MouseHandler_y > draggedWidgetY + 5 || MouseHandler.MouseHandler_y < draggedWidgetY - 5)) { // L: 3117 3118 + field788 = true; // L: 3119 } } - if (Scene.shouldSendWalk()) { - var4 = Scene.Scene_selectedX; - var5 = Scene.Scene_selectedY; - var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2311, packetWriter.isaacCipher); - var18.packetBuffer.writeByte(5); - var18.packetBuffer.writeShort(var5 + SecureRandomFuture.baseY); - var18.packetBuffer.writeShort(var4 + class182.baseX); - var18.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - packetWriter.addNode(var18); - Scene.resetWalking(); - mouseCrossX = MouseHandler.MouseHandler_lastPressedX; - mouseCrossY = MouseHandler.MouseHandler_lastPressedY; - mouseCrossColor = 1; - mouseCrossState = 0; - destinationX = var4; - destinationY = var5; + if (Scene.shouldSendWalk()) { // L: 3124 + var3 = Scene.Scene_selectedX; // L: 3125 + var4 = Scene.Scene_selectedY; // L: 3126 + var47 = getPacketBufferNode(ClientPacket.field2344, packetWriter.isaacCipher); // L: 3128 + var47.packetBuffer.writeByte(5); // L: 3129 + var47.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3130 + var47.packetBuffer.method5654(var3 + WorldMapManager.baseX); // L: 3131 + var47.packetBuffer.writeShort(var4 + WorldMapLabel.baseY); // L: 3132 + packetWriter.addNode(var47); // L: 3133 + Scene.method3360(); // L: 3134 + mouseCrossX = MouseHandler.MouseHandler_lastPressedX; // L: 3135 + mouseCrossY = MouseHandler.MouseHandler_lastPressedY; // L: 3136 + mouseCrossColor = 1; // L: 3137 + mouseCrossState = 0; // L: 3138 + destinationX = var3; // L: 3139 + destinationY = var4; // L: 3140 } - if (var34 != WorldMapSection1.mousedOverWidgetIf1) { - if (var34 != null) { - class234.invalidateWidget(var34); + if (var38 != TriBool.mousedOverWidgetIf1) { // L: 3142 + if (var38 != null) { // L: 3143 + class52.invalidateWidget(var38); } - if (WorldMapSection1.mousedOverWidgetIf1 != null) { - class234.invalidateWidget(WorldMapSection1.mousedOverWidgetIf1); + if (TriBool.mousedOverWidgetIf1 != null) { // L: 3144 + class52.invalidateWidget(TriBool.mousedOverWidgetIf1); } } - if (var36 != SecureRandomCallable.field542 && field825 == field824) { - if (var36 != null) { - class234.invalidateWidget(var36); + if (var34 != Occluder.field1950 && field770 == field828) { // L: 3146 + if (var34 != null) { // L: 3147 + class52.invalidateWidget(var34); } - if (SecureRandomCallable.field542 != null) { - class234.invalidateWidget(SecureRandomCallable.field542); + if (Occluder.field1950 != null) { // L: 3148 + class52.invalidateWidget(Occluder.field1950); } } - if (SecureRandomCallable.field542 != null) { - if (field824 < field825) { - ++field824; - if (field825 == field824) { - class234.invalidateWidget(SecureRandomCallable.field542); + if (Occluder.field1950 != null) { // L: 3150 + if (field828 < field770) { // L: 3151 + ++field828; // L: 3152 + if (field770 == field828) { // L: 3153 + class52.invalidateWidget(Occluder.field1950); } } - } else if (field824 > 0) { - --field824; + } else if (field828 > 0) { // L: 3156 + --field828; } - if (oculusOrbState == 0) { - var4 = class60.localPlayer.x; - var5 = class60.localPlayer.y; - if (class225.oculusOrbFocalPointX - var4 < -500 || class225.oculusOrbFocalPointX - var4 > 500 || HealthBarDefinition.oculusOrbFocalPointY - var5 < -500 || HealthBarDefinition.oculusOrbFocalPointY - var5 > 500) { - class225.oculusOrbFocalPointX = var4; - HealthBarDefinition.oculusOrbFocalPointY = var5; - } - - if (var4 != class225.oculusOrbFocalPointX) { - class225.oculusOrbFocalPointX += (var4 - class225.oculusOrbFocalPointX) / 16; - } - - if (var5 != HealthBarDefinition.oculusOrbFocalPointY) { - HealthBarDefinition.oculusOrbFocalPointY += (var5 - HealthBarDefinition.oculusOrbFocalPointY) / 16; - } - - var6 = class225.oculusOrbFocalPointX >> 7; - var7 = HealthBarDefinition.oculusOrbFocalPointY >> 7; - var8 = Language.getTileHeight(class225.oculusOrbFocalPointX, HealthBarDefinition.oculusOrbFocalPointY, TileItemPile.Client_plane); - var9 = 0; - if (var6 > 3 && var7 > 3 && var6 < 100 && var7 < 100) { - for (var10 = var6 - 4; var10 <= var6 + 4; ++var10) { - for (var11 = var7 - 4; var11 <= var7 + 4; ++var11) { - var12 = TileItemPile.Client_plane; - if (var12 < 3 && (Tiles.Tiles_renderFlags[1][var10][var11] & 2) == 2) { - ++var12; - } - - int var26 = var8 - Tiles.Tiles_heights[var12][var10][var11]; - if (var26 > var9) { - var9 = var26; - } - } + WorldMapAreaData.method752(); // L: 3157 + if (isCameraLocked) { // L: 3158 + var3 = HealthBarUpdate.field1038 * 128 + 64; // L: 3159 + var4 = class8.field43 * 128 + 64; // L: 3160 + var5 = ArchiveLoader.getTileHeight(var3, var4, Huffman.Client_plane) - FileSystem.field2099; // L: 3161 + if (VertexNormal.cameraX < var3) { // L: 3162 + VertexNormal.cameraX = (var3 - VertexNormal.cameraX) * FloorDecoration.field1640 / 1000 + VertexNormal.cameraX + MouseRecorder.field609; // L: 3163 + if (VertexNormal.cameraX > var3) { // L: 3164 + VertexNormal.cameraX = var3; } } - var10 = var9 * 192; - if (var10 > 98048) { - var10 = 98048; - } - - if (var10 < 32768) { - var10 = 32768; - } - - if (var10 > field881) { - field881 += (var10 - field881) / 24; - } else if (var10 < field881) { - field881 += (var10 - field881) / 80; - } - - WorldMapDecoration.field234 = Language.getTileHeight(class60.localPlayer.x, class60.localPlayer.y, TileItemPile.Client_plane) - camFollowHeight; - } else if (oculusOrbState == 1) { - NetSocket.method3674(); - short var32 = -1; - if (KeyHandler.KeyHandler_pressedKeys[33]) { - var32 = 0; - } else if (KeyHandler.KeyHandler_pressedKeys[49]) { - var32 = 1024; - } - - if (KeyHandler.KeyHandler_pressedKeys[48]) { - if (var32 == 0) { - var32 = 1792; - } else if (var32 == 1024) { - var32 = 1280; - } else { - var32 = 1536; - } - } else if (KeyHandler.KeyHandler_pressedKeys[50]) { - if (var32 == 0) { - var32 = 256; - } else if (var32 == 1024) { - var32 = 768; - } else { - var32 = 512; + if (VertexNormal.cameraX > var3) { // L: 3166 + VertexNormal.cameraX -= FloorDecoration.field1640 * (VertexNormal.cameraX - var3) / 1000 + MouseRecorder.field609; // L: 3167 + if (VertexNormal.cameraX < var3) { // L: 3168 + VertexNormal.cameraX = var3; } } - byte var33 = 0; - if (KeyHandler.KeyHandler_pressedKeys[35]) { - var33 = -1; - } else if (KeyHandler.KeyHandler_pressedKeys[51]) { - var33 = 1; - } - - var6 = 0; - if (var32 >= 0 || var33 != 0) { - var6 = KeyHandler.KeyHandler_pressedKeys[81] ? oculusOrbSlowedSpeed * 312783465 * 354155993 : oculusOrbNormalSpeed * -997807461 * -968086637; - var6 *= 16; - field751 = var32; - field752 = var33; - } - - if (field717 < var6) { - field717 += var6 / 8; - if (field717 > var6) { - field717 = var6; + if (FaceNormal.cameraY < var5) { // L: 3170 + FaceNormal.cameraY = (var5 - FaceNormal.cameraY) * FloorDecoration.field1640 / 1000 + FaceNormal.cameraY + MouseRecorder.field609; // L: 3171 + if (FaceNormal.cameraY > var5) { // L: 3172 + FaceNormal.cameraY = var5; } - } else if (field717 > var6) { - field717 = field717 * 9 / 10; } - if (field717 > 0) { - var7 = field717 / 16; - if (field751 >= 0) { - var4 = field751 - Canvas.cameraYaw & 2047; - var8 = Rasterizer3D.Rasterizer3D_sine[var4]; - var9 = Rasterizer3D.Rasterizer3D_cosine[var4]; - class225.oculusOrbFocalPointX += var7 * var8 / 65536; - HealthBarDefinition.oculusOrbFocalPointY += var7 * var9 / 65536; + if (FaceNormal.cameraY > var5) { // L: 3174 + FaceNormal.cameraY -= FloorDecoration.field1640 * (FaceNormal.cameraY - var5) / 1000 + MouseRecorder.field609; // L: 3175 + if (FaceNormal.cameraY < var5) { // L: 3176 + FaceNormal.cameraY = var5; } + } - if (field752 != 0) { - WorldMapDecoration.field234 += var7 * field752; - if (WorldMapDecoration.field234 > 0) { - WorldMapDecoration.field234 = 0; - } + if (AbstractWorldMapData.cameraZ < var4) { // L: 3178 + AbstractWorldMapData.cameraZ = (var4 - AbstractWorldMapData.cameraZ) * FloorDecoration.field1640 / 1000 + AbstractWorldMapData.cameraZ + MouseRecorder.field609; // L: 3179 + if (AbstractWorldMapData.cameraZ > var4) { // L: 3180 + AbstractWorldMapData.cameraZ = var4; } - } else { - field751 = -1; - field752 = -1; } - if (KeyHandler.KeyHandler_pressedKeys[13]) { - GrandExchangeOfferNameComparator.method206(); + if (AbstractWorldMapData.cameraZ > var4) { // L: 3182 + AbstractWorldMapData.cameraZ -= FloorDecoration.field1640 * (AbstractWorldMapData.cameraZ - var4) / 1000 + MouseRecorder.field609; // L: 3183 + if (AbstractWorldMapData.cameraZ < var4) { // L: 3184 + AbstractWorldMapData.cameraZ = var4; + } + } + + var3 = SoundCache.field1472 * 128 + 64; // L: 3186 + var4 = TextureProvider.field1561 * 128 + 64; // L: 3187 + var5 = ArchiveLoader.getTileHeight(var3, var4, Huffman.Client_plane) - IgnoreList.field3620; // L: 3188 + var6 = var3 - VertexNormal.cameraX; // L: 3189 + var7 = var5 - FaceNormal.cameraY; // L: 3190 + var8 = var4 - AbstractWorldMapData.cameraZ; // L: 3191 + var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6)); // L: 3192 + var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047; // L: 3193 + var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047; // L: 3194 + if (var10 < 128) { // L: 3195 + var10 = 128; + } + + if (var10 > 383) { // L: 3196 + var10 = 383; + } + + if (PacketBuffer.cameraPitch < var10) { // L: 3197 + PacketBuffer.cameraPitch = (var10 - PacketBuffer.cameraPitch) * class225.field2592 / 1000 + PacketBuffer.cameraPitch + UserComparator9.field2013; // L: 3198 + if (PacketBuffer.cameraPitch > var10) { // L: 3199 + PacketBuffer.cameraPitch = var10; + } + } + + if (PacketBuffer.cameraPitch > var10) { // L: 3201 + PacketBuffer.cameraPitch -= class225.field2592 * (PacketBuffer.cameraPitch - var10) / 1000 + UserComparator9.field2013; // L: 3202 + if (PacketBuffer.cameraPitch < var10) { // L: 3203 + PacketBuffer.cameraPitch = var10; + } + } + + var12 = var11 - ServerPacket.cameraYaw; // L: 3205 + if (var12 > 1024) { // L: 3206 + var12 -= 2048; + } + + if (var12 < -1024) { // L: 3207 + var12 += 2048; + } + + if (var12 > 0) { // L: 3208 + ServerPacket.cameraYaw = var12 * class225.field2592 / 1000 + ServerPacket.cameraYaw + UserComparator9.field2013; // L: 3209 + ServerPacket.cameraYaw &= 2047; // L: 3210 + } + + if (var12 < 0) { // L: 3212 + ServerPacket.cameraYaw -= UserComparator9.field2013 + -var12 * class225.field2592 / 1000; // L: 3213 + ServerPacket.cameraYaw &= 2047; // L: 3214 + } + + int var26 = var11 - ServerPacket.cameraYaw; // L: 3216 + if (var26 > 1024) { // L: 3217 + var26 -= 2048; + } + + if (var26 < -1024) { // L: 3218 + var26 += 2048; + } + + if (var26 < 0 && var12 > 0 || var26 > 0 && var12 < 0) { // L: 3219 + ServerPacket.cameraYaw = var11; } } - if (MouseHandler.MouseHandler_currentButton == 4 && ArchiveLoader.mouseCam) { - var4 = MouseHandler.MouseHandler_y - mouseCamClickedY; - camAngleDX = var4 * 2; - mouseCamClickedY = var4 != -1 && var4 != 1 ? (MouseHandler.MouseHandler_y + mouseCamClickedY) / 2 : MouseHandler.MouseHandler_y * -137685025 * -1383373793; - var5 = mouseCamClickedX - MouseHandler.MouseHandler_x; - camAngleDY = var5 * 2; - mouseCamClickedX = var5 != -1 && var5 != 1 ? (MouseHandler.MouseHandler_x + mouseCamClickedX) / 2 : MouseHandler.MouseHandler_x * -493092611 * -1040704427; - } else { - if (KeyHandler.KeyHandler_pressedKeys[96]) { - camAngleDY += (-24 - camAngleDY) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[97]) { - camAngleDY += (24 - camAngleDY) / 2; - } else { - camAngleDY /= 2; - } - - if (KeyHandler.KeyHandler_pressedKeys[98]) { - camAngleDX += (12 - camAngleDX) / 2; - } else if (KeyHandler.KeyHandler_pressedKeys[99]) { - camAngleDX += (-12 - camAngleDX) / 2; - } else { - camAngleDX /= 2; - } - - mouseCamClickedY = MouseHandler.MouseHandler_y; - mouseCamClickedX = MouseHandler.MouseHandler_x; + for (var3 = 0; var3 < 5; ++var3) { // L: 3221 + var10002 = field926[var3]++; } - camAngleY = camAngleDY / 2 + camAngleY & 2047; - camAngleX += camAngleDX / 2; - if (camAngleX < 128) { - camAngleX = 128; + ClientPreferences.varcs.tryWrite(); // L: 3222 + var3 = ++MouseHandler.MouseHandler_idleCycles - 1; // L: 3225 + var5 = class41.method622(); // L: 3228 + if (var3 > 15000 && var5 > 15000) { // L: 3229 + logoutTimer = 250; // L: 3230 + MouseHandler.MouseHandler_idleCycles = 14500; // L: 3232 + var18 = getPacketBufferNode(ClientPacket.field2258, packetWriter.isaacCipher); // L: 3235 + packetWriter.addNode(var18); // L: 3236 } - if (camAngleX > 383) { - camAngleX = 383; - } - - if (isCameraLocked) { - WorldMapLabel.method488(); - } - - for (var4 = 0; var4 < 5; ++var4) { - var10002 = field922[var4]++; - } - - AttackOption.varcs.tryWrite(); - var4 = Skills.method4271(); - var5 = KeyHandler.KeyHandler_idleCycles; - PacketBufferNode var27; - if (var4 > 15000 && var5 > 15000) { - logoutTimer = 250; - MouseHandler.MouseHandler_idleCycles = 14500; - var27 = UserComparator4.getPacketBufferNode(ClientPacket.field2243, packetWriter.isaacCipher); - packetWriter.addNode(var27); - } - - ModeWhere.friendSystem.processFriendUpdates(); - ++packetWriter.pendingWrites; - if (packetWriter.pendingWrites > 50) { - var27 = UserComparator4.getPacketBufferNode(ClientPacket.field2285, packetWriter.isaacCipher); - packetWriter.addNode(var27); + class60.friendSystem.processFriendUpdates(); // L: 3238 + ++packetWriter.pendingWrites; // L: 3239 + if (packetWriter.pendingWrites > 50) { // L: 3240 + var18 = getPacketBufferNode(ClientPacket.field2267, packetWriter.isaacCipher); // L: 3242 + packetWriter.addNode(var18); // L: 3243 } try { - packetWriter.flush(); - } catch (IOException var28) { - CollisionMap.method3707(); + packetWriter.flush(); // L: 3246 + } catch (IOException var27) { // L: 3248 + ArchiveLoader.method1208(); // L: 3249 } - return; + return; // L: 3251 } - var42 = var40.widget; - if (var42.childIndex < 0) { + var46 = var45.widget; // L: 3043 + if (var46.childIndex < 0) { // L: 3044 break; } - var38 = WorldMapSprite.getWidget(var42.parentId); - } while(var38 == null || var38.children == null || var42.childIndex >= var38.children.length || var42 != var38.children[var42.childIndex]); + var43 = TileItem.getWidget(var46.parentId); // L: 3045 + } while(var43 == null || var43.children == null || var46.childIndex >= var43.children.length || var46 != var43.children[var46.childIndex]); // L: 3046 - InterfaceParent.runScriptEvent(var40); + Script.runScriptEvent(var45); // L: 3050 } } - var42 = var40.widget; - if (var42.childIndex < 0) { + var46 = var45.widget; // L: 3031 + if (var46.childIndex < 0) { // L: 3032 break; } - var38 = WorldMapSprite.getWidget(var42.parentId); - } while(var38 == null || var38.children == null || var42.childIndex >= var38.children.length || var42 != var38.children[var42.childIndex]); + var43 = TileItem.getWidget(var46.parentId); // L: 3033 + } while(var43 == null || var43.children == null || var46.childIndex >= var43.children.length || var46 != var43.children[var46.childIndex]); // L: 3034 - InterfaceParent.runScriptEvent(var40); + Script.runScriptEvent(var45); // L: 3038 } } - var42 = var40.widget; - if (var42.childIndex < 0) { + var46 = var45.widget; // L: 3019 + if (var46.childIndex < 0) { // L: 3020 break; } - var38 = WorldMapSprite.getWidget(var42.parentId); - } while(var38 == null || var38.children == null || var42.childIndex >= var38.children.length || var42 != var38.children[var42.childIndex]); + var43 = TileItem.getWidget(var46.parentId); // L: 3021 + } while(var43 == null || var43.children == null || var46.childIndex >= var43.children.length || var46 != var43.children[var46.childIndex]); // L: 3022 - InterfaceParent.runScriptEvent(var40); + Script.runScriptEvent(var45); // L: 3026 } } + + var30 = getPacketBufferNode(ClientPacket.field2329, packetWriter.isaacCipher); // L: 2637 + var30.packetBuffer.writeByte(0); // L: 2638 + var3 = var30.packetBuffer.offset; // L: 2639 + class195.performReflectionCheck(var30.packetBuffer); // L: 2640 + var30.packetBuffer.writeLengthByte(var30.packetBuffer.offset - var3); // L: 2641 + packetWriter.addNode(var30); // L: 2642 } } } - } + } // L: 2619 - @ObfuscatedName("fl") + @ObfuscatedName("fd") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1501968527" + garbageValue = "-415953705" ) @Export("resizeJS") void resizeJS() { - int var1 = Varcs.canvasWidth; - int var2 = class52.canvasHeight; - if (super.contentWidth < var1) { + int var1 = FloorDecoration.canvasWidth; // L: 3894 + int var2 = GameShell.canvasHeight; // L: 3895 + if (super.contentWidth < var1) { // L: 3896 var1 = super.contentWidth; } if (super.contentHeight < var2) { - var2 = super.contentHeight; + var2 = super.contentHeight; // L: 3897 } - if (NetSocket.clientPreferences != null) { + if (Tile.clientPreferences != null) { // L: 3898 try { - Client var3 = WorldMapSectionType.client; - Object[] var4 = new Object[]{class58.getWindowedMode()}; - JSObject.getWindow(var3).call("resize", var4); - } catch (Throwable var5) { + class56.method899(class2.client, "resize", new Object[]{class39.getWindowedMode()}); // L: 3900 + } catch (Throwable var4) { // L: 3902 } } - } + } // L: 3904 - @ObfuscatedName("fb") + @ObfuscatedName("fw") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1953660969" + garbageValue = "-1826762039" ) @Export("drawLoggedIn") final void drawLoggedIn() { + if (rootInterface != -1) { // L: 3907 + class58.method913(rootInterface); + } + int var1; - if (rootInterface != -1) { - var1 = rootInterface; - if (UserComparator4.loadInterface(var1)) { - WorldMapDecoration.drawModelComponents(Widget.Widget_interfaceComponents[var1], -1); + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3908 + if (field882[var1]) { // L: 3909 + field883[var1] = true; + } + + field884[var1] = field882[var1]; // L: 3910 + field882[var1] = false; // L: 3911 + } + + field881 = cycle; // L: 3913 + viewportX = -1; // L: 3914 + viewportY = -1; // L: 3915 + VerticalAlignment.hoveredItemContainer = null; // L: 3916 + if (rootInterface != -1) { // L: 3917 + rootWidgetCount = 0; // L: 3918 + PlayerAppearance.drawWidgets(rootInterface, 0, 0, FloorDecoration.canvasWidth, GameShell.canvasHeight, 0, 0, -1); // L: 3919 + } + + Rasterizer2D.Rasterizer2D_resetClip(); // L: 3921 + if (showMouseCross) { // L: 3922 + if (mouseCrossColor == 1) { // L: 3923 + ArchiveLoader.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3924 + } + + if (mouseCrossColor == 2) { // L: 3926 + ArchiveLoader.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); // L: 3927 } } - for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field813[var1]) { - field879[var1] = true; - } - - field880[var1] = field813[var1]; - field813[var1] = false; - } - - field877 = cycle; - viewportX = -1; - viewportY = -1; - TaskHandler.hoveredItemContainer = null; - if (rootInterface != -1) { - rootWidgetCount = 0; - NetFileRequest.drawWidgets(rootInterface, 0, 0, Varcs.canvasWidth, class52.canvasHeight, 0, 0, -1); - } - - Rasterizer2D.Rasterizer2D_resetClip(); - if (showMouseCross) { - if (mouseCrossColor == 1) { - Timer.crossSprites[mouseCrossState / 100].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); - } - - if (mouseCrossColor == 2) { - Timer.crossSprites[mouseCrossState / 100 + 4].drawTransBgAt(mouseCrossX - 8, mouseCrossY - 8); - } - } - - if (!isMenuOpen) { - if (viewportX != -1) { - var1 = viewportX; - int var2 = viewportY; - if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { - int var3 = UrlRequester.method3421(); + if (!isMenuOpen) { // L: 3930 + if (viewportX != -1) { // L: 3931 + var1 = viewportX; // L: 3932 + int var2 = viewportY; // L: 3933 + if ((menuOptionsCount >= 2 || isItemSelected != 0 || isSpellSelected) && showMouseOverText) { // L: 3935 3936 + int var3 = GrandExchangeOffer.method209(); // L: 3937 String var4; - if (isItemSelected == 1 && menuOptionsCount < 2) { + if (isItemSelected == 1 && menuOptionsCount < 2) { // L: 3939 var4 = "Use" + " " + selectedItemName + " " + "->"; - } else if (isSpellSelected && menuOptionsCount < 2) { + } else if (isSpellSelected && menuOptionsCount < 2) { // L: 3940 var4 = selectedSpellActionName + " " + selectedSpellName + " " + "->"; } else { - String var5; - if (var3 < 0) { - var5 = ""; - } else if (menuTargets[var3].length() > 0) { - var5 = menuActions[var3] + " " + menuTargets[var3]; - } else { - var5 = menuActions[var3]; - } - - var4 = var5; + var4 = ApproximateRouteStrategy.method1273(var3); // L: 3941 } - if (menuOptionsCount > 2) { - var4 = var4 + ItemContainer.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; + if (menuOptionsCount > 2) { // L: 3942 + var4 = var4 + WorldMapAreaData.colorStartTag(16777215) + " " + '/' + " " + (menuOptionsCount - 2) + " more options"; } - GrandExchangeOfferNameComparator.fontBold12.drawRandomAlphaAndSpacing(var4, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); + class4.fontBold12.drawRandomAlphaAndSpacing(var4, var1 + 4, var2 + 15, 16777215, 0, cycle / 1000); // L: 3943 } } } else { - WorldMapSection3.method841(); + UserComparator1.method6040(); // L: 3947 } - if (gameDrawingMode == 3) { - for (var1 = 0; var1 < rootWidgetCount; ++var1) { - if (field880[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); - } else if (field879[var1]) { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); + if (gameDrawingMode == 3) { // L: 3948 + for (var1 = 0; var1 < rootWidgetCount; ++var1) { // L: 3949 + if (field884[var1]) { // L: 3950 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128); // L: 3951 + } else if (field883[var1]) { // L: 3953 + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128); // L: 3954 } } } - class1.method16(TileItemPile.Client_plane, class60.localPlayer.x, class60.localPlayer.y, field747); - field747 = 0; - } + class197.method3743(Huffman.Client_plane, WorldMapLabelSize.localPlayer.x, WorldMapLabelSize.localPlayer.y, field737); // L: 3958 + field737 = 0; // L: 3959 + } // L: 3960 - @ObfuscatedName("gt") + @ObfuscatedName("gu") @ObfuscatedSignature( descriptor = "(Ldx;B)Z", - garbageValue = "-15" + garbageValue = "13" ) - final boolean method1768(PacketWriter var1) { - AbstractSocket var2 = var1.getSocket(); - PacketBuffer var3 = var1.packetBuffer; - if (var2 == null) { + final boolean method1707(PacketWriter var1) { + AbstractSocket var2 = var1.getSocket(); // L: 5313 + PacketBuffer var3 = var1.packetBuffer; // L: 5314 + if (var2 == null) { // L: 5315 return false; } else { - String var20; - int var21; + String var17; + int var18; try { int var5; - if (var1.serverPacket == null) { - if (var1.field1347) { - if (!var2.isAvailable(1)) { + if (var1.serverPacket == null) { // L: 5317 + if (var1.field1344) { // L: 5318 + if (!var2.isAvailable(1)) { // L: 5319 return false; } - var2.read(var1.packetBuffer.array, 0, 1); - var1.field1348 = 0; - var1.field1347 = false; + var2.read(var1.packetBuffer.array, 0, 1); // L: 5320 + var1.field1345 = 0; // L: 5321 + var1.field1344 = false; // L: 5322 } - var3.offset = 0; - if (var3.method5657()) { - if (!var2.isAvailable(1)) { + var3.offset = 0; // L: 5324 + if (var3.method5564()) { // L: 5325 + if (!var2.isAvailable(1)) { // L: 5326 return false; } - var2.read(var1.packetBuffer.array, 1, 1); - var1.field1348 = 0; + var2.read(var1.packetBuffer.array, 1, 1); // L: 5327 + var1.field1345 = 0; // L: 5328 } - var1.field1347 = true; - ServerPacket[] var4 = StructDefinition.ServerPacket_values(); - var5 = var3.readSmartByteShortIsaac(); - if (var5 < 0 || var5 >= var4.length) { + var1.field1344 = true; // L: 5330 + ServerPacket[] var4 = class198.ServerPacket_values(); // L: 5331 + var5 = var3.readSmartByteShortIsaac(); // L: 5332 + if (var5 < 0 || var5 >= var4.length) { // L: 5333 throw new IOException(var5 + " " + var3.offset); } - var1.serverPacket = var4[var5]; - var1.serverPacketLength = var1.serverPacket.length; + var1.serverPacket = var4[var5]; // L: 5334 + var1.serverPacketLength = var1.serverPacket.length; // L: 5335 } - if (var1.serverPacketLength == -1) { - if (!var2.isAvailable(1)) { + if (var1.serverPacketLength == -1) { // L: 5337 + if (!var2.isAvailable(1)) { // L: 5338 return false; } - var1.getSocket().read(var3.array, 0, 1); - var1.serverPacketLength = var3.array[0] & 255; + var1.getSocket().read(var3.array, 0, 1); // L: 5339 + var1.serverPacketLength = var3.array[0] & 255; // L: 5340 } - if (var1.serverPacketLength == -2) { - if (!var2.isAvailable(2)) { + if (var1.serverPacketLength == -2) { // L: 5342 + if (!var2.isAvailable(2)) { // L: 5343 return false; } - var1.getSocket().read(var3.array, 0, 2); - var3.offset = 0; - var1.serverPacketLength = var3.readUnsignedShort(); + var1.getSocket().read(var3.array, 0, 2); // L: 5344 + var3.offset = 0; // L: 5345 + var1.serverPacketLength = var3.readUnsignedShort(); // L: 5346 } - if (!var2.isAvailable(var1.serverPacketLength)) { + if (!var2.isAvailable(var1.serverPacketLength)) { // L: 5348 return false; } - var3.offset = 0; - var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1348 = 0; - timer.method5162(); - var1.field1342 = var1.field1351; - var1.field1351 = var1.field1350; - var1.field1350 = var1.serverPacket; + var3.offset = 0; // L: 5349 + var2.read(var3.array, 0, var1.serverPacketLength); // L: 5350 + var1.field1345 = 0; // L: 5351 + timer.method5106(); // L: 5352 + var1.field1346 = var1.field1348; // L: 5353 + var1.field1348 = var1.field1336; // L: 5354 + var1.field1336 = var1.serverPacket; // L: 5355 int var16; - if (ServerPacket.field2163 == var1.serverPacket) { - isCameraLocked = false; - - for (var16 = 0; var16 < 5; ++var16) { - field918[var16] = false; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2214 == var1.serverPacket) { - ModeWhere.friendSystem.readUpdate(var3, var1.serverPacketLength); - field866 = cycleCntr; - var1.serverPacket = null; - return true; - } - - long var7; - long var17; - String var39; - if (ServerPacket.field2200 == var1.serverPacket) { - var39 = var3.readStringCp1252NullTerminated(); - var17 = (long)var3.readUnsignedShort(); - var7 = (long)var3.readMedium(); - PlayerType var9 = (PlayerType)FaceNormal.findEnumerated(VarbitDefinition.PlayerType_values(), var3.readUnsignedByte()); - long var10 = var7 + (var17 << 32); - boolean var12 = false; - - for (int var13 = 0; var13 < 100; ++var13) { - if (field892[var13] == var10) { - var12 = true; - break; + if (ServerPacket.field2161 == var1.serverPacket) { // L: 5356 + for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { // L: 5357 + VarpDefinition var55 = class195.VarpDefinition_get(var16); // L: 5358 + if (var55 != null) { // L: 5359 + Varps.Varps_temp[var16] = 0; // L: 5360 + Varps.Varps_main[var16] = 0; // L: 5361 } } - if (ModeWhere.friendSystem.isIgnored(new Username(var39, class195.loginType))) { - var12 = true; + DevicePcmPlayerProvider.method897(); // L: 5364 + field864 += 32; // L: 5365 + var1.serverPacket = null; // L: 5366 + return true; // L: 5367 + } + + if (ServerPacket.field2219 == var1.serverPacket) { // L: 5369 + byte var59 = var3.method5730(); // L: 5370 + var5 = var3.readUnsignedShort(); // L: 5371 + Varps.Varps_temp[var5] = var59; // L: 5372 + if (Varps.Varps_main[var5] != var59) { // L: 5373 + Varps.Varps_main[var5] = var59; // L: 5374 } - if (!var12 && field787 == 0) { - field892[field730] = var10; - field730 = (field730 + 1) % 100; - String var19 = AbstractFont.escapeBrackets(TileItemPile.method2903(NPC.method2157(var3))); - byte var46; - if (var9.isPrivileged) { - var46 = 7; + Clock.changeGameOptions(var5); // L: 5376 + field863[++field864 - 1 & 31] = var5; // L: 5377 + var1.serverPacket = null; // L: 5378 + return true; // L: 5379 + } + + if (ServerPacket.field2160 == var1.serverPacket) { // L: 5381 + MouseHandler.method1134(class194.field2363); // L: 5382 + var1.serverPacket = null; // L: 5383 + return true; // L: 5384 + } + + if (ServerPacket.field2208 == var1.serverPacket) { // L: 5386 + rebootTimer = var3.readUnsignedShort() * 30; // L: 5387 + field775 = cycleCntr; // L: 5388 + var1.serverPacket = null; // L: 5389 + return true; // L: 5390 + } + + if (ServerPacket.field2186 == var1.serverPacket) { // L: 5392 + World var39 = new World(); // L: 5393 + var39.host = var3.readStringCp1252NullTerminated(); // L: 5394 + var39.id = var3.readUnsignedShort(); // L: 5395 + var5 = var3.readInt(); // L: 5396 + var39.properties = var5; // L: 5397 + CollisionMap.updateGameState(45); // L: 5398 + var2.close(); // L: 5399 + var2 = null; // L: 5400 + Canvas.changeWorld(var39); // L: 5401 + var1.serverPacket = null; // L: 5402 + return false; // L: 5403 + } + + if (ServerPacket.field2196 == var1.serverPacket) { // L: 5405 + var16 = var3.readInt(); // L: 5406 + if (var16 != field758) { // L: 5407 + field758 = var16; // L: 5408 + ItemContainer.method1225(); // L: 5409 + } + + var1.serverPacket = null; // L: 5411 + return true; // L: 5412 + } + + String var42; + boolean var48; + if (ServerPacket.field2222 == var1.serverPacket) { // L: 5414 + var16 = var3.readUShortSmart(); // L: 5415 + var48 = var3.readUnsignedByte() == 1; // L: 5416 + var42 = ""; // L: 5417 + boolean var47 = false; // L: 5418 + if (var48) { // L: 5419 + var42 = var3.readStringCp1252NullTerminated(); // L: 5420 + if (class60.friendSystem.isIgnored(new Username(var42, WorldMapAreaData.loginType))) { // L: 5421 + var47 = true; + } + } + + String var44 = var3.readStringCp1252NullTerminated(); // L: 5423 + if (!var47) { // L: 5424 + WorldMapRectangle.addGameMessage(var16, var42, var44); + } + + var1.serverPacket = null; // L: 5425 + return true; // L: 5426 + } + + if (ServerPacket.field2234 == var1.serverPacket) { // L: 5428 + if (rootInterface != -1) { // L: 5429 + ClientPacket.runIntfCloseListeners(rootInterface, 0); + } + + var1.serverPacket = null; // L: 5430 + return true; // L: 5431 + } + + int var7; + long var9; + int var19; + if (ServerPacket.field2223 == var1.serverPacket) { // L: 5433 + var16 = var3.method5667(); // L: 5434 + var5 = var3.method5656(); // L: 5435 + if (var5 == 65535) { // L: 5436 + var5 = -1; + } + + var18 = var3.readInt(); // L: 5437 + var7 = var3.method5656(); // L: 5438 + if (var7 == 65535) { // L: 5439 + var7 = -1; + } + + for (var19 = var5; var19 <= var7; ++var19) { // L: 5440 + var9 = ((long)var16 << 32) + (long)var19; // L: 5441 + Node var46 = widgetFlags.get(var9); // L: 5442 + if (var46 != null) { // L: 5443 + var46.remove(); + } + + widgetFlags.put(new IntegerNode(var18), var9); // L: 5444 + } + + var1.serverPacket = null; // L: 5446 + return true; // L: 5447 + } + + long var12; + int var20; + int var22; + InterfaceParent var56; + if (ServerPacket.field2180 == var1.serverPacket) { // L: 5449 + var16 = var3.offset + var1.serverPacketLength; // L: 5450 + var5 = var3.readUnsignedShort(); // L: 5451 + var18 = var3.readUnsignedShort(); // L: 5452 + if (var5 != rootInterface) { // L: 5453 + rootInterface = var5; // L: 5454 + this.resizeRoot(false); // L: 5455 + PacketWriter.Widget_resetModelFrames(rootInterface); // L: 5456 + class235.runWidgetOnLoadListener(rootInterface); // L: 5457 + + for (var7 = 0; var7 < 100; ++var7) { // L: 5458 + field882[var7] = true; + } + } + + InterfaceParent var45; + for (; var18-- > 0; var45.field580 = true) { // L: 5460 5470 + var7 = var3.readInt(); // L: 5461 + var19 = var3.readUnsignedShort(); // L: 5462 + var20 = var3.readUnsignedByte(); // L: 5463 + var45 = (InterfaceParent)interfaceParents.get((long)var7); // L: 5464 + if (var45 != null && var19 != var45.group) { // L: 5465 + class58.closeInterface(var45, true); // L: 5466 + var45 = null; // L: 5467 + } + + if (var45 == null) { // L: 5469 + var45 = WorldMapSprite.method494(var7, var19, var20); + } + } + + for (var56 = (InterfaceParent)interfaceParents.first(); var56 != null; var56 = (InterfaceParent)interfaceParents.next()) { // L: 5472 + if (var56.field580) { // L: 5473 + var56.field580 = false; } else { - var46 = 3; - } - - if (var9.modIcon != -1) { - ObjectSound.addGameMessage(var46, WorldMapRegion.method611(var9.modIcon) + var39, var19); - } else { - ObjectSound.addGameMessage(var46, var39, var19); + class58.closeInterface(var56, true); // L: 5475 } } - var1.serverPacket = null; - return true; - } + widgetFlags = new NodeHashTable(512); // L: 5478 - if (ServerPacket.field2153 == var1.serverPacket) { - World.privateChatMode = ItemContainer.method1232(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } + while (var3.offset < var16) { // L: 5479 + var7 = var3.readInt(); // L: 5480 + var19 = var3.readUnsignedShort(); // L: 5481 + var20 = var3.readUnsignedShort(); // L: 5482 + var22 = var3.readInt(); // L: 5483 - if (ServerPacket.field2206 == var1.serverPacket) { - for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { - if (Varps.Varps_main[var16] != Varps.Varps_temp[var16]) { - Varps.Varps_main[var16] = Varps.Varps_temp[var16]; - WorldMapSection0.changeGameOptions(var16); - field859[++field860 - 1 & 31] = var16; + for (int var23 = var19; var23 <= var20; ++var23) { // L: 5484 + var12 = ((long)var7 << 32) + (long)var23; // L: 5485 + widgetFlags.put(new IntegerNode(var22), var12); // L: 5486 } } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5489 + return true; // L: 5490 } - if (ServerPacket.field2160 == var1.serverPacket) { - class2.updateNpcs(true, var3); - var1.serverPacket = null; - return true; + if (ServerPacket.field2179 == var1.serverPacket) { // L: 5492 + class60.friendSystem.ignoreList.read(var3, var1.serverPacketLength); // L: 5493 + KitDefinition.FriendSystem_invalidateIgnoreds(); // L: 5494 + field870 = cycleCntr; // L: 5495 + var1.serverPacket = null; // L: 5496 + return true; // L: 5497 } - if (ServerPacket.field2235 == var1.serverPacket) { - var39 = var3.readStringCp1252NullTerminated(); - var20 = AbstractFont.escapeBrackets(TileItemPile.method2903(NPC.method2157(var3))); - ObjectSound.addGameMessage(6, var39, var20); - var1.serverPacket = null; - return true; + if (ServerPacket.field2172 == var1.serverPacket) { // L: 5499 + WorldMapID.loadRegions(true, var1.packetBuffer); // L: 5500 + var1.serverPacket = null; // L: 5501 + return true; // L: 5502 + } + + if (ServerPacket.field2206 == var1.serverPacket) { // L: 5504 + MouseHandler.method1134(class194.field2367); // L: 5505 + var1.serverPacket = null; // L: 5506 + return true; // L: 5507 + } + + if (ServerPacket.field2221 == var1.serverPacket) { // L: 5509 + var16 = var3.readUnsignedByte(); // L: 5510 + Frames.method3393(var16); // L: 5511 + var1.serverPacket = null; // L: 5512 + return true; // L: 5513 + } + + if (ServerPacket.field2184 == var1.serverPacket) { // L: 5515 + WorldMapLabelSize.readReflectionCheck(var3, var1.serverPacketLength); // L: 5516 + var1.serverPacket = null; // L: 5517 + return true; // L: 5518 + } + + if (ServerPacket.field2174 == var1.serverPacket) { // L: 5520 + isCameraLocked = true; // L: 5521 + SoundCache.field1472 = var3.readUnsignedByte(); // L: 5522 + TextureProvider.field1561 = var3.readUnsignedByte(); // L: 5523 + IgnoreList.field3620 = var3.readUnsignedShort(); // L: 5524 + UserComparator9.field2013 = var3.readUnsignedByte(); // L: 5525 + class225.field2592 = var3.readUnsignedByte(); // L: 5526 + if (class225.field2592 >= 100) { // L: 5527 + var16 = SoundCache.field1472 * 128 + 64; // L: 5528 + var5 = TextureProvider.field1561 * 128 + 64; // L: 5529 + var18 = ArchiveLoader.getTileHeight(var16, var5, Huffman.Client_plane) - IgnoreList.field3620; // L: 5530 + var7 = var16 - VertexNormal.cameraX; // L: 5531 + var19 = var18 - FaceNormal.cameraY; // L: 5532 + var20 = var5 - AbstractWorldMapData.cameraZ; // L: 5533 + var22 = (int)Math.sqrt((double)(var7 * var7 + var20 * var20)); // L: 5534 + PacketBuffer.cameraPitch = (int)(Math.atan2((double)var19, (double)var22) * 325.949D) & 2047; // L: 5535 + ServerPacket.cameraYaw = (int)(Math.atan2((double)var7, (double)var20) * -325.949D) & 2047; // L: 5536 + if (PacketBuffer.cameraPitch < 128) { // L: 5537 + PacketBuffer.cameraPitch = 128; + } + + if (PacketBuffer.cameraPitch > 383) { // L: 5538 + PacketBuffer.cameraPitch = 383; + } + } + + var1.serverPacket = null; // L: 5540 + return true; // L: 5541 + } + + if (ServerPacket.field2195 == var1.serverPacket) { // L: 5543 + isCameraLocked = false; // L: 5544 + + for (var16 = 0; var16 < 5; ++var16) { // L: 5545 + field922[var16] = false; + } + + var1.serverPacket = null; // L: 5546 + return true; // L: 5547 + } + + if (ServerPacket.field2164 == var1.serverPacket) { // L: 5549 + var16 = var3.readInt(); // L: 5550 + InterfaceParent var54 = (InterfaceParent)interfaceParents.get((long)var16); // L: 5551 + if (var54 != null) { // L: 5552 + class58.closeInterface(var54, true); + } + + if (meslayerContinueWidget != null) { // L: 5553 + class52.invalidateWidget(meslayerContinueWidget); // L: 5554 + meslayerContinueWidget = null; // L: 5555 + } + + var1.serverPacket = null; // L: 5557 + return true; // L: 5558 + } + + if (ServerPacket.field2191 == var1.serverPacket) { // L: 5560 + byte[] var38 = new byte[var1.serverPacketLength]; // L: 5561 + var3.method5566(var38, 0, var38.length); // L: 5562 + Buffer var53 = new Buffer(var38); // L: 5563 + var42 = var53.readStringCp1252NullTerminated(); // L: 5564 + class280.openURL(var42, true, false); // L: 5565 + var1.serverPacket = null; // L: 5566 + return true; // L: 5567 + } + + if (ServerPacket.field2205 == var1.serverPacket) { // L: 5569 + var16 = var3.method5655(); // L: 5570 + rootInterface = var16; // L: 5571 + this.resizeRoot(false); // L: 5572 + PacketWriter.Widget_resetModelFrames(var16); // L: 5573 + class235.runWidgetOnLoadListener(rootInterface); // L: 5574 + + for (var5 = 0; var5 < 100; ++var5) { // L: 5575 + field882[var5] = true; + } + + var1.serverPacket = null; // L: 5576 + return true; // L: 5577 + } + + if (ServerPacket.field2244 == var1.serverPacket) { // L: 5579 + isCameraLocked = true; // L: 5580 + HealthBarUpdate.field1038 = var3.readUnsignedByte(); // L: 5581 + class8.field43 = var3.readUnsignedByte(); // L: 5582 + FileSystem.field2099 = var3.readUnsignedShort(); // L: 5583 + MouseRecorder.field609 = var3.readUnsignedByte(); // L: 5584 + FloorDecoration.field1640 = var3.readUnsignedByte(); // L: 5585 + if (FloorDecoration.field1640 >= 100) { // L: 5586 + VertexNormal.cameraX = HealthBarUpdate.field1038 * 128 + 64; // L: 5587 + AbstractWorldMapData.cameraZ = class8.field43 * 128 + 64; // L: 5588 + FaceNormal.cameraY = ArchiveLoader.getTileHeight(VertexNormal.cameraX, AbstractWorldMapData.cameraZ, Huffman.Client_plane) - FileSystem.field2099; // L: 5589 + } + + var1.serverPacket = null; // L: 5591 + return true; // L: 5592 + } + + if (ServerPacket.field2239 == var1.serverPacket) { // L: 5594 + FloorOverlayDefinition.updateNpcs(true, var3); // L: 5595 + var1.serverPacket = null; // L: 5596 + return true; // L: 5597 + } + + if (ServerPacket.field2211 == var1.serverPacket) { // L: 5599 + var16 = var3.readInt(); // L: 5600 + var5 = var3.method5657(); // L: 5601 + Varps.Varps_temp[var5] = var16; // L: 5602 + if (Varps.Varps_main[var5] != var16) { // L: 5603 + Varps.Varps_main[var5] = var16; // L: 5604 + } + + Clock.changeGameOptions(var5); // L: 5606 + field863[++field864 - 1 & 31] = var5; // L: 5607 + var1.serverPacket = null; // L: 5608 + return true; // L: 5609 } Widget var6; - if (ServerPacket.field2193 == var1.serverPacket) { - var16 = var3.method5766(); - var5 = var3.method5867(); - var6 = WorldMapSprite.getWidget(var16); - if (var6.modelType != 2 || var5 != var6.modelId) { - var6.modelType = 2; - var6.modelId = var5; - class234.invalidateWidget(var6); + if (ServerPacket.field2189 == var1.serverPacket) { // L: 5611 + var16 = var3.method5655(); // L: 5612 + var5 = var3.method5667(); // L: 5613 + var6 = TileItem.getWidget(var5); // L: 5614 + if (var6.modelType != 1 || var16 != var6.modelId) { // L: 5615 + var6.modelType = 1; // L: 5616 + var6.modelId = var16; // L: 5617 + class52.invalidateWidget(var6); // L: 5618 } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5620 + return true; // L: 5621 } - if (ServerPacket.field2157 == var1.serverPacket) { - var39 = var3.readStringCp1252NullTerminated(); - Object[] var55 = new Object[var39.length() + 1]; - - for (var21 = var39.length() - 1; var21 >= 0; --var21) { - if (var39.charAt(var21) == 's') { - var55[var21 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var55[var21 + 1] = new Integer(var3.readInt()); - } + if (ServerPacket.field2242 == var1.serverPacket) { // L: 5623 + destinationX = var3.readUnsignedByte(); // L: 5624 + if (destinationX == 255) { // L: 5625 + destinationX = 0; } - var55[0] = new Integer(var3.readInt()); - ScriptEvent var45 = new ScriptEvent(); - var45.args = var55; - InterfaceParent.runScriptEvent(var45); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2182 == var1.serverPacket) { - ModeWhere.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - WorldMapSprite.FriendSystem_invalidateIgnoreds(); - field866 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2204 == var1.serverPacket) { - var16 = var3.method5755(); - if (var16 == 65535) { - var16 = -1; + destinationY = var3.readUnsignedByte(); // L: 5626 + if (destinationY == 255) { // L: 5627 + destinationY = 0; } - UserComparator9.playSong(var16); - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5628 + return true; // L: 5629 } - if (ServerPacket.field2171 == var1.serverPacket) { - var16 = var3.method5757(); - if (var16 == 65535) { - var16 = -1; + if (ServerPacket.field2220 == var1.serverPacket) { // L: 5631 + Player.privateChatMode = TileItem.method2202(var3.readUnsignedByte()); // L: 5632 + var1.serverPacket = null; // L: 5633 + return true; // L: 5634 + } + + if (ServerPacket.field2227 == var1.serverPacket) { // L: 5636 + var16 = var3.method5708(); // L: 5637 + var48 = var3.method5612() == 1; // L: 5638 + var6 = TileItem.getWidget(var16); // L: 5639 + if (var48 != var6.isHidden) { // L: 5640 + var6.isHidden = var48; // L: 5641 + class52.invalidateWidget(var6); // L: 5642 } - var5 = var3.method5761(); - MouseRecorder.playSoundJingle(var16, var5); - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5644 + return true; // L: 5645 } - if (ServerPacket.field2194 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - MidiPcmStream.forceDisconnect(var16); - var1.serverPacket = null; - return false; + if (ServerPacket.field2202 == var1.serverPacket) { // L: 5647 + MouseHandler.method1134(class194.field2371); // L: 5648 + var1.serverPacket = null; // L: 5649 + return true; // L: 5650 } - if (ServerPacket.field2209 == var1.serverPacket) { - for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { - VarpDefinition var54 = class219.VarpDefinition_get(var16); - if (var54 != null) { - Varps.Varps_temp[var16] = 0; - Varps.Varps_main[var16] = 0; - } + if (ServerPacket.field2238 == var1.serverPacket) { // L: 5652 + var16 = var3.readUnsignedShort(); // L: 5653 + var5 = var3.readUnsignedByte(); // L: 5654 + var18 = var3.readUnsignedShort(); // L: 5655 + class7.queueSoundEffect(var16, var5, var18); // L: 5656 + var1.serverPacket = null; // L: 5657 + return true; // L: 5658 + } + + if (ServerPacket.field2171 == var1.serverPacket) { // L: 5660 + ViewportMouse.method3098(var3.readStringCp1252NullTerminated()); // L: 5661 + var1.serverPacket = null; // L: 5662 + return true; // L: 5663 + } + + Widget var51; + if (ServerPacket.field2182 == var1.serverPacket) { // L: 5665 + var16 = var3.method5708(); // L: 5666 + var51 = TileItem.getWidget(var16); // L: 5667 + + for (var18 = 0; var18 < var51.itemIds.length; ++var18) { // L: 5668 + var51.itemIds[var18] = -1; // L: 5669 + var51.itemIds[var18] = 0; // L: 5670 } - Buffer.method5950(); - field860 += 32; - var1.serverPacket = null; - return true; + class52.invalidateWidget(var51); // L: 5672 + var1.serverPacket = null; // L: 5673 + return true; // L: 5674 } - if (ServerPacket.field2180 == var1.serverPacket) { - rebootTimer = var3.readUnsignedShort() * 30; - field870 = cycleCntr; - var1.serverPacket = null; - return true; + if (ServerPacket.field2214 == var1.serverPacket) { // L: 5676 + class60.friendSystem.readUpdate(var3, var1.serverPacketLength); // L: 5677 + field870 = cycleCntr; // L: 5678 + var1.serverPacket = null; // L: 5679 + return true; // L: 5680 } - int var22; - if (ServerPacket.field2155 == var1.serverPacket) { - Buffer.method5950(); - var16 = var3.method5748(); - var5 = var3.method5765(); - var21 = var3.method5936(); - experience[var21] = var5; - currentLevels[var21] = var16; - levels[var21] = 1; - - for (var22 = 0; var22 < 98; ++var22) { - if (var5 >= Skills.Skills_experienceTable[var22]) { - levels[var21] = var22 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var21; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2178 == var1.serverPacket) { - MouseRecorder.logOut(); - var1.serverPacket = null; - return false; - } - - long var23; - long var25; - if (ServerPacket.field2217 == var1.serverPacket) { - var39 = var3.readStringCp1252NullTerminated(); - var17 = var3.readLong(); - var7 = (long)var3.readUnsignedShort(); - var23 = (long)var3.readMedium(); - PlayerType var44 = (PlayerType)FaceNormal.findEnumerated(VarbitDefinition.PlayerType_values(), var3.readUnsignedByte()); - var25 = var23 + (var7 << 32); - boolean var14 = false; - - for (int var15 = 0; var15 < 100; ++var15) { - if (field892[var15] == var25) { - var14 = true; - break; - } - } - - if (var44.isUser && ModeWhere.friendSystem.isIgnored(new Username(var39, class195.loginType))) { - var14 = true; - } - - if (!var14 && field787 == 0) { - field892[field730] = var25; - field730 = (field730 + 1) % 100; - String var27 = AbstractFont.escapeBrackets(TileItemPile.method2903(NPC.method2157(var3))); - if (var44.modIcon != -1) { - WorldMapID.addChatMessage(9, WorldMapRegion.method611(var44.modIcon) + var39, var27, WorldMapData_0.base37DecodeLong(var17)); - } else { - WorldMapID.addChatMessage(9, var39, var27, WorldMapData_0.base37DecodeLong(var17)); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2205 == var1.serverPacket) { - class39.method616(class194.field2362); - var1.serverPacket = null; - return true; - } - - Widget var58; - if (ServerPacket.field2203 == var1.serverPacket) { - var16 = var3.method5867(); - var5 = var3.method5766(); - var21 = var3.readUnsignedShort(); - var58 = WorldMapSprite.getWidget(var5); - var58.field2658 = var16 + (var21 << 16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2198 == var1.serverPacket) { - World var38 = new World(); - var38.host = var3.readStringCp1252NullTerminated(); - var38.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var38.properties = var5; - ClientPreferences.updateGameState(45); - var2.close(); - var2 = null; - Friend.changeWorld(var38); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2201 == var1.serverPacket) { - var16 = var3.method5767(); - var5 = var3.readUnsignedShort(); - var6 = WorldMapSprite.getWidget(var16); - if (var6 != null && var6.type == 0) { - if (var5 > var6.scrollHeight - var6.height) { - var5 = var6.scrollHeight - var6.height; - } - - if (var5 < 0) { - var5 = 0; - } - - if (var5 != var6.scrollY) { - var6.scrollY = var5; - class234.invalidateWidget(var6); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2238 == var1.serverPacket) { - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.method5421(var3); - } - - Frames.method3399(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2175 == var1.serverPacket) { - Buffer.method5950(); - runEnergy = var3.readUnsignedByte(); - field870 = cycleCntr; - var1.serverPacket = null; - return true; - } - - InterfaceParent var28; - if (ServerPacket.field2167 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - var5 = var3.method5867(); - var21 = var3.method5767(); - var28 = (InterfaceParent)interfaceParents.get((long)var21); - if (var28 != null) { - class41.closeInterface(var28, var5 != var28.group); - } - - WorldMapLabel.method486(var21, var5, var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2161 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var16] = new GrandExchangeOffer(); - var3.offset += 18; - } else { - --var3.offset; - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); - } - - field818 = cycleCntr; - var1.serverPacket = null; - return true; - } - - String var41; - if (ServerPacket.field2237 == var1.serverPacket) { - var16 = var3.readUShortSmart(); - boolean var47 = var3.readUnsignedByte() == 1; - var41 = ""; - boolean var56 = false; - if (var47) { - var41 = var3.readStringCp1252NullTerminated(); - if (ModeWhere.friendSystem.isIgnored(new Username(var41, class195.loginType))) { - var56 = true; - } - } - - String var43 = var3.readStringCp1252NullTerminated(); - if (!var56) { - ObjectSound.addGameMessage(var16, var41, var43); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2196 == var1.serverPacket) { - var16 = var3.method5767(); - var5 = var3.method5757(); - Varps.Varps_temp[var5] = var16; - if (Varps.Varps_main[var5] != var16) { - Varps.Varps_main[var5] = var16; - } - - WorldMapSection0.changeGameOptions(var5); - field859[++field860 - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2166 == var1.serverPacket) { - var16 = var3.method5867(); - LoginScreenAnimation.method1908(var16); - changedItemContainers[++field878 - 1 & 31] = var16 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2154 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var21 = var3.readUnsignedShort(); - AbstractWorldMapIcon.queueSoundEffect(var16, var5, var21); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2234 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var21 = var3.readUnsignedByte(); - var22 = var3.readUnsignedByte(); - field918[var16] = true; - field919[var16] = var5; - field775[var16] = var21; - field778[var16] = var22; - field922[var16] = 0; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2228 == var1.serverPacket) { - var16 = var3.method5767(); - var5 = var3.method5755(); - var6 = WorldMapSprite.getWidget(var16); - if (var6.modelType != 1 || var5 != var6.modelId) { - var6.modelType = 1; - var6.modelId = var5; - class234.invalidateWidget(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2223 == var1.serverPacket) { - class8.loadRegions(true, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - int var29; - if (ServerPacket.field2232 == var1.serverPacket) { - var16 = var3.method5766(); - var5 = var3.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - var21 = var3.method5755(); - if (var21 == 65535) { - var21 = -1; - } - - var22 = var3.method5765(); - - for (var29 = var5; var29 <= var21; ++var29) { - var23 = (long)var29 + ((long)var16 << 32); - Node var11 = widgetFlags.get(var23); - if (var11 != null) { - var11.remove(); - } - - widgetFlags.put(new IntegerNode(var22), var23); - } - - var1.serverPacket = null; - return true; - } - - int var30; - int var31; - if (ServerPacket.field2224 == var1.serverPacket) { - isCameraLocked = true; - DevicePcmPlayerProvider.field435 = var3.readUnsignedByte(); - class9.field42 = var3.readUnsignedByte(); - class206.field2446 = var3.readUnsignedShort(); - class329.field3867 = var3.readUnsignedByte(); - WorldMapCacheName.field329 = var3.readUnsignedByte(); - if (WorldMapCacheName.field329 >= 100) { - var16 = DevicePcmPlayerProvider.field435 * 128 + 64; - var5 = class9.field42 * 128 + 64; - var21 = Language.getTileHeight(var16, var5, TileItemPile.Client_plane) - class206.field2446; - var22 = var16 - MouseHandler.cameraX; - var29 = var21 - WorldMapSection3.cameraY; - var30 = var5 - ObjectSound.cameraZ; - var31 = (int)Math.sqrt((double)(var22 * var22 + var30 * var30)); - TilePaint.cameraPitch = (int)(Math.atan2((double)var29, (double)var31) * 325.949D) & 2047; - Canvas.cameraYaw = (int)(Math.atan2((double)var22, (double)var30) * -325.949D) & 2047; - if (TilePaint.cameraPitch < 128) { - TilePaint.cameraPitch = 128; - } - - if (TilePaint.cameraPitch > 383) { - TilePaint.cameraPitch = 383; - } - } - - var1.serverPacket = null; - return true; - } - - boolean var48; - if (ServerPacket.field2174 == var1.serverPacket) { - var48 = var3.readBoolean(); - if (var48) { - if (class278.field3585 == null) { - class278.field3585 = new class247(); - } - } else { - class278.field3585 = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2218 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.method5867(); - if (var5 == 65535) { - var5 = -1; - } - - var21 = var3.method5766(); - var58 = WorldMapSprite.getWidget(var16); - ItemDefinition var42; - if (!var58.isIf3) { - if (var5 == -1) { - var58.modelType = 0; - var1.serverPacket = null; - return true; - } - - var42 = KitDefinition.ItemDefinition_get(var5); - var58.modelType = 4; - var58.modelId = var5; - var58.modelAngleX = var42.xan2d; - var58.modelAngleY = var42.yan2d; - var58.modelZoom = var42.zoom2d * 100 / var21; - class234.invalidateWidget(var58); - } else { - var58.itemId = var5; - var58.itemQuantity = var21; - var42 = KitDefinition.ItemDefinition_get(var5); - var58.modelAngleX = var42.xan2d; - var58.modelAngleY = var42.yan2d; - var58.modelAngleZ = var42.zan2d; - var58.modelOffsetX = var42.offsetX2d; - var58.modelOffsetY = var42.offsetY2d; - var58.modelZoom = var42.zoom2d; - if (var42.isStackable == 1) { - var58.itemQuantityMode = 1; - } else { - var58.itemQuantityMode = 2; - } - - if (var58.field2657 > 0) { - var58.modelZoom = var58.modelZoom * 32 / var58.field2657; - } else if (var58.rawWidth > 0) { - var58.modelZoom = var58.modelZoom * 32 / var58.rawWidth; - } - - class234.invalidateWidget(var58); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2179 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - var20 = var3.readStringCp1252NullTerminated(); - var21 = var3.readUnsignedByte(); - if (var21 >= 1 && var21 <= 8) { - if (var20.equalsIgnoreCase("null")) { - var20 = null; - } - - playerMenuActions[var21 - 1] = var20; - playerOptionsPriorities[var21 - 1] = var16 == 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2229 == var1.serverPacket) { - var16 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - var21 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - WorldMapSection3.Widget_resetModelFrames(rootInterface); - UserComparator4.runWidgetOnLoadListener(rootInterface); - - for (var22 = 0; var22 < 100; ++var22) { - field813[var22] = true; - } - } - - InterfaceParent var59; - for (; var21-- > 0; var59.field587 = true) { - var22 = var3.readInt(); - var29 = var3.readUnsignedShort(); - var30 = var3.readUnsignedByte(); - var59 = (InterfaceParent)interfaceParents.get((long)var22); - if (var59 != null && var29 != var59.group) { - class41.closeInterface(var59, true); - var59 = null; - } - - if (var59 == null) { - var59 = WorldMapLabel.method486(var22, var29, var30); - } - } - - for (var28 = (InterfaceParent)interfaceParents.first(); var28 != null; var28 = (InterfaceParent)interfaceParents.next()) { - if (var28.field587) { - var28.field587 = false; - } else { - class41.closeInterface(var28, true); - } - } - - widgetFlags = new NodeHashTable(512); - - while (var3.offset < var16) { - var22 = var3.readInt(); - var29 = var3.readUnsignedShort(); - var30 = var3.readUnsignedShort(); - var31 = var3.readInt(); - - for (int var33 = var29; var33 <= var30; ++var33) { - var25 = (long)var33 + ((long)var22 << 32); - widgetFlags.put(new IntegerNode(var31), var25); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2158 == var1.serverPacket) { - var16 = var3.method5765(); - var5 = var3.method5759(); - var21 = var3.method5758(); - var58 = WorldMapSprite.getWidget(var16); - if (var5 != var58.rawX || var21 != var58.rawY || var58.xAlignment != 0 || var58.yAlignment != 0) { - var58.rawX = var5; - var58.rawY = var21; - var58.xAlignment = 0; - var58.yAlignment = 0; - class234.invalidateWidget(var58); - this.alignWidget(var58); - if (var58.type == 0) { - WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var58, false); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2168 == var1.serverPacket) { - class39.method616(class194.field2361); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2220 == var1.serverPacket) { - ModeWhere.friendSystem.method1981(); - field866 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2213 == var1.serverPacket) { - class39.method616(class194.field2359); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2186 == var1.serverPacket) { - var16 = var3.readInt(); - if (var16 != field836) { - field836 = var16; - WorldMapLabelSize.method247(); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2216 == var1.serverPacket) { - class39.method616(class194.field2354); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2172 == var1.serverPacket) { - Buffer.method5950(); - weight = var3.readShort(); - field870 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2222 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readInt(); - var21 = VerticalAlignment.getGcDuration(); - PacketBufferNode var57 = UserComparator4.getPacketBufferNode(ClientPacket.field2323, packetWriter.isaacCipher); - var57.packetBuffer.method5744(GameShell.fps); - var57.packetBuffer.method5837(var21); - var57.packetBuffer.method5762(var16); - var57.packetBuffer.method5764(var5); - packetWriter.addNode(var57); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2156 == var1.serverPacket) { - class39.method616(class194.field2355); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2187 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { + if (ServerPacket.field2165 == var1.serverPacket) { // L: 5682 + var16 = var3.readInt(); // L: 5683 + var5 = var3.readUnsignedShort(); // L: 5684 + if (var16 < -70000) { // L: 5685 var5 += 32768; } - if (var16 >= 0) { - var6 = WorldMapSprite.getWidget(var16); + if (var16 >= 0) { // L: 5687 + var6 = TileItem.getWidget(var16); } else { - var6 = null; + var6 = null; // L: 5688 } - if (var6 != null) { - for (var22 = 0; var22 < var6.itemIds.length; ++var22) { - var6.itemIds[var22] = 0; - var6.itemQuantities[var22] = 0; + if (var6 != null) { // L: 5689 + for (var7 = 0; var7 < var6.itemIds.length; ++var7) { // L: 5690 + var6.itemIds[var7] = 0; // L: 5691 + var6.itemQuantities[var7] = 0; // L: 5692 } } - SoundCache.clearItemContainer(var5); - var22 = var3.readUnsignedShort(); + SequenceDefinition.clearItemContainer(var5); // L: 5695 + var7 = var3.readUnsignedShort(); // L: 5696 - for (var29 = 0; var29 < var22; ++var29) { - var30 = var3.readUnsignedByte(); - if (var30 == 255) { - var30 = var3.method5765(); + for (var19 = 0; var19 < var7; ++var19) { // L: 5697 + var20 = var3.method5655(); // L: 5698 + var22 = var3.method5612(); // L: 5699 + if (var22 == 255) { // L: 5700 + var22 = var3.method5708(); } - var31 = var3.method5755(); - if (var6 != null && var29 < var6.itemIds.length) { - var6.itemIds[var29] = var31; - var6.itemQuantities[var29] = var30; + if (var6 != null && var19 < var6.itemIds.length) { // L: 5701 5702 + var6.itemIds[var19] = var20; // L: 5703 + var6.itemQuantities[var19] = var22; // L: 5704 } - WorldMapSprite.itemContainerSetItem(var5, var29, var31 - 1, var30); + MidiPcmStream.itemContainerSetItem(var5, var19, var20 - 1, var22); // L: 5707 } - if (var6 != null) { - class234.invalidateWidget(var6); + if (var6 != null) { // L: 5709 + class52.invalidateWidget(var6); } - Buffer.method5950(); - changedItemContainers[++field878 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; + DevicePcmPlayerProvider.method897(); // L: 5710 + changedItemContainers[++field903 - 1 & 31] = var5 & 32767; // L: 5711 + var1.serverPacket = null; // L: 5712 + return true; // L: 5713 } - if (ServerPacket.field2195 == var1.serverPacket) { - byte[] var37 = new byte[var1.serverPacketLength]; - var3.method5680(var37, 0, var37.length); - Buffer var53 = new Buffer(var37); - var41 = var53.readStringCp1252NullTerminated(); - WorldMapSectionType.openURL(var41, true, false); - var1.serverPacket = null; - return true; + if (ServerPacket.field2209 == var1.serverPacket) { // L: 5715 + var16 = var3.readInt(); // L: 5716 + var5 = var3.readInt(); // L: 5717 + var18 = WorldMapData_1.getGcDuration(); // L: 5718 + PacketBufferNode var57 = getPacketBufferNode(ClientPacket.field2262, packetWriter.isaacCipher); // L: 5720 + var57.packetBuffer.writeIntME(var18); // L: 5721 + var57.packetBuffer.method5645(GameShell.fps); // L: 5722 + var57.packetBuffer.method5662(var16); // L: 5723 + var57.packetBuffer.writeShortLE(var5); // L: 5724 + packetWriter.addNode(var57); // L: 5725 + var1.serverPacket = null; // L: 5726 + return true; // L: 5727 } - if (ServerPacket.field2162 == var1.serverPacket) { - class39.method616(class194.field2358); - var1.serverPacket = null; - return true; + if (ServerPacket.field2163 == var1.serverPacket) { // L: 5729 + for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { // L: 5730 + if (Varps.Varps_main[var16] != Varps.Varps_temp[var16]) { // L: 5731 + Varps.Varps_main[var16] = Varps.Varps_temp[var16]; // L: 5732 + Clock.changeGameOptions(var16); // L: 5733 + field863[++field864 - 1 & 31] = var16; // L: 5734 + } + } + + var1.serverPacket = null; // L: 5737 + return true; // L: 5738 } - if (ServerPacket.field2181 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - ClientPreferences.clanChat = null; + if (ServerPacket.field2216 == var1.serverPacket) { // L: 5740 + DevicePcmPlayerProvider.method897(); // L: 5741 + weight = var3.readShort(); // L: 5742 + field775 = cycleCntr; // L: 5743 + var1.serverPacket = null; // L: 5744 + return true; // L: 5745 + } + + if (ServerPacket.field2240 == var1.serverPacket) { // L: 5747 + MouseHandler.method1134(class194.field2362); // L: 5748 + var1.serverPacket = null; // L: 5749 + return true; // L: 5750 + } + + if (ServerPacket.field2203 == var1.serverPacket) { // L: 5752 + var16 = var3.readUnsignedShort(); // L: 5753 + if (var16 == 65535) { // L: 5754 + var16 = -1; + } + + WorldMapCacheName.playSong(var16); // L: 5755 + var1.serverPacket = null; // L: 5756 + return true; // L: 5757 + } + + if (ServerPacket.field2215 == var1.serverPacket) { // L: 5759 + var16 = var3.method5657(); // L: 5760 + if (var16 == 65535) { // L: 5761 + var16 = -1; + } + + var5 = var3.method5740(); // L: 5762 + class298.playSoundJingle(var16, var5); // L: 5763 + var1.serverPacket = null; // L: 5764 + return true; // L: 5765 + } + + if (ServerPacket.field2241 == var1.serverPacket) { // L: 5767 + var16 = var3.readUnsignedShort(); // L: 5768 + var5 = var3.method5667(); // L: 5769 + var6 = TileItem.getWidget(var5); // L: 5770 + if (var6 != null && var6.type == 0) { // L: 5771 + if (var16 > var6.scrollHeight - var6.height) { // L: 5772 + var16 = var6.scrollHeight - var6.height; + } + + if (var16 < 0) { // L: 5773 + var16 = 0; + } + + if (var16 != var6.scrollY) { // L: 5774 + var6.scrollY = var16; // L: 5775 + class52.invalidateWidget(var6); // L: 5776 + } + } + + var1.serverPacket = null; // L: 5779 + return true; // L: 5780 + } + + if (ServerPacket.field2197 == var1.serverPacket) { // L: 5782 + if (var1.serverPacketLength == 0) { // L: 5783 + Entity.clanChat = null; // L: 5784 } else { - if (ClientPreferences.clanChat == null) { - ClientPreferences.clanChat = new ClanChat(class195.loginType, WorldMapSectionType.client); + if (Entity.clanChat == null) { // L: 5787 + Entity.clanChat = new ClanChat(WorldMapAreaData.loginType, class2.client); // L: 5788 } - ClientPreferences.clanChat.readUpdate(var3); + Entity.clanChat.readUpdate(var3); // L: 5790 } - Frames.method3399(); - var1.serverPacket = null; - return true; + ReflectionCheck.method2380(); // L: 5792 + var1.serverPacket = null; // L: 5793 + return true; // L: 5794 } - if (ServerPacket.field2165 == var1.serverPacket) { - Player.field638 = var3.method5748(); - class41.field302 = var3.method5748(); - - for (var16 = Player.field638; var16 < Player.field638 + 8; ++var16) { - for (var5 = class41.field302; var5 < class41.field302 + 8; ++var5) { - if (groundItems[TileItemPile.Client_plane][var16][var5] != null) { - groundItems[TileItemPile.Client_plane][var16][var5] = null; - class41.updateItemPile(var16, var5); - } - } - } - - for (PendingSpawn var36 = (PendingSpawn)pendingSpawns.last(); var36 != null; var36 = (PendingSpawn)pendingSpawns.previous()) { - if (var36.x >= Player.field638 && var36.x < Player.field638 + 8 && var36.y >= class41.field302 && var36.y < class41.field302 + 8 && var36.plane == TileItemPile.Client_plane) { - var36.hitpoints = 0; - } - } - - var1.serverPacket = null; - return true; + if (ServerPacket.field2168 == var1.serverPacket) { // L: 5796 + FloorOverlayDefinition.updateNpcs(false, var3); // L: 5797 + var1.serverPacket = null; // L: 5798 + return true; // L: 5799 } - Widget var50; - if (ServerPacket.field2211 == var1.serverPacket) { - var16 = var3.method5765(); - var50 = WorldMapSprite.getWidget(var16); - - for (var21 = 0; var21 < var50.itemIds.length; ++var21) { - var50.itemIds[var21] = -1; - var50.itemIds[var21] = 0; - } - - class234.invalidateWidget(var50); - var1.serverPacket = null; - return true; + if (ServerPacket.field2162 == var1.serverPacket) { // L: 5801 + var16 = var3.readUnsignedByte(); // L: 5802 + class89.forceDisconnect(var16); // L: 5803 + var1.serverPacket = null; // L: 5804 + return false; // L: 5805 } - if (ServerPacket.field2212 == var1.serverPacket) { - class60.updatePlayers(var3, var1.serverPacketLength); - class303.method5525(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2240 == var1.serverPacket) { - hintArrowType = var3.readUnsignedByte(); - if (hintArrowType == 1) { - hintArrowNpcIndex = var3.readUnsignedShort(); + if (ServerPacket.field2226 == var1.serverPacket) { // L: 5807 + if (Entity.clanChat != null) { // L: 5808 + Entity.clanChat.method5350(var3); // L: 5809 } - if (hintArrowType >= 2 && hintArrowType <= 6) { - if (hintArrowType == 2) { - hintArrowSubX = 64; - hintArrowSubY = 64; + ReflectionCheck.method2380(); // L: 5811 + var1.serverPacket = null; // L: 5812 + return true; // L: 5813 + } + + if (ServerPacket.field2228 == var1.serverPacket) { // L: 5815 + MouseHandler.method1134(class194.field2364); // L: 5816 + var1.serverPacket = null; // L: 5817 + return true; // L: 5818 + } + + if (ServerPacket.field2178 == var1.serverPacket) { // L: 5820 + var16 = var3.method5639(); // L: 5821 + var5 = var3.method5639(); // L: 5822 + var42 = var3.readStringCp1252NullTerminated(); // L: 5823 + if (var16 >= 1 && var16 <= 8) { // L: 5824 + if (var42.equalsIgnoreCase("null")) { // L: 5825 + var42 = null; } - if (hintArrowType == 3) { - hintArrowSubX = 0; - hintArrowSubY = 64; + playerMenuActions[var16 - 1] = var42; // L: 5826 + playerOptionsPriorities[var16 - 1] = var5 == 0; // L: 5827 + } + + var1.serverPacket = null; // L: 5829 + return true; // L: 5830 + } + + boolean var58; + if (ServerPacket.field2200 == var1.serverPacket) { // L: 5832 + var58 = var3.readUnsignedByte() == 1; // L: 5833 + if (var58) { // L: 5834 + ItemContainer.field553 = PacketWriter.currentTimeMillis() - var3.readLong(); // L: 5835 + WorldMapSection1.grandExchangeEvents = new GrandExchangeEvents(var3, true); // L: 5836 + } else { + WorldMapSection1.grandExchangeEvents = null; // L: 5838 + } + + field873 = cycleCntr; // L: 5839 + var1.serverPacket = null; // L: 5840 + return true; // L: 5841 + } + + if (ServerPacket.field2173 == var1.serverPacket) { // L: 5843 + var16 = var3.method5639(); // L: 5844 + var5 = var3.method5708(); // L: 5845 + var18 = var3.method5655(); // L: 5846 + var56 = (InterfaceParent)interfaceParents.get((long)var5); // L: 5847 + if (var56 != null) { // L: 5848 + class58.closeInterface(var56, var18 != var56.group); + } + + WorldMapSprite.method494(var5, var18, var16); // L: 5849 + var1.serverPacket = null; // L: 5850 + return true; // L: 5851 + } + + if (ServerPacket.field2183 == var1.serverPacket) { // L: 5853 + tradeChatMode = var3.method5612(); // L: 5854 + publicChatMode = var3.method5612(); // L: 5855 + var1.serverPacket = null; // L: 5856 + return true; // L: 5857 + } + + if (ServerPacket.field2169 == var1.serverPacket) { // L: 5859 + WorldMapIcon_0.field154 = var3.method5646(); // L: 5860 + ScriptEvent.field597 = var3.method5612(); // L: 5861 + + while (var3.offset < var1.serverPacketLength) { // L: 5862 + var16 = var3.readUnsignedByte(); // L: 5863 + class194 var52 = UserComparator5.method3518()[var16]; // L: 5864 + MouseHandler.method1134(var52); // L: 5865 + } + + var1.serverPacket = null; // L: 5867 + return true; // L: 5868 + } + + if (ServerPacket.field2188 == var1.serverPacket) { // L: 5870 + class2.updatePlayers(var3, var1.serverPacketLength); // L: 5871 + GameShell.method1109(); // L: 5872 + var1.serverPacket = null; // L: 5873 + return true; // L: 5874 + } + + if (ServerPacket.field2187 == var1.serverPacket) { // L: 5876 + var58 = var3.readBoolean(); // L: 5877 + if (var58) { // L: 5878 + if (ModelData0.field1901 == null) { // L: 5879 + ModelData0.field1901 = new class247(); } - - if (hintArrowType == 4) { - hintArrowSubX = 128; - hintArrowSubY = 64; - } - - if (hintArrowType == 5) { - hintArrowSubX = 64; - hintArrowSubY = 0; - } - - if (hintArrowType == 6) { - hintArrowSubX = 64; - hintArrowSubY = 128; - } - - hintArrowType = 2; - hintArrowX = var3.readUnsignedShort(); - hintArrowY = var3.readUnsignedShort(); - hintArrowHeight = var3.readUnsignedByte(); + } else { + ModelData0.field1901 = null; // L: 5881 } - if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.readUnsignedShort(); + var1.serverPacket = null; // L: 5882 + return true; // L: 5883 + } + + if (ServerPacket.field2204 == var1.serverPacket) { // L: 5885 + MouseHandler.method1134(class194.field2368); // L: 5886 + var1.serverPacket = null; // L: 5887 + return true; // L: 5888 + } + + if (ServerPacket.field2231 == var1.serverPacket) { // L: 5890 + var16 = var3.readInt(); // L: 5891 + var5 = var3.method5657(); // L: 5892 + var6 = TileItem.getWidget(var16); // L: 5893 + if (var6.modelType != 2 || var5 != var6.modelId) { // L: 5894 + var6.modelType = 2; // L: 5895 + var6.modelId = var5; // L: 5896 + class52.invalidateWidget(var6); // L: 5897 } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5899 + return true; // L: 5900 } - if (ServerPacket.field2230 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.method5755(); - var21 = var5 >> 10 & 31; - var22 = var5 >> 5 & 31; - var29 = var5 & 31; - var30 = (var22 << 11) + (var21 << 19) + (var29 << 3); - Widget var32 = WorldMapSprite.getWidget(var16); - if (var30 != var32.color) { - var32.color = var30; - class234.invalidateWidget(var32); + if (ServerPacket.field2225 == var1.serverPacket) { // L: 5902 + WorldMapIcon_0.field154 = var3.readUnsignedByte(); // L: 5903 + ScriptEvent.field597 = var3.method5646(); // L: 5904 + var1.serverPacket = null; // L: 5905 + return true; // L: 5906 + } + + if (ServerPacket.field2159 == var1.serverPacket) { // L: 5908 + MouseHandler.method1134(class194.field2366); // L: 5909 + var1.serverPacket = null; // L: 5910 + return true; // L: 5911 + } + + if (ServerPacket.field2217 == var1.serverPacket) { // L: 5913 + var16 = var3.readUnsignedByte(); // L: 5914 + if (var3.readUnsignedByte() == 0) { // L: 5915 + grandExchangeOffers[var16] = new GrandExchangeOffer(); // L: 5916 + var3.offset += 18; // L: 5917 + } else { + --var3.offset; // L: 5920 + grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); // L: 5921 } - var1.serverPacket = null; - return true; + field872 = cycleCntr; // L: 5923 + var1.serverPacket = null; // L: 5924 + return true; // L: 5925 } - Widget var8; - if (ServerPacket.field2215 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.method5765(); - InterfaceParent var40 = (InterfaceParent)interfaceParents.get((long)var5); - var28 = (InterfaceParent)interfaceParents.get((long)var16); - if (var28 != null) { - class41.closeInterface(var28, var40 == null || var28.group != var40.group); + Widget var21; + if (ServerPacket.field2207 == var1.serverPacket) { // L: 5927 + var16 = var3.method5656(); // L: 5928 + var5 = var3.method5667(); // L: 5929 + var18 = var3.method5657(); // L: 5930 + var21 = TileItem.getWidget(var5); // L: 5931 + var21.field2633 = var16 + (var18 << 16); // L: 5932 + var1.serverPacket = null; // L: 5933 + return true; // L: 5934 + } + + if (ServerPacket.field2158 == var1.serverPacket) { // L: 5936 + var16 = var3.method5708(); // L: 5937 + var5 = var3.method5656(); // L: 5938 + var18 = var5 >> 10 & 31; // L: 5939 + var7 = var5 >> 5 & 31; // L: 5940 + var19 = var5 & 31; // L: 5941 + var20 = (var7 << 11) + (var18 << 19) + (var19 << 3); // L: 5942 + Widget var10 = TileItem.getWidget(var16); // L: 5943 + if (var20 != var10.color) { // L: 5944 + var10.color = var20; // L: 5945 + class52.invalidateWidget(var10); // L: 5946 } - if (var40 != null) { - var40.remove(); - interfaceParents.put(var40, (long)var16); - } - - var8 = WorldMapSprite.getWidget(var5); - if (var8 != null) { - class234.invalidateWidget(var8); - } - - var8 = WorldMapSprite.getWidget(var16); - if (var8 != null) { - class234.invalidateWidget(var8); - WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true); - } - - if (rootInterface != -1) { - Language.runIntfCloseListeners(rootInterface, 1); - } - - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5948 + return true; // L: 5949 } - if (ServerPacket.field2231 == var1.serverPacket) { - class39.method616(class194.field2363); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2226 == var1.serverPacket) { - var16 = var3.method5767(); - var5 = var3.readShort(); - var6 = WorldMapSprite.getWidget(var16); - if (var5 != var6.sequenceId || var5 == -1) { - var6.sequenceId = var5; - var6.modelFrame = 0; - var6.modelFrameCycle = 0; - class234.invalidateWidget(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2190 == var1.serverPacket) { - var16 = var3.readInt(); - InterfaceParent var52 = (InterfaceParent)interfaceParents.get((long)var16); - if (var52 != null) { - class41.closeInterface(var52, true); - } - - if (meslayerContinueWidget != null) { - class234.invalidateWidget(meslayerContinueWidget); - meslayerContinueWidget = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2185 == var1.serverPacket) { - byte var49 = var3.method5751(); - var5 = var3.readUnsignedShort(); - Varps.Varps_temp[var5] = var49; - if (Varps.Varps_main[var5] != var49) { - Varps.Varps_main[var5] = var49; - } - - WorldMapSection0.changeGameOptions(var5); - field859[++field860 - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2219 == var1.serverPacket) { - var16 = var3.method5757(); - rootInterface = var16; - this.resizeRoot(false); - WorldMapSection3.Widget_resetModelFrames(var16); - UserComparator4.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field813[var5] = true; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2188 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - class25.method245(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2169 == var1.serverPacket) { - class41.field302 = var3.method5936(); - Player.field638 = var3.readUnsignedByte(); - - while (var3.offset < var1.serverPacketLength) { - var16 = var3.readUnsignedByte(); - class194 var51 = GameBuild.method4291()[var16]; - class39.method616(var51); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2173 == var1.serverPacket) { - UserComparator2.readReflectionCheck(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2199 == var1.serverPacket) { - UserComparator10.method3522(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2184 == var1.serverPacket) { - class39.method616(class194.field2357); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2221 == var1.serverPacket) { - publicChatMode = var3.readUnsignedByte(); - tradeChatMode = var3.method5746(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2176 == var1.serverPacket) { - class39.method616(class194.field2353); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2210 == var1.serverPacket) { - var48 = var3.method5746() == 1; - var5 = var3.method5765(); - var6 = WorldMapSprite.getWidget(var5); - if (var48 != var6.isHidden) { - var6.isHidden = var48; - class234.invalidateWidget(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2159 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2164 == var1.serverPacket) { - class39.method616(class194.field2360); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2227 == var1.serverPacket) { - for (var16 = 0; var16 < players.length; ++var16) { - if (players[var16] != null) { + if (ServerPacket.field2167 == var1.serverPacket) { // L: 5951 + for (var16 = 0; var16 < players.length; ++var16) { // L: 5952 + if (players[var16] != null) { // L: 5953 players[var16].sequence = -1; } } - for (var16 = 0; var16 < npcs.length; ++var16) { - if (npcs[var16] != null) { + for (var16 = 0; var16 < npcs.length; ++var16) { // L: 5955 + if (npcs[var16] != null) { // L: 5956 npcs[var16].sequence = -1; } } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5958 + return true; // L: 5959 } - if (ServerPacket.field2191 == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; + if (ServerPacket.field2194 == var1.serverPacket) { // L: 5961 + var16 = var3.readUnsignedShort(); // L: 5962 + if (var16 == 65535) { // L: 5963 + var16 = -1; } - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; - } + var5 = var3.method5678(); // L: 5964 + var18 = var3.method5678(); // L: 5965 + var21 = TileItem.getWidget(var18); // L: 5966 + ItemDefinition var43; + if (!var21.isIf3) { // L: 5967 + if (var16 == -1) { // L: 5968 + var21.modelType = 0; // L: 5969 + var1.serverPacket = null; // L: 5970 + return true; // L: 5971 + } - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2225 == var1.serverPacket) { - if (rootInterface != -1) { - Language.runIntfCloseListeners(rootInterface, 0); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2183 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - GrandExchangeOfferNameComparator.method214(var3, var3.offset - 28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2208 == var1.serverPacket) { - var16 = var3.method5766(); - var20 = var3.readStringCp1252NullTerminated(); - var6 = WorldMapSprite.getWidget(var16); - if (!var20.equals(var6.text)) { - var6.text = var20; - class234.invalidateWidget(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2207 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.method5867(); - var21 = var3.method5867(); - var22 = var3.method5767(); - var8 = WorldMapSprite.getWidget(var22); - if (var5 != var8.modelAngleX || var21 != var8.modelAngleY || var16 != var8.modelZoom) { - var8.modelAngleX = var5; - var8.modelAngleY = var21; - var8.modelZoom = var16; - class234.invalidateWidget(var8); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2233 == var1.serverPacket) { - var48 = var3.readUnsignedByte() == 1; - if (var48) { - GraphicsObject.field1139 = MilliClock.currentTimeMillis() - var3.readLong(); - WorldMapIcon_0.grandExchangeEvents = new GrandExchangeEvents(var3, true); + var43 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var16); // L: 5973 + var21.modelType = 4; // L: 5974 + var21.modelId = var16; // L: 5975 + var21.modelAngleX = var43.xan2d; // L: 5976 + var21.modelAngleY = var43.yan2d; // L: 5977 + var21.modelZoom = var43.zoom2d * 100 / var5; // L: 5978 + class52.invalidateWidget(var21); // L: 5979 } else { - WorldMapIcon_0.grandExchangeEvents = null; + var21.itemId = var16; // L: 5982 + var21.itemQuantity = var5; // L: 5983 + var43 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var16); // L: 5984 + var21.modelAngleX = var43.xan2d; // L: 5985 + var21.modelAngleY = var43.yan2d; // L: 5986 + var21.modelAngleZ = var43.zan2d; // L: 5987 + var21.modelOffsetX = var43.offsetX2d; // L: 5988 + var21.modelOffsetY = var43.offsetY2d; // L: 5989 + var21.modelZoom = var43.zoom2d; // L: 5990 + if (var43.isStackable == 1) { // L: 5991 + var21.itemQuantityMode = 1; + } else { + var21.itemQuantityMode = 2; // L: 5992 + } + + if (var21.field2728 > 0) { // L: 5993 + var21.modelZoom = var21.modelZoom * 32 / var21.field2728; + } else if (var21.rawWidth > 0) { // L: 5994 + var21.modelZoom = var21.modelZoom * 32 / var21.rawWidth; + } + + class52.invalidateWidget(var21); // L: 5995 } - field869 = cycleCntr; - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 5997 + return true; // L: 5998 } - if (ServerPacket.field2170 == var1.serverPacket) { - Player.field638 = var3.method5936(); - class41.field302 = var3.method5746(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2236 == var1.serverPacket) { - class2.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2202 == var1.serverPacket) { - isCameraLocked = true; - class204.field2420 = var3.readUnsignedByte(); - WorldMapManager.field348 = var3.readUnsignedByte(); - WorldMapLabel.field275 = var3.readUnsignedShort(); - class25.field122 = var3.readUnsignedByte(); - ScriptEvent.field604 = var3.readUnsignedByte(); - if (ScriptEvent.field604 >= 100) { - MouseHandler.cameraX = class204.field2420 * 128 + 64; - ObjectSound.cameraZ = WorldMapManager.field348 * 128 + 64; - WorldMapSection3.cameraY = Language.getTileHeight(MouseHandler.cameraX, ObjectSound.cameraZ, TileItemPile.Client_plane) - WorldMapLabel.field275; + Widget var8; + if (ServerPacket.field2212 == var1.serverPacket) { // L: 6000 + var16 = var3.readInt(); // L: 6001 + var5 = var3.readUnsignedShort(); // L: 6002 + var18 = var3.method5655(); // L: 6003 + var7 = var3.method5656(); // L: 6004 + var8 = TileItem.getWidget(var16); // L: 6005 + if (var18 != var8.modelAngleX || var5 != var8.modelAngleY || var7 != var8.modelZoom) { // L: 6006 + var8.modelAngleX = var18; // L: 6007 + var8.modelAngleY = var5; // L: 6008 + var8.modelZoom = var7; // L: 6009 + class52.invalidateWidget(var8); // L: 6010 } - var1.serverPacket = null; - return true; + var1.serverPacket = null; // L: 6012 + return true; // L: 6013 } - if (ServerPacket.field2197 == var1.serverPacket) { - var16 = var3.method5766(); - var50 = WorldMapSprite.getWidget(var16); - var50.modelType = 3; - var50.modelId = class60.localPlayer.appearance.getChatHeadId(); - class234.invalidateWidget(var50); - var1.serverPacket = null; - return true; + if (ServerPacket.field2181 == var1.serverPacket) { // L: 6015 + WorldMapIcon_0.field154 = var3.method5612(); // L: 6016 + ScriptEvent.field597 = var3.method5639(); // L: 6017 + + for (var16 = WorldMapIcon_0.field154; var16 < WorldMapIcon_0.field154 + 8; ++var16) { // L: 6018 + for (var5 = ScriptEvent.field597; var5 < ScriptEvent.field597 + 8; ++var5) { // L: 6019 + if (groundItems[Huffman.Client_plane][var16][var5] != null) { // L: 6020 + groundItems[Huffman.Client_plane][var16][var5] = null; // L: 6021 + class13.updateItemPile(var16, var5); // L: 6022 + } + } + } + + for (PendingSpawn var37 = (PendingSpawn)pendingSpawns.last(); var37 != null; var37 = (PendingSpawn)pendingSpawns.previous()) { // L: 6026 6027 6029 + if (var37.x >= WorldMapIcon_0.field154 && var37.x < WorldMapIcon_0.field154 + 8 && var37.y >= ScriptEvent.field597 && var37.y < ScriptEvent.field597 + 8 && var37.plane == Huffman.Client_plane) { // L: 6028 + var37.hitpoints = 0; + } + } + + var1.serverPacket = null; // L: 6031 + return true; // L: 6032 } - if (ServerPacket.field2177 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { + if (ServerPacket.field2170 == var1.serverPacket) { // L: 6034 + DevicePcmPlayerProvider.method897(); // L: 6035 + runEnergy = var3.readUnsignedByte(); // L: 6036 + field775 = cycleCntr; // L: 6037 + var1.serverPacket = null; // L: 6038 + return true; // L: 6039 + } + + long var24; + long var26; + String var36; + if (ServerPacket.field2218 == var1.serverPacket) { // L: 6041 + var36 = var3.readStringCp1252NullTerminated(); // L: 6042 + var24 = (long)var3.readUnsignedShort(); // L: 6043 + var26 = (long)var3.readMedium(); // L: 6044 + PlayerType var28 = (PlayerType)TextureProvider.findEnumerated(ApproximateRouteStrategy.PlayerType_values(), var3.readUnsignedByte()); // L: 6045 + long var29 = var26 + (var24 << 32); // L: 6046 + boolean var31 = false; // L: 6047 + + for (int var13 = 0; var13 < 100; ++var13) { // L: 6048 + if (var29 == field896[var13]) { // L: 6049 + var31 = true; // L: 6050 + break; // L: 6051 + } + } + + if (class60.friendSystem.isIgnored(new Username(var36, WorldMapAreaData.loginType))) { // L: 6054 + var31 = true; + } + + if (!var31 && field790 == 0) { // L: 6055 + field896[field794] = var29; // L: 6056 + field794 = (field794 + 1) % 100; // L: 6057 + String var32 = AbstractFont.escapeBrackets(Huffman.method4049(ScriptEvent.method1235(var3))); // L: 6058 + byte var49; + if (var28.isPrivileged) { // L: 6060 + var49 = 7; + } else { + var49 = 3; // L: 6061 + } + + if (var28.modIcon != -1) { // L: 6062 + WorldMapRectangle.addGameMessage(var49, WorldMapScaleHandler.method824(var28.modIcon) + var36, var32); + } else { + WorldMapRectangle.addGameMessage(var49, var36, var32); // L: 6063 + } + } + + var1.serverPacket = null; // L: 6065 + return true; // L: 6066 + } + + if (ServerPacket.field2229 == var1.serverPacket) { // L: 6068 + class60.friendSystem.method1919(); // L: 6069 + field870 = cycleCntr; // L: 6070 + var1.serverPacket = null; // L: 6071 + return true; // L: 6072 + } + + if (ServerPacket.field2213 == var1.serverPacket) { // L: 6074 + var16 = var3.method5659(); // L: 6075 + var5 = var3.readInt(); // L: 6076 + var6 = TileItem.getWidget(var5); // L: 6077 + if (var16 != var6.sequenceId || var16 == -1) { // L: 6078 + var6.sequenceId = var16; // L: 6079 + var6.modelFrame = 0; // L: 6080 + var6.modelFrameCycle = 0; // L: 6081 + class52.invalidateWidget(var6); // L: 6082 + } + + var1.serverPacket = null; // L: 6084 + return true; // L: 6085 + } + + if (ServerPacket.field2199 == var1.serverPacket) { // L: 6087 + var3.offset += 28; // L: 6088 + if (var3.checkCrc()) { // L: 6089 + class60.method937(var3, var3.offset - 28); + } + + var1.serverPacket = null; // L: 6090 + return true; // L: 6091 + } + + if (ServerPacket.field2175 == var1.serverPacket) { // L: 6093 + var16 = var3.method5667(); // L: 6094 + var51 = TileItem.getWidget(var16); // L: 6095 + var51.modelType = 3; // L: 6096 + var51.modelId = WorldMapLabelSize.localPlayer.appearance.getChatHeadId(); // L: 6097 + class52.invalidateWidget(var51); // L: 6098 + var1.serverPacket = null; // L: 6099 + return true; // L: 6100 + } + + if (ServerPacket.field2192 == var1.serverPacket) { // L: 6102 + DevicePcmPlayerProvider.method897(); // L: 6103 + var16 = var3.readInt(); // L: 6104 + var5 = var3.method5612(); // L: 6105 + var18 = var3.readUnsignedByte(); // L: 6106 + experience[var5] = var16; // L: 6107 + currentLevels[var5] = var18; // L: 6108 + levels[var5] = 1; // L: 6109 + + for (var7 = 0; var7 < 98; ++var7) { // L: 6110 + if (var16 >= Skills.Skills_experienceTable[var7]) { + levels[var5] = var7 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var5; // L: 6111 + var1.serverPacket = null; // L: 6112 + return true; // L: 6113 + } + + if (ServerPacket.field2235 == var1.serverPacket) { // L: 6115 + hintArrowType = var3.readUnsignedByte(); // L: 6116 + if (hintArrowType == 1) { // L: 6117 + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { // L: 6118 + if (hintArrowType == 2) { // L: 6119 + hintArrowSubX = 64; // L: 6120 + hintArrowSubY = 64; // L: 6121 + } + + if (hintArrowType == 3) { // L: 6123 + hintArrowSubX = 0; // L: 6124 + hintArrowSubY = 64; // L: 6125 + } + + if (hintArrowType == 4) { // L: 6127 + hintArrowSubX = 128; // L: 6128 + hintArrowSubY = 64; // L: 6129 + } + + if (hintArrowType == 5) { // L: 6131 + hintArrowSubX = 64; // L: 6132 + hintArrowSubY = 0; // L: 6133 + } + + if (hintArrowType == 6) { // L: 6135 + hintArrowSubX = 64; // L: 6136 + hintArrowSubY = 128; // L: 6137 + } + + hintArrowType = 2; // L: 6139 + hintArrowX = var3.readUnsignedShort(); // L: 6140 + hintArrowY = var3.readUnsignedShort(); // L: 6141 + hintArrowHeight = var3.readUnsignedByte(); // L: 6142 + } + + if (hintArrowType == 10) { // L: 6144 + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; // L: 6145 + return true; // L: 6146 + } + + if (ServerPacket.field2176 == var1.serverPacket) { // L: 6148 + var16 = var3.method5667(); // L: 6149 + var17 = var3.readStringCp1252NullTerminated(); // L: 6150 + var6 = TileItem.getWidget(var16); // L: 6151 + if (!var17.equals(var6.text)) { // L: 6152 + var6.text = var17; // L: 6153 + class52.invalidateWidget(var6); // L: 6154 + } + + var1.serverPacket = null; // L: 6156 + return true; // L: 6157 + } + + if (ServerPacket.field2185 == var1.serverPacket) { // L: 6159 + var16 = var3.readUnsignedByte(); // L: 6160 + var5 = var3.readUnsignedByte(); // L: 6161 + var18 = var3.readUnsignedByte(); // L: 6162 + var7 = var3.readUnsignedByte(); // L: 6163 + field922[var16] = true; // L: 6164 + field678[var16] = var5; // L: 6165 + field740[var16] = var18; // L: 6166 + field925[var16] = var7; // L: 6167 + field926[var16] = 0; // L: 6168 + var1.serverPacket = null; // L: 6169 + return true; // L: 6170 + } + + if (ServerPacket.field2237 == var1.serverPacket) { // L: 6172 + MouseHandler.method1134(class194.field2370); // L: 6173 + var1.serverPacket = null; // L: 6174 + return true; // L: 6175 + } + + if (ServerPacket.field2224 == var1.serverPacket) { // L: 6177 + var36 = var3.readStringCp1252NullTerminated(); // L: 6178 + Object[] var50 = new Object[var36.length() + 1]; // L: 6179 + + for (var18 = var36.length() - 1; var18 >= 0; --var18) { // L: 6180 + if (var36.charAt(var18) == 's') { // L: 6181 + var50[var18 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var50[var18 + 1] = new Integer(var3.readInt()); // L: 6182 + } + } + + var50[0] = new Integer(var3.readInt()); // L: 6184 + ScriptEvent var41 = new ScriptEvent(); // L: 6185 + var41.args = var50; // L: 6186 + Script.runScriptEvent(var41); // L: 6187 + var1.serverPacket = null; // L: 6188 + return true; // L: 6189 + } + + if (ServerPacket.field2177 == var1.serverPacket) { // L: 6191 + WorldMapID.loadRegions(false, var1.packetBuffer); // L: 6192 + var1.serverPacket = null; // L: 6193 + return true; // L: 6194 + } + + if (ServerPacket.field2201 == var1.serverPacket) { // L: 6196 + var16 = var3.method5708(); // L: 6197 + var5 = var3.readInt(); // L: 6198 + InterfaceParent var40 = (InterfaceParent)interfaceParents.get((long)var16); // L: 6199 + var56 = (InterfaceParent)interfaceParents.get((long)var5); // L: 6200 + if (var56 != null) { // L: 6201 + class58.closeInterface(var56, var40 == null || var56.group != var40.group); + } + + if (var40 != null) { // L: 6202 + var40.remove(); // L: 6203 + interfaceParents.put(var40, (long)var5); // L: 6204 + } + + var8 = TileItem.getWidget(var16); // L: 6206 + if (var8 != null) { // L: 6207 + class52.invalidateWidget(var8); + } + + var8 = TileItem.getWidget(var5); // L: 6208 + if (var8 != null) { // L: 6209 + class52.invalidateWidget(var8); // L: 6210 + class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true); // L: 6211 + } + + if (rootInterface != -1) { // L: 6213 + ClientPacket.runIntfCloseListeners(rootInterface, 1); + } + + var1.serverPacket = null; // L: 6214 + return true; // L: 6215 + } + + if (ServerPacket.field2166 == var1.serverPacket) { // L: 6217 + MouseHandler.method1134(class194.field2361); // L: 6218 + var1.serverPacket = null; // L: 6219 + return true; // L: 6220 + } + + if (ServerPacket.field2193 == var1.serverPacket) { // L: 6222 + var16 = var3.method5657(); // L: 6223 + WorldMapData_0.method263(var16); // L: 6224 + changedItemContainers[++field903 - 1 & 31] = var16 & 32767; // L: 6225 + var1.serverPacket = null; // L: 6226 + return true; // L: 6227 + } + + if (ServerPacket.field2230 == var1.serverPacket) { // L: 6229 + ViewportMouse.logOut(); // L: 6230 + var1.serverPacket = null; // L: 6231 + return false; // L: 6232 + } + + if (ServerPacket.field2232 == var1.serverPacket) { // L: 6234 + minimapState = var3.readUnsignedByte(); // L: 6235 + var1.serverPacket = null; // L: 6236 + return true; // L: 6237 + } + + if (ServerPacket.field2190 == var1.serverPacket) { // L: 6239 + var36 = var3.readStringCp1252NullTerminated(); // L: 6240 + var17 = AbstractFont.escapeBrackets(Huffman.method4049(ScriptEvent.method1235(var3))); // L: 6241 + WorldMapRectangle.addGameMessage(6, var36, var17); // L: 6242 + var1.serverPacket = null; // L: 6243 + return true; // L: 6244 + } + + if (ServerPacket.field2243 == var1.serverPacket) { // L: 6246 + var16 = var3.readInt(); // L: 6247 + var5 = var3.readUnsignedShort(); // L: 6248 + if (var16 < -70000) { // L: 6249 var5 += 32768; } - if (var16 >= 0) { - var6 = WorldMapSprite.getWidget(var16); + if (var16 >= 0) { // L: 6251 + var6 = TileItem.getWidget(var16); } else { - var6 = null; + var6 = null; // L: 6252 } - for (; var3.offset < var1.serverPacketLength; WorldMapSprite.itemContainerSetItem(var5, var22, var29 - 1, var30)) { - var22 = var3.readUShortSmart(); - var29 = var3.readUnsignedShort(); - var30 = 0; - if (var29 != 0) { - var30 = var3.readUnsignedByte(); - if (var30 == 255) { - var30 = var3.readInt(); + for (; var3.offset < var1.serverPacketLength; MidiPcmStream.itemContainerSetItem(var5, var7, var19 - 1, var20)) { // L: 6253 6267 + var7 = var3.readUShortSmart(); // L: 6254 + var19 = var3.readUnsignedShort(); // L: 6255 + var20 = 0; // L: 6256 + if (var19 != 0) { // L: 6257 + var20 = var3.readUnsignedByte(); // L: 6258 + if (var20 == 255) { // L: 6259 + var20 = var3.readInt(); } } - if (var6 != null && var22 >= 0 && var22 < var6.itemIds.length) { - var6.itemIds[var22] = var29; - var6.itemQuantities[var22] = var30; + if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { // L: 6261 6262 + var6.itemIds[var7] = var19; // L: 6263 + var6.itemQuantities[var7] = var20; // L: 6264 } } - if (var6 != null) { - class234.invalidateWidget(var6); + if (var6 != null) { // L: 6269 + class52.invalidateWidget(var6); } - Buffer.method5950(); - changedItemContainers[++field878 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; + DevicePcmPlayerProvider.method897(); // L: 6270 + changedItemContainers[++field903 - 1 & 31] = var5 & 32767; // L: 6271 + var1.serverPacket = null; // L: 6272 + return true; // L: 6273 } - if (ServerPacket.field2189 == var1.serverPacket) { - class8.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; + if (ServerPacket.field2236 == var1.serverPacket) { // L: 6275 + var36 = var3.readStringCp1252NullTerminated(); // L: 6276 + var24 = var3.readLong(); // L: 6277 + var26 = (long)var3.readUnsignedShort(); // L: 6278 + var9 = (long)var3.readMedium(); // L: 6279 + PlayerType var11 = (PlayerType)TextureProvider.findEnumerated(ApproximateRouteStrategy.PlayerType_values(), var3.readUnsignedByte()); // L: 6280 + var12 = (var26 << 32) + var9; // L: 6281 + boolean var14 = false; // L: 6282 + + for (int var15 = 0; var15 < 100; ++var15) { // L: 6283 + if (field896[var15] == var12) { // L: 6284 + var14 = true; // L: 6285 + break; // L: 6286 + } + } + + if (var11.isUser && class60.friendSystem.isIgnored(new Username(var36, WorldMapAreaData.loginType))) { // L: 6289 6290 + var14 = true; + } + + if (!var14 && field790 == 0) { // L: 6292 + field896[field794] = var12; // L: 6293 + field794 = (field794 + 1) % 100; // L: 6294 + String var33 = AbstractFont.escapeBrackets(Huffman.method4049(ScriptEvent.method1235(var3))); // L: 6295 + if (var11.modIcon != -1) { // L: 6296 + WorldMapData_0.addChatMessage(9, WorldMapScaleHandler.method824(var11.modIcon) + var36, var33, GrandExchangeOfferTotalQuantityComparator.base37DecodeLong(var24)); + } else { + WorldMapData_0.addChatMessage(9, var36, var33, GrandExchangeOfferTotalQuantityComparator.base37DecodeLong(var24)); // L: 6297 + } + } + + var1.serverPacket = null; // L: 6299 + return true; // L: 6300 } - class197.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -343660333 * -1993969829 : -1) + "," + (var1.field1351 != null ? var1.field1351.id * -343660333 * -1993969829 : -1) + "," + (var1.field1342 != null ? var1.field1342.id * -343660333 * -1993969829 : -1) + "," + var1.serverPacketLength, (Throwable)null); - MouseRecorder.logOut(); - } catch (IOException var34) { - CollisionMap.method3707(); + if (ServerPacket.field2233 == var1.serverPacket) { // L: 6302 + MouseHandler.method1134(class194.field2365); // L: 6303 + var1.serverPacket = null; // L: 6304 + return true; // L: 6305 + } + + if (ServerPacket.field2210 == var1.serverPacket) { // L: 6307 + var16 = var3.method5678(); // L: 6308 + var5 = var3.readShort(); // L: 6309 + var18 = var3.method5658(); // L: 6310 + var21 = TileItem.getWidget(var16); // L: 6311 + if (var18 != var21.rawX || var5 != var21.rawY || var21.xAlignment != 0 || var21.yAlignment != 0) { // L: 6312 + var21.rawX = var18; // L: 6313 + var21.rawY = var5; // L: 6314 + var21.xAlignment = 0; // L: 6315 + var21.yAlignment = 0; // L: 6316 + class52.invalidateWidget(var21); // L: 6317 + this.alignWidget(var21); // L: 6318 + if (var21.type == 0) { // L: 6319 + class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var21, false); + } + } + + var1.serverPacket = null; // L: 6321 + return true; // L: 6322 + } + + Decimator.RunException_sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id * -317415457 * 2122570783 : -1) + "," + (var1.field1348 != null ? var1.field1348.id * -317415457 * 2122570783 : -1) + "," + (var1.field1346 != null ? var1.field1346.id * -317415457 * 2122570783 : -1) + "," + var1.serverPacketLength, (Throwable)null); // L: 6324 + ViewportMouse.logOut(); // L: 6325 + } catch (IOException var34) { // L: 6327 + ArchiveLoader.method1208(); // L: 6328 } catch (Exception var35) { - var20 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -343660333 * -1993969829 : -1) + "," + (var1.field1351 != null ? var1.field1351.id * -343660333 * -1993969829 : -1) + "," + (var1.field1342 != null ? var1.field1342.id * -343660333 * -1993969829 : -1) + "," + var1.serverPacketLength + "," + (class60.localPlayer.pathX[0] + class182.baseX) + "," + (class60.localPlayer.pathY[0] + SecureRandomFuture.baseY) + ","; + var17 = "" + (var1.serverPacket != null ? var1.serverPacket.id * -317415457 * 2122570783 : -1) + "," + (var1.field1348 != null ? var1.field1348.id * -317415457 * 2122570783 : -1) + "," + (var1.field1346 != null ? var1.field1346.id * -317415457 * 2122570783 : -1) + "," + var1.serverPacketLength + "," + (WorldMapLabelSize.localPlayer.pathX[0] + WorldMapManager.baseX) + "," + (WorldMapLabelSize.localPlayer.pathY[0] + WorldMapLabel.baseY) + ","; // L: 6331 - for (var21 = 0; var21 < var1.serverPacketLength && var21 < 50; ++var21) { - var20 = var20 + var3.array[var21] + ","; + for (var18 = 0; var18 < var1.serverPacketLength && var18 < 50; ++var18) { // L: 6332 + var17 = var17 + var3.array[var18] + ","; } - class197.RunException_sendStackTrace(var20, var35); - MouseRecorder.logOut(); + Decimator.RunException_sendStackTrace(var17, var35); // L: 6333 + ViewportMouse.logOut(); // L: 6334 } - return true; + return true; // L: 6336 } } - @ObfuscatedName("hr") + @ObfuscatedName("hk") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-302072154" + garbageValue = "736639709" ) @Export("menu") final void menu() { - boolean var1 = false; + boolean var1 = false; // L: 7056 int var2; int var5; - while (!var1) { - var1 = true; + while (!var1) { // L: 7057 + var1 = true; // L: 7058 - for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { - if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { - String var3 = menuTargets[var2]; - menuTargets[var2] = menuTargets[var2 + 1]; - menuTargets[var2 + 1] = var3; - String var4 = menuActions[var2]; - menuActions[var2] = menuActions[var2 + 1]; - menuActions[var2 + 1] = var4; - var5 = menuOpcodes[var2]; - menuOpcodes[var2] = menuOpcodes[var2 + 1]; - menuOpcodes[var2 + 1] = var5; - var5 = menuArguments1[var2]; - menuArguments1[var2] = menuArguments1[var2 + 1]; - menuArguments1[var2 + 1] = var5; - var5 = menuArguments2[var2]; - menuArguments2[var2] = menuArguments2[var2 + 1]; - menuArguments2[var2 + 1] = var5; - var5 = menuIdentifiers[var2]; - menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; - menuIdentifiers[var2 + 1] = var5; - boolean var6 = menuShiftClick[var2]; - menuShiftClick[var2] = menuShiftClick[var2 + 1]; - menuShiftClick[var2 + 1] = var6; - var1 = false; + for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) { // L: 7059 + if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) { // L: 7060 + String var14 = menuTargets[var2]; // L: 7061 + menuTargets[var2] = menuTargets[var2 + 1]; // L: 7062 + menuTargets[var2 + 1] = var14; // L: 7063 + String var15 = menuActions[var2]; // L: 7064 + menuActions[var2] = menuActions[var2 + 1]; // L: 7065 + menuActions[var2 + 1] = var15; // L: 7066 + var5 = menuOpcodes[var2]; // L: 7067 + menuOpcodes[var2] = menuOpcodes[var2 + 1]; // L: 7068 + menuOpcodes[var2 + 1] = var5; // L: 7069 + var5 = menuArguments1[var2]; // L: 7070 + menuArguments1[var2] = menuArguments1[var2 + 1]; // L: 7071 + menuArguments1[var2 + 1] = var5; // L: 7072 + var5 = menuArguments2[var2]; // L: 7073 + menuArguments2[var2] = menuArguments2[var2 + 1]; // L: 7074 + menuArguments2[var2 + 1] = var5; // L: 7075 + var5 = menuIdentifiers[var2]; // L: 7076 + menuIdentifiers[var2] = menuIdentifiers[var2 + 1]; // L: 7077 + menuIdentifiers[var2 + 1] = var5; // L: 7078 + boolean var13 = menuShiftClick[var2]; // L: 7079 + menuShiftClick[var2] = menuShiftClick[var2 + 1]; // L: 7080 + menuShiftClick[var2 + 1] = var13; // L: 7081 + var1 = false; // L: 7082 } } } - if (KeyHandler.dragInventoryWidget == null) { - if (clickedWidget == null) { - int var14 = MouseHandler.MouseHandler_lastButton; - int var8; - int var9; - int var11; - int var12; - if (isMenuOpen) { - if (var14 != 1 && (ArchiveLoader.mouseCam || var14 != 4)) { - var2 = MouseHandler.MouseHandler_x; - var11 = MouseHandler.MouseHandler_y; - if (var2 < WorldMapRectangle.menuX - 10 || var2 > class69.menuWidth + WorldMapRectangle.menuX + 10 || var11 < Frames.menuY - 10 || var11 > Frames.menuY + ApproximateRouteStrategy.menuHeight + 10) { - isMenuOpen = false; - class1.method7(WorldMapRectangle.menuX, Frames.menuY, class69.menuWidth, ApproximateRouteStrategy.menuHeight); - } - } + if (BuddyRankComparator.dragInventoryWidget == null) { // L: 7087 + if (clickedWidget == null) { // L: 7088 + int var4; + label300: { + int var16 = MouseHandler.MouseHandler_lastButton; // L: 7089 + int var3; + int var8; + if (isMenuOpen) { // L: 7090 + int var17; + int var18; + if (var16 != 1 && (ScriptEvent.mouseCam || var16 != 4)) { // L: 7091 + var2 = MouseHandler.MouseHandler_x; // L: 7092 + var3 = MouseHandler.MouseHandler_y; // L: 7093 + if (var2 < ChatChannel.menuX - 10 || var2 > DevicePcmPlayerProvider.menuWidth + ChatChannel.menuX + 10 || var3 < menuY - 10 || var3 > WorldMapManager.menuHeight + menuY + 10) { // L: 7094 + isMenuOpen = false; // L: 7095 + var4 = ChatChannel.menuX; // L: 7096 + var5 = menuY; // L: 7097 + var18 = DevicePcmPlayerProvider.menuWidth; // L: 7098 + var17 = WorldMapManager.menuHeight; // L: 7099 - if (var14 == 1 || !ArchiveLoader.mouseCam && var14 == 4) { - var2 = WorldMapRectangle.menuX; - var11 = Frames.menuY; - var12 = class69.menuWidth; - var5 = MouseHandler.MouseHandler_lastPressedX; - int var15 = MouseHandler.MouseHandler_lastPressedY; - int var16 = -1; - - for (var8 = 0; var8 < menuOptionsCount; ++var8) { - var9 = (menuOptionsCount - 1 - var8) * 15 + var11 + 31; - if (var5 > var2 && var5 < var12 + var2 && var15 > var9 - 13 && var15 < var9 + 3) { - var16 = var8; + for (var8 = 0; var8 < rootWidgetCount; ++var8) { // L: 7101 + if (rootWidgetWidths[var8] + rootWidgetXs[var8] > var4 && rootWidgetXs[var8] < var4 + var18 && rootWidgetHeights[var8] + rootWidgetYs[var8] > var5 && rootWidgetYs[var8] < var5 + var17) { // L: 7102 + field882[var8] = true; + } + } } } - if (var16 != -1) { - GrandExchangeEvent.method155(var16); - } + if (var16 == 1 || !ScriptEvent.mouseCam && var16 == 4) { // L: 7107 + var2 = ChatChannel.menuX; // L: 7108 + var3 = menuY; // L: 7109 + var4 = DevicePcmPlayerProvider.menuWidth; // L: 7110 + var5 = MouseHandler.MouseHandler_lastPressedX; // L: 7111 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 7112 + var17 = -1; // L: 7113 - isMenuOpen = false; - class1.method7(WorldMapRectangle.menuX, Frames.menuY, class69.menuWidth, ApproximateRouteStrategy.menuHeight); - } - } else { - label281: { - var2 = UrlRequester.method3421(); - if ((var14 == 1 || !ArchiveLoader.mouseCam && var14 == 4) && var2 >= 0) { - var11 = menuOpcodes[var2]; - if (var11 == 39 || var11 == 40 || var11 == 41 || var11 == 42 || var11 == 43 || var11 == 33 || var11 == 34 || var11 == 35 || var11 == 36 || var11 == 37 || var11 == 38 || var11 == 1005) { - var12 = menuArguments1[var2]; - var5 = menuArguments2[var2]; - Widget var13 = WorldMapSprite.getWidget(var5); - var8 = KeyHandler.getWidgetFlags(var13); - boolean var7 = (var8 >> 28 & 1) != 0; - if (var7) { - break label281; + int var9; + for (var8 = 0; var8 < menuOptionsCount; ++var8) { // L: 7114 + var9 = var3 + (menuOptionsCount - 1 - var8) * 15 + 31; // L: 7115 + if (var5 > var2 && var5 < var4 + var2 && var18 > var9 - 13 && var18 < var9 + 3) { // L: 7116 + var17 = var8; + } + } + + if (var17 != -1) { // L: 7118 + Widget.method4175(var17); + } + + isMenuOpen = false; // L: 7119 + var8 = ChatChannel.menuX; // L: 7120 + var9 = menuY; // L: 7121 + int var10 = DevicePcmPlayerProvider.menuWidth; // L: 7122 + int var11 = WorldMapManager.menuHeight; // L: 7123 + + for (int var12 = 0; var12 < rootWidgetCount; ++var12) { // L: 7125 + if (rootWidgetXs[var12] + rootWidgetWidths[var12] > var8 && rootWidgetXs[var12] < var8 + var10 && rootWidgetYs[var12] + rootWidgetHeights[var12] > var9 && rootWidgetYs[var12] < var9 + var11) { // L: 7126 + field882[var12] = true; + } + } + } + } else { + var2 = GrandExchangeOffer.method209(); // L: 7132 + if ((var16 == 1 || !ScriptEvent.mouseCam && var16 == 4) && var2 >= 0) { // L: 7133 + var3 = menuOpcodes[var2]; // L: 7134 + if (var3 == 39 || var3 == 40 || var3 == 41 || var3 == 42 || var3 == 43 || var3 == 33 || var3 == 34 || var3 == 35 || var3 == 36 || var3 == 37 || var3 == 38 || var3 == 1005) { // L: 7135 + var4 = menuArguments1[var2]; // L: 7136 + var5 = menuArguments2[var2]; // L: 7137 + Widget var6 = TileItem.getWidget(var5); // L: 7138 + var8 = WorldMapIcon_0.getWidgetFlags(var6); // L: 7140 + boolean var7 = (var8 >> 28 & 1) != 0; // L: 7142 + if (var7) { // L: 7144 + break label300; } Object var10000 = null; - if (Projectile.method2249(KeyHandler.getWidgetFlags(var13))) { - break label281; + if (Widget.method4172(WorldMapIcon_0.getWidgetFlags(var6))) { + break label300; } } } - if ((var14 == 1 || !ArchiveLoader.mouseCam && var14 == 4) && this.shouldLeftClickOpenMenu()) { - var14 = 2; + if ((var16 == 1 || !ScriptEvent.mouseCam && var16 == 4) && this.shouldLeftClickOpenMenu()) { // L: 7163 7164 + var16 = 2; // L: 7165 } - if ((var14 == 1 || !ArchiveLoader.mouseCam && var14 == 4) && menuOptionsCount > 0) { - GrandExchangeEvent.method155(var2); + if ((var16 == 1 || !ScriptEvent.mouseCam && var16 == 4) && menuOptionsCount > 0) { // L: 7168 + Widget.method4175(var2); // L: 7169 } - if (var14 == 2 && menuOptionsCount > 0) { + if (var16 == 2 && menuOptionsCount > 0) { // L: 7171 this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); } - - return; } - if (KeyHandler.dragInventoryWidget != null && !field785 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { - var9 = draggedWidgetX; - int var10 = draggedWidgetY; - SecureRandomCallable.method1205(class169.tempMenuAction, var9, var10); - class169.tempMenuAction = null; - } - - field785 = false; - itemDragDuration = 0; - if (KeyHandler.dragInventoryWidget != null) { - class234.invalidateWidget(KeyHandler.dragInventoryWidget); - } - - KeyHandler.dragInventoryWidget = WorldMapSprite.getWidget(var5); - dragItemSlotSource = var12; - draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; - draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; - if (var2 >= 0) { - WorldMapSection1.method648(var2); - } - - class234.invalidateWidget(KeyHandler.dragInventoryWidget); - return; + return; // L: 7173 } + if (BuddyRankComparator.dragInventoryWidget != null && !field788 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) { // L: 7145 7146 + SecureRandomFuture.method2211(draggedWidgetX, draggedWidgetY); // L: 7147 + } + + field788 = false; // L: 7150 + itemDragDuration = 0; // L: 7151 + if (BuddyRankComparator.dragInventoryWidget != null) { // L: 7152 + class52.invalidateWidget(BuddyRankComparator.dragInventoryWidget); + } + + BuddyRankComparator.dragInventoryWidget = TileItem.getWidget(var5); // L: 7153 + dragItemSlotSource = var4; // L: 7154 + draggedWidgetX = MouseHandler.MouseHandler_lastPressedX; // L: 7155 + draggedWidgetY = MouseHandler.MouseHandler_lastPressedY; // L: 7156 + if (var2 >= 0) { // L: 7157 + ObjectSound.method1983(var2); + } + + class52.invalidateWidget(BuddyRankComparator.dragInventoryWidget); // L: 7158 } } - } + } // L: 7159 - @ObfuscatedName("hh") + @ObfuscatedName("hp") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1243315480" + garbageValue = "-40940345" ) @Export("shouldLeftClickOpenMenu") final boolean shouldLeftClickOpenMenu() { - int var1 = UrlRequester.method3421(); - return (leftClickOpensMenu == 1 && menuOptionsCount > 2 || class7.method94(var1)) && !menuShiftClick[var1]; + int var1 = GrandExchangeOffer.method209(); // L: 7176 + boolean var2 = leftClickOpensMenu == 1 && menuOptionsCount > 2; // L: 7177 + if (!var2) { // L: 7178 + boolean var3; + if (var1 < 0) { // L: 7181 + var3 = false; // L: 7182 + } else { + int var4 = menuOpcodes[var1]; // L: 7185 + if (var4 >= 2000) { // L: 7186 + var4 -= 2000; + } + + if (var4 == 1007) { // L: 7187 + var3 = true; // L: 7188 + } else { + var3 = false; // L: 7191 + } + } + + var2 = var3; // L: 7193 + } + + return var2 && !menuShiftClick[var1]; // L: 7195 } @ObfuscatedName("ht") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "4" + descriptor = "(III)V", + garbageValue = "-756667188" ) @Export("openMenu") final void openMenu(int var1, int var2) { - WorldMapEvent.method840(var1, var2); - UserComparator3.scene.menuOpen(TileItemPile.Client_plane, var1, var2, false); - isMenuOpen = true; - } + WorldMapSprite.method493(var1, var2); // L: 7199 + ScriptEvent.scene.menuOpen(Huffman.Client_plane, var1, var2, false); // L: 7200 + isMenuOpen = true; // L: 7201 + } // L: 7202 - @ObfuscatedName("ip") + @ObfuscatedName("ic") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-558702165" + descriptor = "(ZB)V", + garbageValue = "56" ) @Export("resizeRoot") final void resizeRoot(boolean var1) { - int var2 = rootInterface; - int var3 = Varcs.canvasWidth; - int var4 = class52.canvasHeight; - if (UserComparator4.loadInterface(var2)) { - GrandExchangeOfferUnitPriceComparator.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); + int var2 = rootInterface; // L: 9185 + int var3 = FloorDecoration.canvasWidth; // L: 9186 + int var4 = GameShell.canvasHeight; // L: 9187 + if (WorldMapSprite.loadInterface(var2)) { // L: 9189 + KeyHandler.resizeInterface(Widget.Widget_interfaceComponents[var2], -1, var3, var4, var1); // L: 9190 } - } + } // L: 9192 - @ObfuscatedName("ig") + @ObfuscatedName("ip") @ObfuscatedSignature( - descriptor = "(Lhd;I)V", - garbageValue = "-985582804" + descriptor = "(Lhq;I)V", + garbageValue = "1722928474" ) @Export("alignWidget") void alignWidget(Widget var1) { - Widget var2 = var1.parentId == -1 ? null : WorldMapSprite.getWidget(var1.parentId); + Widget var2 = var1.parentId == -1 ? null : TileItem.getWidget(var1.parentId); // L: 9195 int var3; int var4; - if (var2 == null) { - var3 = Varcs.canvasWidth; - var4 = class52.canvasHeight; + if (var2 == null) { // L: 9198 + var3 = FloorDecoration.canvasWidth; // L: 9199 + var4 = GameShell.canvasHeight; // L: 9200 } else { - var3 = var2.width; - var4 = var2.height; + var3 = var2.width; // L: 9203 + var4 = var2.height; // L: 9204 } - UserComparator3.alignWidgetSize(var1, var3, var4, false); - WorldMapLabel.alignWidgetPosition(var1, var3, var4); - } + MouseRecorder.alignWidgetSize(var1, var3, var4, false); // L: 9206 + DirectByteArrayCopier.alignWidgetPosition(var1, var3, var4); // L: 9207 + } // L: 9208 - @ObfuscatedName("jz") + @ObfuscatedName("ju") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1745197570" + descriptor = "(B)V", + garbageValue = "10" ) - final void method1372() { - class234.invalidateWidget(clickedWidget); - ++GrandExchangeOfferAgeComparator.widgetDragDuration; - if (field854 && field692) { - int var1 = MouseHandler.MouseHandler_x; - int var2 = MouseHandler.MouseHandler_y; - var1 -= widgetClickX; - var2 -= widgetClickY; - if (var1 < field852) { - var1 = field852; + final void method1458() { + class52.invalidateWidget(clickedWidget); // L: 10175 + ++BoundaryObject.widgetDragDuration; // L: 10176 + if (field880 && field799) { // L: 10177 + int var1 = MouseHandler.MouseHandler_x; // L: 10183 + int var2 = MouseHandler.MouseHandler_y; // L: 10184 + var1 -= widgetClickX; // L: 10185 + var2 -= widgetClickY; // L: 10186 + if (var1 < field856) { // L: 10187 + var1 = field856; } - if (var1 + clickedWidget.width > field852 + clickedWidgetParent.width) { - var1 = field852 + clickedWidgetParent.width - clickedWidget.width; + if (var1 + clickedWidget.width > field856 + clickedWidgetParent.width) { // L: 10188 + var1 = field856 + clickedWidgetParent.width - clickedWidget.width; } - if (var2 < field853) { - var2 = field853; + if (var2 < field785) { // L: 10189 + var2 = field785; } - if (var2 + clickedWidget.height > field853 + clickedWidgetParent.height) { - var2 = field853 + clickedWidgetParent.height - clickedWidget.height; + if (var2 + clickedWidget.height > field785 + clickedWidgetParent.height) { // L: 10190 + var2 = field785 + clickedWidgetParent.height - clickedWidget.height; } - int var3 = var1 - field855; - int var4 = var2 - field856; - int var5 = clickedWidget.dragZoneSize; - if (GrandExchangeOfferAgeComparator.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { - isDraggingWidget = true; + int var3 = var1 - field859; // L: 10191 + int var4 = var2 - field795; // L: 10192 + int var5 = clickedWidget.dragZoneSize; // L: 10193 + if (BoundaryObject.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) { // L: 10194 10195 + isDraggingWidget = true; // L: 10196 } - int var6 = var1 - field852 + clickedWidgetParent.scrollX; - int var7 = var2 - field853 + clickedWidgetParent.scrollY; + int var6 = var1 - field856 + clickedWidgetParent.scrollX; // L: 10199 + int var7 = var2 - field785 + clickedWidgetParent.scrollY; // L: 10200 ScriptEvent var8; - if (clickedWidget.onDrag != null && isDraggingWidget) { - var8 = new ScriptEvent(); - var8.widget = clickedWidget; - var8.mouseX = var6; - var8.mouseY = var7; - var8.args = clickedWidget.onDrag; - InterfaceParent.runScriptEvent(var8); + if (clickedWidget.onDrag != null && isDraggingWidget) { // L: 10201 + var8 = new ScriptEvent(); // L: 10202 + var8.widget = clickedWidget; // L: 10203 + var8.mouseX = var6; // L: 10204 + var8.mouseY = var7; // L: 10205 + var8.args = clickedWidget.onDrag; // L: 10206 + Script.runScriptEvent(var8); // L: 10207 } - if (MouseHandler.MouseHandler_currentButton == 0) { - if (isDraggingWidget) { - if (clickedWidget.onDragComplete != null) { - var8 = new ScriptEvent(); - var8.widget = clickedWidget; - var8.mouseX = var6; - var8.mouseY = var7; - var8.dragTarget = draggedOnWidget; - var8.args = clickedWidget.onDragComplete; - InterfaceParent.runScriptEvent(var8); + if (MouseHandler.MouseHandler_currentButton == 0) { // L: 10209 + if (isDraggingWidget) { // L: 10210 + if (clickedWidget.onDragComplete != null) { // L: 10211 + var8 = new ScriptEvent(); // L: 10212 + var8.widget = clickedWidget; // L: 10213 + var8.mouseX = var6; // L: 10214 + var8.mouseY = var7; // L: 10215 + var8.dragTarget = draggedOnWidget; // L: 10216 + var8.args = clickedWidget.onDragComplete; // L: 10217 + Script.runScriptEvent(var8); // L: 10218 } - if (draggedOnWidget != null && FriendSystem.method1994(clickedWidget) != null) { - PacketBufferNode var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2299, packetWriter.isaacCipher); - var9.packetBuffer.writeShort(draggedOnWidget.itemId); - var9.packetBuffer.method5753(draggedOnWidget.childIndex); - var9.packetBuffer.method5898(clickedWidget.itemId); - var9.packetBuffer.method5752(clickedWidget.childIndex); - var9.packetBuffer.method5764(clickedWidget.id); - var9.packetBuffer.writeShortLE(draggedOnWidget.id); - packetWriter.addNode(var9); + if (draggedOnWidget != null && ReflectionCheck.method2381(clickedWidget) != null) { // L: 10220 + PacketBufferNode var9 = getPacketBufferNode(ClientPacket.field2266, packetWriter.isaacCipher); // L: 10222 + var9.packetBuffer.writeInt(draggedOnWidget.id); // L: 10223 + var9.packetBuffer.method5663(clickedWidget.id); // L: 10224 + var9.packetBuffer.method5665(clickedWidget.childIndex); // L: 10225 + var9.packetBuffer.method5653(draggedOnWidget.itemId); // L: 10226 + var9.packetBuffer.method5653(draggedOnWidget.childIndex); // L: 10227 + var9.packetBuffer.method5653(clickedWidget.itemId); // L: 10228 + packetWriter.addNode(var9); // L: 10229 } - } else if (this.shouldLeftClickOpenMenu()) { - this.openMenu(field855 + widgetClickX, field856 + widgetClickY); - } else if (menuOptionsCount > 0) { - GrandExchangeOffer.method189(field855 + widgetClickX, field856 + widgetClickY); + } else if (this.shouldLeftClickOpenMenu()) { // L: 10233 + this.openMenu(widgetClickX + field859, field795 + widgetClickY); // L: 10234 + } else if (menuOptionsCount > 0) { // L: 10236 + SecureRandomFuture.method2211(widgetClickX + field859, widgetClickY + field795); // L: 10237 } - clickedWidget = null; + clickedWidget = null; // L: 10240 } } else { - if (GrandExchangeOfferAgeComparator.widgetDragDuration > 1) { - clickedWidget = null; + if (BoundaryObject.widgetDragDuration > 1) { // L: 10178 + clickedWidget = null; // L: 10179 } } - } + } // L: 10181 10242 - @ObfuscatedName("kr") + @ObfuscatedName("ks") @ObfuscatedSignature( - descriptor = "(B)Lkq;", - garbageValue = "-76" + descriptor = "(I)Lku;", + garbageValue = "1348007061" ) @Export("username") public Username username() { - return class60.localPlayer != null ? class60.localPlayer.username : null; + return WorldMapLabelSize.localPlayer != null ? WorldMapLabelSize.localPlayer.username : null; // L: 10858 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)Lih;", - garbageValue = "1222368622" + descriptor = "(III)I", + garbageValue = "-2048198145" ) - @Export("WorldMapElement_get") - public static WorldMapElement WorldMapElement_get(int var0) { - return var0 >= 0 && var0 < class257.WorldMapElement_cached.length && class257.WorldMapElement_cached[var0] != null ? class257.WorldMapElement_cached[var0] : new WorldMapElement(var0); + public static int method1789(int var0, int var1) { + int var2; + for (var2 = 1; var1 > 1; var1 >>= 1) { // L: 24 25 + if ((var1 & 1) != 0) { + var2 = var0 * var2; // L: 26 + } + + var0 *= var0; + } + + if (var1 == 1) { + return var0 * var2; + } else { + return var2; + } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;Ljava/io/File;I)V", - garbageValue = "1015952997" + descriptor = "(DDII)[D", + garbageValue = "1556840096" ) - static void method1803(File var0, File var1) { - try { - AccessFile var2 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); - Buffer var3 = new Buffer(500); - var3.writeByte(3); - var3.writeByte(var1 != null ? 1 : 0); - var3.writeCESU8(var0.getPath()); - if (var1 != null) { - var3.writeCESU8(""); - } + public static double[] method1378(double var0, double var2, int var4) { + int var5 = var4 * 2 + 1; // L: 18 + double[] var6 = new double[var5]; // L: 19 + int var7 = -var4; - var2.write(var3.array, 0, var3.offset); - var2.close(); - } catch (IOException var4) { - var4.printStackTrace(); + for (int var8 = 0; var7 <= var4; ++var8) { + var6[var8] = class278.method5090((double)var7, var0, var2); // L: 21 + ++var7; // L: 20 } + return var6; // L: 23 } - @ObfuscatedName("c") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lbn;B)V", - garbageValue = "2" + descriptor = "(Lgf;Llh;I)Lgb;", + garbageValue = "-1510216701" ) - static void method1522(GameShell var0) { - while (WorldMapManager.isKeyDown()) { - if (SecureRandomCallable.field546 == 13) { - WorldMapSection2.method398(); - return; - } - - if (SecureRandomCallable.field546 == 96) { - if (Login.worldSelectPage > 0 && class13.worldSelectLeftSprite != null) { - --Login.worldSelectPage; - } - } else if (SecureRandomCallable.field546 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && ClientPreferences.worldSelectRightSprite != null) { - ++Login.worldSelectPage; - } + @Export("getPacketBufferNode") + public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { + PacketBufferNode var2 = ItemContainer.method1226(); // L: 27 + var2.clientPacket = var0; // L: 28 + var2.clientPacketLength = var0.length; // L: 29 + if (var2.clientPacketLength == -1) { // L: 30 + var2.packetBuffer = new PacketBuffer(260); + } else if (var2.clientPacketLength == -2) { + var2.packetBuffer = new PacketBuffer(10000); // L: 31 + } else if (var2.clientPacketLength <= 18) { // L: 32 + var2.packetBuffer = new PacketBuffer(20); + } else if (var2.clientPacketLength <= 98) { // L: 33 + var2.packetBuffer = new PacketBuffer(100); + } else { + var2.packetBuffer = new PacketBuffer(260); // L: 34 } - if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - int var1 = Login.xPadding + 280; - if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Player.changeWorldSelectSorting(0, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Player.changeWorldSelectSorting(0, 1); - return; - } - - int var2 = Login.xPadding + 390; - if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Player.changeWorldSelectSorting(1, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Player.changeWorldSelectSorting(1, 1); - return; - } - - int var3 = Login.xPadding + 500; - if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Player.changeWorldSelectSorting(2, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Player.changeWorldSelectSorting(2, 1); - return; - } - - int var4 = Login.xPadding + 610; - if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Player.changeWorldSelectSorting(3, 0); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { - Player.changeWorldSelectSorting(3, 1); - return; - } - - if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { - WorldMapSection2.method398(); - return; - } - - if (Login.hoveredWorldIndex != -1) { - World var5 = class13.World_worlds[Login.hoveredWorldIndex]; - Friend.changeWorld(var5); - WorldMapSection2.method398(); - return; - } - - if (Login.worldSelectPage > 0 && class13.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= class13.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= class52.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class52.canvasHeight / 2 + 50) { - --Login.worldSelectPage; - } - - if (Login.worldSelectPage < Login.worldSelectPagesCount && ClientPreferences.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= Varcs.canvasWidth - ClientPreferences.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= Varcs.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= class52.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= class52.canvasHeight / 2 + 50) { - ++Login.worldSelectPage; - } - } + var2.packetBuffer.setIsaacCipher(var1); // L: 35 + var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); // L: 36 + var2.index = 0; // L: 37 + return var2; // L: 38 + } + @ObfuscatedName("gh") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "887338283" + ) + static boolean method1792() { + return (drawPlayerNames & 1) != 0; // L: 4405 } } diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java index 07a6b02a39..6332b528ba 100644 --- a/runescape-client/src/main/java/ClientPacket.java +++ b/runescape-client/src/main/java/ClientPacket.java @@ -4,639 +4,677 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gn") +@ObfuscatedName("gf") @Implements("ClientPacket") public class ClientPacket implements class190 { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2270; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2242; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2243; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2244; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2250; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2298; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2247; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2248; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2249; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2257; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2251; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2252; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2273; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2254; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2292; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2256; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2253; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2258; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2259; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2260; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2291; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2261; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2263; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2264; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2265; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2283; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2267; - @ObfuscatedName("ai") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2268; - @ObfuscatedName("ao") + public static final ClientPacket field2247; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2269; - @ObfuscatedName("ae") + public static final ClientPacket field2248; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2262; - @ObfuscatedName("ax") + public static final ClientPacket field2249; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2340; - @ObfuscatedName("ag") + public static final ClientPacket field2250; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2255; - @ObfuscatedName("ab") + public static final ClientPacket field2251; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2241; - @ObfuscatedName("am") + public static final ClientPacket field2252; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2274; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2275; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2290; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2344; - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2278; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2295; - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2280; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2281; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2282; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2296; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2284; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2285; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2286; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2279; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - static final ClientPacket field2321; - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2289; - @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2277; - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2329; - @ObfuscatedName("aj") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2287; - @ObfuscatedName("bk") + public static final ClientPacket field2254; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" + ) + public static final ClientPacket field2255; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2341; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2257; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2258; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2259; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + static final ClientPacket field2316; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2261; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2262; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2263; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2264; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2253; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2337; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2321; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lgf;" ) public static final ClientPacket field2293; - @ObfuscatedName("bh") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2294; - @ObfuscatedName("bg") + public static final ClientPacket field2269; + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2266; - @ObfuscatedName("be") + public static final ClientPacket field2270; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2327; - @ObfuscatedName("bf") + public static final ClientPacket field2273; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2297; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2301; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2299; - @ObfuscatedName("bb") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2300; - @ObfuscatedName("bw") + public static final ClientPacket field2272; + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2276; - @ObfuscatedName("bq") + public static final ClientPacket field2274; + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2328; - @ObfuscatedName("bn") + public static final ClientPacket field2275; + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" + ) + public static final ClientPacket field2290; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2277; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2319; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2279; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2280; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2281; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2282; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2283; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2284; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2285; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2296; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2271; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2288; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2347; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2278; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2336; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2292; + @ObfuscatedName("aj") + @ObfuscatedSignature( + descriptor = "Lgf;" ) public static final ClientPacket field2303; + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2307; + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2294; + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2291; + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2297; + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + static final ClientPacket field2298; @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2335; - @ObfuscatedName("bo") + public static final ClientPacket field2265; + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" + ) + public static final ClientPacket field2300; + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2301; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2302; + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2340; + @ObfuscatedName("bg") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2304; + @ObfuscatedName("br") + @ObfuscatedSignature( + descriptor = "Lgf;" ) public static final ClientPacket field2305; @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2306; - @ObfuscatedName("bm") + public static final ClientPacket field2246; + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2311; - @ObfuscatedName("bl") + static final ClientPacket field2295; + @ObfuscatedName("bw") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2308; - @ObfuscatedName("bv") + public static final ClientPacket field2260; + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2309; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2310; - @ObfuscatedName("bz") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2288; @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" + ) + public static final ClientPacket field2310; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2311; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lgf;" ) public static final ClientPacket field2312; - @ObfuscatedName("bx") + @ObfuscatedName("bd") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2313; - @ObfuscatedName("br") + @ObfuscatedName("bb") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - static final ClientPacket field2314; - @ObfuscatedName("bs") + public static final ClientPacket field2314; + @ObfuscatedName("bx") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2315; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2339; @ObfuscatedName("by") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2316; - @ObfuscatedName("bj") + public static final ClientPacket field2317; + @ObfuscatedName("bo") @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2245; - @ObfuscatedName("bt") - @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2318; - @ObfuscatedName("cc") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2337; - @ObfuscatedName("cb") + public static final ClientPacket field2325; + @ObfuscatedName("bv") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2320; - @ObfuscatedName("ch") + @ObfuscatedName("bf") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2304; - @ObfuscatedName("cw") + public static final ClientPacket field2276; + @ObfuscatedName("bt") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2271; - @ObfuscatedName("cz") + public static final ClientPacket field2322; + @ObfuscatedName("bs") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2323; @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2324; - @ObfuscatedName("cn") + @ObfuscatedName("ca") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2325; - @ObfuscatedName("ce") + public static final ClientPacket field2268; + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) public static final ClientPacket field2326; - @ObfuscatedName("cj") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2319; - @ObfuscatedName("ck") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2338; @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2307; - @ObfuscatedName("cp") + public static final ClientPacket field2327; + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" + ) + public static final ClientPacket field2328; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2266; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lgf;" ) public static final ClientPacket field2330; @ObfuscatedName("ci") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - static final ClientPacket field2331; - @ObfuscatedName("cu") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2332; - @ObfuscatedName("cq") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2333; - @ObfuscatedName("co") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2334; - @ObfuscatedName("ca") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2272; + public static final ClientPacket field2331; @ObfuscatedName("cm") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2336; + public static final ClientPacket field2332; + @ObfuscatedName("cu") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2333; + @ObfuscatedName("cw") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2334; + @ObfuscatedName("cq") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2335; + @ObfuscatedName("cc") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2287; @ObfuscatedName("cf") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2302; - @ObfuscatedName("ct") + public static final ClientPacket field2342; + @ObfuscatedName("cj") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2317; + public static final ClientPacket field2338; @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2339; - @ObfuscatedName("cy") - @ObfuscatedSignature( - descriptor = "Lgn;" - ) - public static final ClientPacket field2322; + public static final ClientPacket field2286; @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) - public static final ClientPacket field2341; - @ObfuscatedName("eo") + public static final ClientPacket field2348; + @ObfuscatedName("cp") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lgf;" ) - @Export("archive20") - static Archive archive20; + public static final ClientPacket field2289; + @ObfuscatedName("ch") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2308; @ObfuscatedName("cs") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2343; + @ObfuscatedName("ck") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2344; + @ObfuscatedName("co") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2345; + @ObfuscatedName("cz") + @ObfuscatedSignature( + descriptor = "Lgf;" + ) + public static final ClientPacket field2346; + @ObfuscatedName("cy") @ObfuscatedGetter( - intValue = 2086996783 + intValue = -1495788607 ) @Export("id") final int id; - @ObfuscatedName("cr") + @ObfuscatedName("cb") @ObfuscatedGetter( - intValue = 1606130337 + intValue = -1365749519 ) @Export("length") final int length; static { - field2270 = new ClientPacket(0, -1); - field2242 = new ClientPacket(1, 7); - field2243 = new ClientPacket(2, 0); - field2244 = new ClientPacket(3, 6); - field2250 = new ClientPacket(4, 3); - field2298 = new ClientPacket(5, 4); - field2247 = new ClientPacket(6, -2); - field2248 = new ClientPacket(7, 8); - field2249 = new ClientPacket(8, 2); - field2257 = new ClientPacket(9, 11); - field2251 = new ClientPacket(10, 3); - field2252 = new ClientPacket(11, 8); - field2273 = new ClientPacket(12, -1); - field2254 = new ClientPacket(13, 8); - field2292 = new ClientPacket(14, -1); - field2256 = new ClientPacket(15, 9); - field2253 = new ClientPacket(16, -1); - field2258 = new ClientPacket(17, 4); - field2259 = new ClientPacket(18, 13); - field2260 = new ClientPacket(19, 3); - field2291 = new ClientPacket(20, 8); - field2261 = new ClientPacket(21, 3); - field2263 = new ClientPacket(22, 4); - field2264 = new ClientPacket(23, 8); - field2265 = new ClientPacket(24, 0); - field2283 = new ClientPacket(25, 13); - field2267 = new ClientPacket(26, 2); - field2268 = new ClientPacket(27, -1); - field2269 = new ClientPacket(28, 2); - field2262 = new ClientPacket(29, 7); - field2340 = new ClientPacket(30, 7); - field2255 = new ClientPacket(31, -1); - field2241 = new ClientPacket(32, 15); - field2274 = new ClientPacket(33, 3); - field2275 = new ClientPacket(34, 8); - field2290 = new ClientPacket(35, 1); - field2344 = new ClientPacket(36, 8); - field2278 = new ClientPacket(37, 3); - field2295 = new ClientPacket(38, 9); - field2280 = new ClientPacket(39, 7); - field2281 = new ClientPacket(40, 16); - field2282 = new ClientPacket(41, 7); - field2296 = new ClientPacket(42, 7); - field2284 = new ClientPacket(43, 7); - field2285 = new ClientPacket(44, 0); - field2286 = new ClientPacket(45, -1); - field2279 = new ClientPacket(46, 5); - field2321 = new ClientPacket(47, 7); - field2289 = new ClientPacket(48, -1); - field2277 = new ClientPacket(49, 9); - field2329 = new ClientPacket(50, -1); - field2287 = new ClientPacket(51, 3); - field2293 = new ClientPacket(52, 8); - field2294 = new ClientPacket(53, 15); - field2266 = new ClientPacket(54, 14); - field2327 = new ClientPacket(55, 9); - field2297 = new ClientPacket(56, 4); - field2301 = new ClientPacket(57, 3); - field2299 = new ClientPacket(58, 16); - field2300 = new ClientPacket(59, 7); - field2276 = new ClientPacket(60, 13); - field2328 = new ClientPacket(61, 8); - field2303 = new ClientPacket(62, 8); - field2335 = new ClientPacket(63, 16); - field2305 = new ClientPacket(64, 8); - field2306 = new ClientPacket(65, -1); - field2311 = new ClientPacket(66, -1); - field2308 = new ClientPacket(67, 8); - field2309 = new ClientPacket(68, 8); - field2310 = new ClientPacket(69, -1); - field2288 = new ClientPacket(70, 6); - field2312 = new ClientPacket(71, -1); - field2313 = new ClientPacket(72, 7); - field2314 = new ClientPacket(73, 2); - field2315 = new ClientPacket(74, 8); - field2316 = new ClientPacket(75, -1); - field2245 = new ClientPacket(76, 8); - field2318 = new ClientPacket(77, 8); - field2337 = new ClientPacket(78, 3); - field2320 = new ClientPacket(79, 8); - field2304 = new ClientPacket(80, -2); - field2271 = new ClientPacket(81, 3); - field2323 = new ClientPacket(82, 10); - field2324 = new ClientPacket(83, 3); - field2325 = new ClientPacket(84, -1); - field2326 = new ClientPacket(85, 0); - field2319 = new ClientPacket(86, 8); - field2338 = new ClientPacket(87, 3); - field2307 = new ClientPacket(88, 7); - field2330 = new ClientPacket(89, -2); - field2331 = new ClientPacket(90, -1); - field2332 = new ClientPacket(91, 8); - field2333 = new ClientPacket(92, 4); - field2334 = new ClientPacket(93, 8); - field2272 = new ClientPacket(94, 3); - field2336 = new ClientPacket(95, -1); - field2302 = new ClientPacket(96, 2); - field2317 = new ClientPacket(97, 3); - field2339 = new ClientPacket(98, 0); - field2322 = new ClientPacket(99, 11); - field2341 = new ClientPacket(100, -1); + field2267 = new ClientPacket(0, 0); // L: 5 + field2247 = new ClientPacket(1, 8); // L: 6 + field2248 = new ClientPacket(2, 7); // L: 7 + field2249 = new ClientPacket(3, -2); // L: 8 + field2250 = new ClientPacket(4, -1); // L: 9 + field2251 = new ClientPacket(5, 4); // L: 10 + field2252 = new ClientPacket(6, 7); // L: 11 + field2329 = new ClientPacket(7, -1); // L: 12 + field2254 = new ClientPacket(8, 16); // L: 13 + field2255 = new ClientPacket(9, 8); // L: 14 + field2341 = new ClientPacket(10, 5); // L: 15 + field2257 = new ClientPacket(11, -1); // L: 16 + field2258 = new ClientPacket(12, 0); // L: 17 + field2259 = new ClientPacket(13, 8); // L: 18 + field2316 = new ClientPacket(14, 2); // L: 19 + field2261 = new ClientPacket(15, 8); // L: 20 + field2262 = new ClientPacket(16, 10); // L: 21 + field2263 = new ClientPacket(17, 8); // L: 22 + field2264 = new ClientPacket(18, 4); // L: 23 + field2253 = new ClientPacket(19, 8); // L: 24 + field2337 = new ClientPacket(20, 8); // L: 25 + field2321 = new ClientPacket(21, 3); // L: 26 + field2293 = new ClientPacket(22, 2); // L: 27 + field2269 = new ClientPacket(23, -1); // L: 28 + field2270 = new ClientPacket(24, 3); // L: 29 + field2273 = new ClientPacket(25, -1); // L: 30 + field2299 = new ClientPacket(26, 1); // L: 31 + field2272 = new ClientPacket(27, 3); // L: 32 + field2274 = new ClientPacket(28, 3); // L: 33 + field2275 = new ClientPacket(29, 16); // L: 34 + field2290 = new ClientPacket(30, 0); // L: 35 + field2277 = new ClientPacket(31, 8); // L: 36 + field2319 = new ClientPacket(32, -1); // L: 37 + field2279 = new ClientPacket(33, 3); // L: 38 + field2280 = new ClientPacket(34, 3); // L: 39 + field2281 = new ClientPacket(35, 7); // L: 40 + field2282 = new ClientPacket(36, 7); // L: 41 + field2283 = new ClientPacket(37, 3); // L: 42 + field2284 = new ClientPacket(38, -2); // L: 43 + field2285 = new ClientPacket(39, 11); // L: 44 + field2296 = new ClientPacket(40, -1); // L: 45 + field2271 = new ClientPacket(41, -1); // L: 46 + field2288 = new ClientPacket(42, -1); // L: 47 + field2347 = new ClientPacket(43, 3); // L: 48 + field2278 = new ClientPacket(44, 8); // L: 49 + field2336 = new ClientPacket(45, 0); // L: 50 + field2292 = new ClientPacket(46, 15); // L: 51 + field2303 = new ClientPacket(47, 13); // L: 52 + field2307 = new ClientPacket(48, 13); // L: 53 + field2294 = new ClientPacket(49, 9); // L: 54 + field2291 = new ClientPacket(50, 8); // L: 55 + field2297 = new ClientPacket(51, 3); // L: 56 + field2298 = new ClientPacket(52, 7); // L: 57 + field2265 = new ClientPacket(53, 3); // L: 58 + field2300 = new ClientPacket(54, 8); // L: 59 + field2301 = new ClientPacket(55, 9); // L: 60 + field2302 = new ClientPacket(56, 11); // L: 61 + field2340 = new ClientPacket(57, 8); // L: 62 + field2304 = new ClientPacket(58, 8); // L: 63 + field2305 = new ClientPacket(59, 8); // L: 64 + field2246 = new ClientPacket(60, 3); // L: 65 + field2295 = new ClientPacket(61, -1); // L: 66 + field2260 = new ClientPacket(62, 7); // L: 67 + field2309 = new ClientPacket(63, 9); // L: 68 + field2310 = new ClientPacket(64, 7); // L: 69 + field2311 = new ClientPacket(65, 2); // L: 70 + field2312 = new ClientPacket(66, 6); // L: 71 + field2313 = new ClientPacket(67, 8); // L: 72 + field2314 = new ClientPacket(68, 8); // L: 73 + field2315 = new ClientPacket(69, -1); // L: 74 + field2339 = new ClientPacket(70, -1); // L: 75 + field2317 = new ClientPacket(71, -1); // L: 76 + field2318 = new ClientPacket(72, 0); // L: 77 + field2325 = new ClientPacket(73, 13); // L: 78 + field2320 = new ClientPacket(74, 3); // L: 79 + field2276 = new ClientPacket(75, 6); // L: 80 + field2322 = new ClientPacket(76, -1); // L: 81 + field2323 = new ClientPacket(77, 7); // L: 82 + field2324 = new ClientPacket(78, -1); // L: 83 + field2268 = new ClientPacket(79, 8); // L: 84 + field2326 = new ClientPacket(80, 2); // L: 85 + field2327 = new ClientPacket(81, 9); // L: 86 + field2328 = new ClientPacket(82, 7); // L: 87 + field2266 = new ClientPacket(83, 16); // L: 88 + field2330 = new ClientPacket(84, 8); // L: 89 + field2331 = new ClientPacket(85, 8); // L: 90 + field2332 = new ClientPacket(86, 4); // L: 91 + field2333 = new ClientPacket(87, 3); // L: 92 + field2334 = new ClientPacket(88, 4); // L: 93 + field2335 = new ClientPacket(89, 14); // L: 94 + field2287 = new ClientPacket(90, 7); // L: 95 + field2342 = new ClientPacket(91, -1); // L: 96 + field2338 = new ClientPacket(92, 2); // L: 97 + field2286 = new ClientPacket(93, 8); // L: 98 + field2348 = new ClientPacket(94, 15); // L: 99 + field2289 = new ClientPacket(95, 4); // L: 100 + field2308 = new ClientPacket(96, -2); // L: 101 + field2343 = new ClientPacket(97, 3); // L: 102 + field2344 = new ClientPacket(98, -1); // L: 103 + field2345 = new ClientPacket(99, -1); // L: 104 + field2346 = new ClientPacket(100, 7); // L: 105 } ClientPacket(int var1, int var2) { - this.id = var1; - this.length = var2; - } + this.id = var1; // L: 110 + this.length = var2; // L: 111 + } // L: 112 + + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2030904822" + ) + static final void method3706() { + int[] var0 = Players.Players_indices; // L: 3405 + + int var1; + for (var1 = 0; var1 < Players.Players_count; ++var1) { // L: 3406 + Player var4 = Client.players[var0[var1]]; // L: 3407 + if (var4 != null && var4.overheadTextCyclesRemaining > 0) { // L: 3408 + --var4.overheadTextCyclesRemaining; // L: 3409 + if (var4.overheadTextCyclesRemaining == 0) { // L: 3410 + var4.overheadText = null; + } + } + } + + for (var1 = 0; var1 < Client.npcCount; ++var1) { // L: 3413 + int var2 = Client.npcIndices[var1]; // L: 3414 + NPC var3 = Client.npcs[var2]; // L: 3415 + if (var3 != null && var3.overheadTextCyclesRemaining > 0) { // L: 3416 + --var3.overheadTextCyclesRemaining; // L: 3417 + if (var3.overheadTextCyclesRemaining == 0) { // L: 3418 + var3.overheadText = null; + } + } + } + + } // L: 3421 + + @ObfuscatedName("jd") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-100" + ) + @Export("runIntfCloseListeners") + static final void runIntfCloseListeners(int var0, int var1) { + if (WorldMapSprite.loadInterface(var0)) { // L: 10110 + WorldMapAreaData.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); // L: 10111 + } + } // L: 10112 } diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 9c9b015200..59e12bcb5e 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -7,51 +7,51 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cz") +@ObfuscatedName("ce") @Implements("ClientPreferences") public class ClientPreferences { - @ObfuscatedName("pv") + @ObfuscatedName("ot") @ObfuscatedSignature( - descriptor = "Lkk;" + descriptor = "Lco;" ) - @Export("clanChat") - static ClanChat clanChat; - @ObfuscatedName("m") + @Export("varcs") + static Varcs varcs; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -833768267 + intValue = -1940309873 ) @Export("ClientPreferences_optionCount") static int ClientPreferences_optionCount; - @ObfuscatedName("bp") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "[Lls;" ) - @Export("worldSelectRightSprite") - static IndexedSprite worldSelectRightSprite; - @ObfuscatedName("q") + @Export("title_muteSprite") + static IndexedSprite[] title_muteSprite; + @ObfuscatedName("s") @Export("roofsHidden") boolean roofsHidden; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("titleMusicDisabled") boolean titleMusicDisabled; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1665448065 + intValue = -1674568027 ) @Export("windowMode") int windowMode; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("rememberedUsername") String rememberedUsername; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("hideUsername") boolean hideUsername; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("parameters") LinkedHashMap parameters; static { - ClientPreferences_optionCount = 6; + ClientPreferences_optionCount = 6; // L: 11 } ClientPreferences() { @@ -59,175 +59,89 @@ public class ClientPreferences { this.rememberedUsername = null; this.hideUsername = false; this.parameters = new LinkedHashMap(); - this.method1911(true); - } + this.method1907(true); // L: 21 + } // L: 22 @ObfuscatedSignature( - descriptor = "(Lkn;)V" + descriptor = "(Lkf;)V" ) ClientPreferences(Buffer var1) { - this.windowMode = 1; - this.rememberedUsername = null; - this.hideUsername = false; - this.parameters = new LinkedHashMap(); - if (var1 != null && var1.array != null) { - int var2 = var1.readUnsignedByte(); - if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { - if (var1.readUnsignedByte() == 1) { + this.windowMode = 1; // L: 15 + this.rememberedUsername = null; // L: 16 + this.hideUsername = false; // L: 17 + this.parameters = new LinkedHashMap(); // L: 18 + if (var1 != null && var1.array != null) { // L: 25 + int var2 = var1.readUnsignedByte(); // L: 29 + if (var2 >= 0 && var2 <= ClientPreferences_optionCount) { // L: 30 + if (var1.readUnsignedByte() == 1) { // L: 34 this.roofsHidden = true; } - if (var2 > 1) { - this.titleMusicDisabled = var1.readUnsignedByte() == 1; + if (var2 > 1) { // L: 35 + this.titleMusicDisabled = var1.readUnsignedByte() == 1; // L: 36 } - if (var2 > 3) { - this.windowMode = var1.readUnsignedByte(); + if (var2 > 3) { // L: 38 + this.windowMode = var1.readUnsignedByte(); // L: 39 } - if (var2 > 2) { - int var3 = var1.readUnsignedByte(); + if (var2 > 2) { // L: 41 + int var3 = var1.readUnsignedByte(); // L: 42 - for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.readInt(); - int var6 = var1.readInt(); - this.parameters.put(var5, var6); + for (int var4 = 0; var4 < var3; ++var4) { // L: 43 + int var5 = var1.readInt(); // L: 44 + int var6 = var1.readInt(); // L: 45 + this.parameters.put(var5, var6); // L: 46 } } - if (var2 > 4) { - this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); + if (var2 > 4) { // L: 49 + this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull(); // L: 50 } - if (var2 > 5) { - this.hideUsername = var1.readBoolean(); + if (var2 > 5) { // L: 52 + this.hideUsername = var1.readBoolean(); // L: 53 } } else { - this.method1911(true); + this.method1907(true); // L: 31 } } else { - this.method1911(true); + this.method1907(true); // L: 26 } - } + } // L: 57 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-943142768" + garbageValue = "124970777" ) - void method1911(boolean var1) { - } + void method1907(boolean var1) { + } // L: 59 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(S)Lkn;", - garbageValue = "128" + descriptor = "(I)Lkf;", + garbageValue = "1981106247" ) @Export("toBuffer") Buffer toBuffer() { - Buffer var1 = new Buffer(100); - var1.writeByte(ClientPreferences_optionCount); - var1.writeByte(this.roofsHidden ? 1 : 0); - var1.writeByte(this.titleMusicDisabled ? 1 : 0); - var1.writeByte(this.windowMode); - var1.writeByte(this.parameters.size()); - Iterator var2 = this.parameters.entrySet().iterator(); + Buffer var1 = new Buffer(100); // L: 62 + var1.writeByte(ClientPreferences_optionCount); // L: 63 + var1.writeByte(this.roofsHidden ? 1 : 0); // L: 64 + var1.writeByte(this.titleMusicDisabled ? 1 : 0); // L: 65 + var1.writeByte(this.windowMode); // L: 66 + var1.writeByte(this.parameters.size()); // L: 67 + Iterator var2 = this.parameters.entrySet().iterator(); // L: 68 while (var2.hasNext()) { - Entry var3 = (Entry)var2.next(); - var1.writeInt((Integer)var3.getKey()); - var1.writeInt((Integer)var3.getValue()); + Entry var3 = (Entry)var2.next(); // L: 69 + var1.writeInt((Integer)var3.getKey()); // L: 71 + var1.writeInt((Integer)var3.getValue()); // L: 72 } - var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); - var1.writeBoolean(this.hideUsername); - return var1; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "116" - ) - static final int method1914(int var0, int var1) { - int var2 = var0 + var1 * 57; - var2 ^= var2 << 13; - int var3 = var2 * (var2 * var2 * 15731 + 789221) + 1376312589 & Integer.MAX_VALUE; - return var3 >> 19 & 255; - } - - @ObfuscatedName("ed") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-82" - ) - @Export("updateGameState") - static void updateGameState(int var0) { - if (var0 != Client.gameState) { - if (Client.gameState == 0) { - WorldMapSectionType.client.method1017(); - } - - if (var0 == 20 || var0 == 40 || var0 == 45) { - Client.loginState = 0; - Client.field705 = 0; - Client.field706 = 0; - Client.timer.method5184(var0); - if (var0 != 20) { - SequenceDefinition.method4973(false); - } - } - - if (var0 != 20 && var0 != 40 && class8.field35 != null) { - class8.field35.close(); - class8.field35 = null; - } - - if (Client.gameState == 25) { - Client.field809 = 0; - Client.field822 = 0; - Client.field759 = 1; - Client.field690 = 0; - Client.field729 = 1; - } - - if (var0 != 5 && var0 != 10) { - if (var0 == 20) { - WorldMapRegion.method541(GraphicsObject.archive10, GrandExchangeEvent.archive8, true, Client.gameState == 11 ? 4 : 0); - } else if (var0 == 11) { - WorldMapRegion.method541(GraphicsObject.archive10, GrandExchangeEvent.archive8, false, 4); - } else if (GrandExchangeOfferAgeComparator.clearLoginScreen) { - HealthBar.titleboxSprite = null; - Fonts.titlebuttonSprite = null; - Login.runesSprite = null; - Login.leftTitleSprite = null; - ItemContainer.rightTitleSprite = null; - Login.logoSprite = null; - Decimator.title_muteSprite = null; - Login.options_buttons_0Sprite = null; - GameShell.options_buttons_2Sprite = null; - class90.worldSelectBackSprites = null; - SpotAnimationDefinition.worldSelectFlagSprites = null; - GrandExchangeEvent.worldSelectArrows = null; - class228.worldSelectStars = null; - WorldMapIcon_1.field206 = null; - Login.loginScreenRunesAnimation.method1878(); - class206.field2439 = 1; - Huffman.musicTrackArchive = null; - class206.musicTrackGroupId = -1; - MilliClock.musicTrackFileId = -1; - class206.musicTrackVolume = 0; - class336.musicTrackBoolean = false; - class206.field2442 = 2; - class41.method624(true); - GrandExchangeOfferAgeComparator.clearLoginScreen = false; - } - } else { - WorldMapRegion.method541(GraphicsObject.archive10, GrandExchangeEvent.archive8, true, 0); - } - - Client.gameState = var0; - } + var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : ""); // L: 75 + var1.writeBoolean(this.hideUsername); // L: 76 + return var1; // L: 77 } } diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java index 57efb598ff..1896645921 100644 --- a/runescape-client/src/main/java/Clock.java +++ b/runescape-client/src/main/java/Clock.java @@ -1,110 +1,220 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fb") +@ObfuscatedName("fa") @Implements("Clock") public abstract class Clock { - @ObfuscatedName("nq") - @ObfuscatedGetter( - intValue = -815222231 - ) - static int field2092; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ldo;" - ) - @Export("soundCache") - public static SoundCache soundCache; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = -357959565 - ) - @Export("clientTickTimeIdx") - static int clientTickTimeIdx; - @ObfuscatedName("do") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive2") - static Archive archive2; - Clock() { - } + } // L: 4 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1017447827" + garbageValue = "208275261" ) @Export("mark") public abstract void mark(); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1786752641" + garbageValue = "-16016139" ) @Export("wait") public abstract int wait(int var1, int var2); - @ObfuscatedName("l") + @ObfuscatedName("ik") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1957582234" + descriptor = "(IIIIIB)V", + garbageValue = "24" ) - static int method3641(int var0, Script var1, boolean var2) { - Widget var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETSCROLLX) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; - } else { - return 2; + @Export("drawScrollBar") + static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { + GrandExchangeEvent.scrollBarSprites[0].drawAt(var0, var1); // L: 9309 + GrandExchangeEvent.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 9310 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field739); // L: 9311 + int var5 = var3 * (var3 - 32) / var4; // L: 9312 + if (var5 < 8) { // L: 9313 + var5 = 8; } - } + + int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 9314 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field670); // L: 9315 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field742); // L: 9316 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field742); // L: 9317 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field742); // L: 9318 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field742); // L: 9319 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field741); // L: 9320 + Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field741); // L: 9321 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field741); // L: 9322 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field741); // L: 9323 + } // L: 9324 + + @ObfuscatedName("je") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "59" + ) + @Export("changeGameOptions") + static final void changeGameOptions(int var0) { + DevicePcmPlayerProvider.method897(); // L: 10348 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 10350 + if (var1.obj != null) { // L: 10351 + var1.set(); + } + } + + int var4 = class195.VarpDefinition_get(var0).type; // L: 10354 + if (var4 != 0) { // L: 10355 + int var2 = Varps.Varps_main[var0]; // L: 10356 + if (var4 == 1) { // L: 10357 + if (var2 == 1) { // L: 10358 + Rasterizer3D.Rasterizer3D_setBrightness(0.9D); // L: 10359 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); // L: 10360 + } + + if (var2 == 2) { // L: 10362 + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); // L: 10363 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); // L: 10364 + } + + if (var2 == 3) { // L: 10366 + Rasterizer3D.Rasterizer3D_setBrightness(0.7D); // L: 10367 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); // L: 10368 + } + + if (var2 == 4) { // L: 10370 + Rasterizer3D.Rasterizer3D_setBrightness(0.6D); // L: 10371 + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); // L: 10372 + } + + ItemDefinition.ItemDefinition_cachedSprites.clear(); // L: 10375 + } + + if (var4 == 3) { // L: 10378 + short var3 = 0; // L: 10379 + if (var2 == 0) { // L: 10380 + var3 = 255; + } + + if (var2 == 1) { // L: 10381 + var3 = 192; + } + + if (var2 == 2) { // L: 10382 + var3 = 128; + } + + if (var2 == 3) { // L: 10383 + var3 = 64; + } + + if (var2 == 4) { // L: 10384 + var3 = 0; + } + + if (var3 != Client.musicVolume) { // L: 10385 + if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { // L: 10386 + Script.method2322(CollisionMap.archive6, Client.currentTrackGroupId, 0, var3, false); // L: 10387 + Client.field704 = false; // L: 10388 + } else if (var3 == 0) { // L: 10390 + class206.midiPcmStream.clear(); // L: 10392 + class206.musicPlayerStatus = 1; // L: 10393 + class204.musicTrackArchive = null; // L: 10394 + Client.field704 = false; // L: 10396 + } else { + GrandExchangeEvents.method150(var3); // L: 10398 + } + + Client.musicVolume = var3; // L: 10399 + } + } + + if (var4 == 4) { // L: 10402 + if (var2 == 0) { // L: 10403 + Client.soundEffectVolume = 127; + } + + if (var2 == 1) { // L: 10404 + Client.soundEffectVolume = 96; + } + + if (var2 == 2) { // L: 10405 + Client.soundEffectVolume = 64; + } + + if (var2 == 3) { // L: 10406 + Client.soundEffectVolume = 32; + } + + if (var2 == 4) { // L: 10407 + Client.soundEffectVolume = 0; + } + } + + if (var4 == 5) { // L: 10409 + Client.leftClickOpensMenu = var2; + } + + if (var4 == 6) { // L: 10410 + Client.chatEffects = var2; + } + + if (var4 == 9) { // L: 10411 + Client.field707 = var2; + } + + if (var4 == 10) { // L: 10412 + if (var2 == 0) { // L: 10413 + Client.areaSoundEffectVolume = 127; + } + + if (var2 == 1) { // L: 10414 + Client.areaSoundEffectVolume = 96; + } + + if (var2 == 2) { // L: 10415 + Client.areaSoundEffectVolume = 64; + } + + if (var2 == 3) { // L: 10416 + Client.areaSoundEffectVolume = 32; + } + + if (var2 == 4) { // L: 10417 + Client.areaSoundEffectVolume = 0; + } + } + + if (var4 == 17) { // L: 10419 + Client.followerIndex = var2 & 65535; // L: 10420 + } + + if (var4 == 18) { // L: 10422 + Client.playerAttackOption = (AttackOption)TextureProvider.findEnumerated(AbstractWorldMapIcon.method679(), var2); // L: 10423 + if (Client.playerAttackOption == null) { // L: 10424 + Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + if (var4 == 19) { // L: 10426 + if (var2 == -1) { // L: 10427 + Client.combatTargetPlayerIndex = -1; + } else { + Client.combatTargetPlayerIndex = var2 & 2047; // L: 10428 + } + } + + if (var4 == 22) { // L: 10430 + Client.npcAttackOption = (AttackOption)TextureProvider.findEnumerated(AbstractWorldMapIcon.method679(), var2); // L: 10431 + if (Client.npcAttackOption == null) { // L: 10432 + Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; + } + } + + } + } // L: 10434 } diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java index 94899cd015..4148086296 100644 --- a/runescape-client/src/main/java/CollisionMap.java +++ b/runescape-client/src/main/java/CollisionMap.java @@ -4,514 +4,953 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fz") +@ObfuscatedName("ft") @Implements("CollisionMap") public class CollisionMap { - @ObfuscatedName("r") + @ObfuscatedName("df") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Liw;" ) - @Export("NetCache_responseArchiveBuffer") - public static Buffer NetCache_responseArchiveBuffer; - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "[Llz;" - ) - @Export("headIconPkSprites") - static Sprite[] headIconPkSprites; - @ObfuscatedName("am") + @Export("archive6") + static Archive archive6; + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 2098915851 + intValue = 232599941 ) @Export("xInset") int xInset; - @ObfuscatedName("ak") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 337356269 + intValue = -2100158867 ) @Export("yInset") int yInset; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1883511421 + intValue = -393101507 ) @Export("xSize") int xSize; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1176086575 + intValue = -2096335191 ) @Export("ySize") int ySize; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("flags") public int[][] flags; public CollisionMap(int var1, int var2) { - this.xInset = 0; - this.yInset = 0; - this.xSize = var1; - this.ySize = var2; - this.flags = new int[this.xSize][this.ySize]; - this.clear(); - } + this.xInset = 0; // L: 44 + this.yInset = 0; // L: 45 + this.xSize = var1; // L: 46 + this.ySize = var2; // L: 47 + this.flags = new int[this.xSize][this.ySize]; // L: 48 + this.clear(); // L: 49 + } // L: 50 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "-1749898511" ) @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.xSize; ++var1) { - for (int var2 = 0; var2 < this.ySize; ++var2) { - if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { - this.flags[var1][var2] = 16777216; + for (int var1 = 0; var1 < this.xSize; ++var1) { // L: 53 + for (int var2 = 0; var2 < this.ySize; ++var2) { // L: 54 + if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) { // L: 55 + this.flags[var1][var2] = 16777216; // L: 56 } else { this.flags[var1][var2] = 16777215; } } } - } + } // L: 59 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "1939344506" + garbageValue = "580618753" ) - public void method3680(int var1, int var2, int var3, int var4, boolean var5) { - var1 -= this.xInset; - var2 -= this.yInset; - if (var3 == 0) { - if (var4 == 0) { - this.setFlag(var1, var2, 128); - this.setFlag(var1 - 1, var2, 8); + public void method3630(int var1, int var2, int var3, int var4, boolean var5) { + var1 -= this.xInset; // L: 62 + var2 -= this.yInset; // L: 63 + if (var3 == 0) { // L: 64 + if (var4 == 0) { // L: 65 + this.setFlag(var1, var2, 128); // L: 66 + this.setFlag(var1 - 1, var2, 8); // L: 67 } if (var4 == 1) { - this.setFlag(var1, var2, 2); - this.setFlag(var1, var2 + 1, 32); + this.setFlag(var1, var2, 2); // L: 70 + this.setFlag(var1, var2 + 1, 32); // L: 71 } - if (var4 == 2) { - this.setFlag(var1, var2, 8); - this.setFlag(var1 + 1, var2, 128); + if (var4 == 2) { // L: 73 + this.setFlag(var1, var2, 8); // L: 74 + this.setFlag(var1 + 1, var2, 128); // L: 75 } - if (var4 == 3) { - this.setFlag(var1, var2, 32); - this.setFlag(var1, var2 - 1, 2); + if (var4 == 3) { // L: 77 + this.setFlag(var1, var2, 32); // L: 78 + this.setFlag(var1, var2 - 1, 2); // L: 79 } } - if (var3 == 1 || var3 == 3) { - if (var4 == 0) { - this.setFlag(var1, var2, 1); - this.setFlag(var1 - 1, var2 + 1, 16); + if (var3 == 1 || var3 == 3) { // L: 82 + if (var4 == 0) { // L: 83 + this.setFlag(var1, var2, 1); // L: 84 + this.setFlag(var1 - 1, var2 + 1, 16); // L: 85 } - if (var4 == 1) { - this.setFlag(var1, var2, 4); - this.setFlag(var1 + 1, var2 + 1, 64); + if (var4 == 1) { // L: 87 + this.setFlag(var1, var2, 4); // L: 88 + this.setFlag(var1 + 1, var2 + 1, 64); // L: 89 } - if (var4 == 2) { - this.setFlag(var1, var2, 16); - this.setFlag(var1 + 1, var2 - 1, 1); + if (var4 == 2) { // L: 91 + this.setFlag(var1, var2, 16); // L: 92 + this.setFlag(var1 + 1, var2 - 1, 1); // L: 93 } - if (var4 == 3) { - this.setFlag(var1, var2, 64); - this.setFlag(var1 - 1, var2 - 1, 4); + if (var4 == 3) { // L: 95 + this.setFlag(var1, var2, 64); // L: 96 + this.setFlag(var1 - 1, var2 - 1, 4); // L: 97 } } - if (var3 == 2) { - if (var4 == 0) { - this.setFlag(var1, var2, 130); - this.setFlag(var1 - 1, var2, 8); - this.setFlag(var1, var2 + 1, 32); + if (var3 == 2) { // L: 100 + if (var4 == 0) { // L: 101 + this.setFlag(var1, var2, 130); // L: 102 + this.setFlag(var1 - 1, var2, 8); // L: 103 + this.setFlag(var1, var2 + 1, 32); // L: 104 } - if (var4 == 1) { - this.setFlag(var1, var2, 10); - this.setFlag(var1, var2 + 1, 32); - this.setFlag(var1 + 1, var2, 128); + if (var4 == 1) { // L: 106 + this.setFlag(var1, var2, 10); // L: 107 + this.setFlag(var1, var2 + 1, 32); // L: 108 + this.setFlag(var1 + 1, var2, 128); // L: 109 } - if (var4 == 2) { - this.setFlag(var1, var2, 40); - this.setFlag(var1 + 1, var2, 128); - this.setFlag(var1, var2 - 1, 2); + if (var4 == 2) { // L: 111 + this.setFlag(var1, var2, 40); // L: 112 + this.setFlag(var1 + 1, var2, 128); // L: 113 + this.setFlag(var1, var2 - 1, 2); // L: 114 } - if (var4 == 3) { - this.setFlag(var1, var2, 160); - this.setFlag(var1, var2 - 1, 2); - this.setFlag(var1 - 1, var2, 8); + if (var4 == 3) { // L: 116 + this.setFlag(var1, var2, 160); // L: 117 + this.setFlag(var1, var2 - 1, 2); // L: 118 + this.setFlag(var1 - 1, var2, 8); // L: 119 } } - if (var5) { - if (var3 == 0) { - if (var4 == 0) { - this.setFlag(var1, var2, 65536); - this.setFlag(var1 - 1, var2, 4096); + if (var5) { // L: 122 + if (var3 == 0) { // L: 123 + if (var4 == 0) { // L: 124 + this.setFlag(var1, var2, 65536); // L: 125 + this.setFlag(var1 - 1, var2, 4096); // L: 126 } - if (var4 == 1) { - this.setFlag(var1, var2, 1024); - this.setFlag(var1, var2 + 1, 16384); + if (var4 == 1) { // L: 128 + this.setFlag(var1, var2, 1024); // L: 129 + this.setFlag(var1, var2 + 1, 16384); // L: 130 } - if (var4 == 2) { - this.setFlag(var1, var2, 4096); - this.setFlag(var1 + 1, var2, 65536); + if (var4 == 2) { // L: 132 + this.setFlag(var1, var2, 4096); // L: 133 + this.setFlag(var1 + 1, var2, 65536); // L: 134 } - if (var4 == 3) { - this.setFlag(var1, var2, 16384); - this.setFlag(var1, var2 - 1, 1024); + if (var4 == 3) { // L: 136 + this.setFlag(var1, var2, 16384); // L: 137 + this.setFlag(var1, var2 - 1, 1024); // L: 138 } } - if (var3 == 1 || var3 == 3) { - if (var4 == 0) { - this.setFlag(var1, var2, 512); - this.setFlag(var1 - 1, var2 + 1, 8192); + if (var3 == 1 || var3 == 3) { // L: 141 + if (var4 == 0) { // L: 142 + this.setFlag(var1, var2, 512); // L: 143 + this.setFlag(var1 - 1, var2 + 1, 8192); // L: 144 } - if (var4 == 1) { - this.setFlag(var1, var2, 2048); - this.setFlag(var1 + 1, var2 + 1, 32768); + if (var4 == 1) { // L: 146 + this.setFlag(var1, var2, 2048); // L: 147 + this.setFlag(var1 + 1, var2 + 1, 32768); // L: 148 } - if (var4 == 2) { - this.setFlag(var1, var2, 8192); - this.setFlag(var1 + 1, var2 - 1, 512); + if (var4 == 2) { // L: 150 + this.setFlag(var1, var2, 8192); // L: 151 + this.setFlag(var1 + 1, var2 - 1, 512); // L: 152 } - if (var4 == 3) { - this.setFlag(var1, var2, 32768); - this.setFlag(var1 - 1, var2 - 1, 2048); + if (var4 == 3) { // L: 154 + this.setFlag(var1, var2, 32768); // L: 155 + this.setFlag(var1 - 1, var2 - 1, 2048); // L: 156 } } - if (var3 == 2) { - if (var4 == 0) { - this.setFlag(var1, var2, 66560); - this.setFlag(var1 - 1, var2, 4096); - this.setFlag(var1, var2 + 1, 16384); + if (var3 == 2) { // L: 159 + if (var4 == 0) { // L: 160 + this.setFlag(var1, var2, 66560); // L: 161 + this.setFlag(var1 - 1, var2, 4096); // L: 162 + this.setFlag(var1, var2 + 1, 16384); // L: 163 } - if (var4 == 1) { - this.setFlag(var1, var2, 5120); - this.setFlag(var1, var2 + 1, 16384); - this.setFlag(var1 + 1, var2, 65536); + if (var4 == 1) { // L: 165 + this.setFlag(var1, var2, 5120); // L: 166 + this.setFlag(var1, var2 + 1, 16384); // L: 167 + this.setFlag(var1 + 1, var2, 65536); // L: 168 } - if (var4 == 2) { - this.setFlag(var1, var2, 20480); - this.setFlag(var1 + 1, var2, 65536); - this.setFlag(var1, var2 - 1, 1024); + if (var4 == 2) { // L: 170 + this.setFlag(var1, var2, 20480); // L: 171 + this.setFlag(var1 + 1, var2, 65536); // L: 172 + this.setFlag(var1, var2 - 1, 1024); // L: 173 } - if (var4 == 3) { - this.setFlag(var1, var2, 81920); - this.setFlag(var1, var2 - 1, 1024); - this.setFlag(var1 - 1, var2, 4096); + if (var4 == 3) { // L: 175 + this.setFlag(var1, var2, 81920); // L: 176 + this.setFlag(var1, var2 - 1, 1024); // L: 177 + this.setFlag(var1 - 1, var2, 4096); // L: 178 } } } - } + } // L: 182 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "-2000199056" + garbageValue = "-1934730516" ) @Export("addGameObject") public void addGameObject(int var1, int var2, int var3, int var4, boolean var5) { - int var6 = 256; - if (var5) { + int var6 = 256; // L: 185 + if (var5) { // L: 186 var6 += 131072; } - var1 -= this.xInset; - var2 -= this.yInset; + var1 -= this.xInset; // L: 187 + var2 -= this.yInset; // L: 188 - for (int var7 = var1; var7 < var3 + var1; ++var7) { - if (var7 >= 0 && var7 < this.xSize) { - for (int var8 = var2; var8 < var2 + var4; ++var8) { - if (var8 >= 0 && var8 < this.ySize) { + for (int var7 = var1; var7 < var3 + var1; ++var7) { // L: 189 + if (var7 >= 0 && var7 < this.xSize) { // L: 190 + for (int var8 = var2; var8 < var2 + var4; ++var8) { // L: 191 + if (var8 >= 0 && var8 < this.ySize) { // L: 192 this.setFlag(var7, var8, var6); } } } } - } + } // L: 196 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "14" + descriptor = "(III)V", + garbageValue = "1924690823" ) @Export("setBlockedByFloor") public void setBlockedByFloor(int var1, int var2) { - var1 -= this.xInset; - var2 -= this.yInset; - int[] var10000 = this.flags[var1]; + var1 -= this.xInset; // L: 199 + var2 -= this.yInset; // L: 200 + int[] var10000 = this.flags[var1]; // L: 201 var10000[var2] |= 2097152; - } + } // L: 202 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "1576549082" + garbageValue = "1474053794" ) @Export("setBlockedByFloorDec") public void setBlockedByFloorDec(int var1, int var2) { - var1 -= this.xInset; - var2 -= this.yInset; - int[] var10000 = this.flags[var1]; + var1 -= this.xInset; // L: 205 + var2 -= this.yInset; // L: 206 + int[] var10000 = this.flags[var1]; // L: 207 var10000[var2] |= 262144; - } + } // L: 208 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "-1405991942" + descriptor = "(IIIB)V", + garbageValue = "88" ) @Export("setFlag") void setFlag(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; + int[] var10000 = this.flags[var1]; // L: 211 var10000[var2] |= var3; - } + } // L: 212 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(IIIIZI)V", - garbageValue = "2079202664" + garbageValue = "1610140342" ) - public void method3702(int var1, int var2, int var3, int var4, boolean var5) { - var1 -= this.xInset; - var2 -= this.yInset; - if (var3 == 0) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 128); - this.setFlagOff(var1 - 1, var2, 8); + public void method3635(int var1, int var2, int var3, int var4, boolean var5) { + var1 -= this.xInset; // L: 215 + var2 -= this.yInset; // L: 216 + if (var3 == 0) { // L: 217 + if (var4 == 0) { // L: 218 + this.setFlagOff(var1, var2, 128); // L: 219 + this.setFlagOff(var1 - 1, var2, 8); // L: 220 } - if (var4 == 1) { - this.setFlagOff(var1, var2, 2); - this.setFlagOff(var1, var2 + 1, 32); + if (var4 == 1) { // L: 222 + this.setFlagOff(var1, var2, 2); // L: 223 + this.setFlagOff(var1, var2 + 1, 32); // L: 224 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 8); - this.setFlagOff(var1 + 1, var2, 128); + if (var4 == 2) { // L: 226 + this.setFlagOff(var1, var2, 8); // L: 227 + this.setFlagOff(var1 + 1, var2, 128); // L: 228 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 32); - this.setFlagOff(var1, var2 - 1, 2); + if (var4 == 3) { // L: 230 + this.setFlagOff(var1, var2, 32); // L: 231 + this.setFlagOff(var1, var2 - 1, 2); // L: 232 } } - if (var3 == 1 || var3 == 3) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 1); - this.setFlagOff(var1 - 1, var2 + 1, 16); + if (var3 == 1 || var3 == 3) { // L: 235 + if (var4 == 0) { // L: 236 + this.setFlagOff(var1, var2, 1); // L: 237 + this.setFlagOff(var1 - 1, var2 + 1, 16); // L: 238 } - if (var4 == 1) { - this.setFlagOff(var1, var2, 4); - this.setFlagOff(var1 + 1, var2 + 1, 64); + if (var4 == 1) { // L: 240 + this.setFlagOff(var1, var2, 4); // L: 241 + this.setFlagOff(var1 + 1, var2 + 1, 64); // L: 242 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 16); - this.setFlagOff(var1 + 1, var2 - 1, 1); + if (var4 == 2) { // L: 244 + this.setFlagOff(var1, var2, 16); // L: 245 + this.setFlagOff(var1 + 1, var2 - 1, 1); // L: 246 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 64); - this.setFlagOff(var1 - 1, var2 - 1, 4); + if (var4 == 3) { // L: 248 + this.setFlagOff(var1, var2, 64); // L: 249 + this.setFlagOff(var1 - 1, var2 - 1, 4); // L: 250 } } - if (var3 == 2) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 130); - this.setFlagOff(var1 - 1, var2, 8); - this.setFlagOff(var1, var2 + 1, 32); + if (var3 == 2) { // L: 253 + if (var4 == 0) { // L: 254 + this.setFlagOff(var1, var2, 130); // L: 255 + this.setFlagOff(var1 - 1, var2, 8); // L: 256 + this.setFlagOff(var1, var2 + 1, 32); // L: 257 } - if (var4 == 1) { - this.setFlagOff(var1, var2, 10); - this.setFlagOff(var1, var2 + 1, 32); - this.setFlagOff(var1 + 1, var2, 128); + if (var4 == 1) { // L: 259 + this.setFlagOff(var1, var2, 10); // L: 260 + this.setFlagOff(var1, var2 + 1, 32); // L: 261 + this.setFlagOff(var1 + 1, var2, 128); // L: 262 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 40); - this.setFlagOff(var1 + 1, var2, 128); - this.setFlagOff(var1, var2 - 1, 2); + if (var4 == 2) { // L: 264 + this.setFlagOff(var1, var2, 40); // L: 265 + this.setFlagOff(var1 + 1, var2, 128); // L: 266 + this.setFlagOff(var1, var2 - 1, 2); // L: 267 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 160); - this.setFlagOff(var1, var2 - 1, 2); - this.setFlagOff(var1 - 1, var2, 8); + if (var4 == 3) { // L: 269 + this.setFlagOff(var1, var2, 160); // L: 270 + this.setFlagOff(var1, var2 - 1, 2); // L: 271 + this.setFlagOff(var1 - 1, var2, 8); // L: 272 } } - if (var5) { - if (var3 == 0) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 65536); - this.setFlagOff(var1 - 1, var2, 4096); + if (var5) { // L: 275 + if (var3 == 0) { // L: 276 + if (var4 == 0) { // L: 277 + this.setFlagOff(var1, var2, 65536); // L: 278 + this.setFlagOff(var1 - 1, var2, 4096); // L: 279 } - if (var4 == 1) { - this.setFlagOff(var1, var2, 1024); - this.setFlagOff(var1, var2 + 1, 16384); + if (var4 == 1) { // L: 281 + this.setFlagOff(var1, var2, 1024); // L: 282 + this.setFlagOff(var1, var2 + 1, 16384); // L: 283 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 4096); - this.setFlagOff(var1 + 1, var2, 65536); + if (var4 == 2) { // L: 285 + this.setFlagOff(var1, var2, 4096); // L: 286 + this.setFlagOff(var1 + 1, var2, 65536); // L: 287 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 16384); - this.setFlagOff(var1, var2 - 1, 1024); + if (var4 == 3) { // L: 289 + this.setFlagOff(var1, var2, 16384); // L: 290 + this.setFlagOff(var1, var2 - 1, 1024); // L: 291 } } - if (var3 == 1 || var3 == 3) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 512); - this.setFlagOff(var1 - 1, var2 + 1, 8192); + if (var3 == 1 || var3 == 3) { // L: 294 + if (var4 == 0) { // L: 295 + this.setFlagOff(var1, var2, 512); // L: 296 + this.setFlagOff(var1 - 1, var2 + 1, 8192); // L: 297 } - if (var4 == 1) { - this.setFlagOff(var1, var2, 2048); - this.setFlagOff(var1 + 1, var2 + 1, 32768); + if (var4 == 1) { // L: 299 + this.setFlagOff(var1, var2, 2048); // L: 300 + this.setFlagOff(var1 + 1, var2 + 1, 32768); // L: 301 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 8192); - this.setFlagOff(var1 + 1, var2 - 1, 512); + if (var4 == 2) { // L: 303 + this.setFlagOff(var1, var2, 8192); // L: 304 + this.setFlagOff(var1 + 1, var2 - 1, 512); // L: 305 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 32768); - this.setFlagOff(var1 - 1, var2 - 1, 2048); + if (var4 == 3) { // L: 307 + this.setFlagOff(var1, var2, 32768); // L: 308 + this.setFlagOff(var1 - 1, var2 - 1, 2048); // L: 309 } } - if (var3 == 2) { - if (var4 == 0) { - this.setFlagOff(var1, var2, 66560); - this.setFlagOff(var1 - 1, var2, 4096); - this.setFlagOff(var1, var2 + 1, 16384); + if (var3 == 2) { // L: 312 + if (var4 == 0) { // L: 313 + this.setFlagOff(var1, var2, 66560); // L: 314 + this.setFlagOff(var1 - 1, var2, 4096); // L: 315 + this.setFlagOff(var1, var2 + 1, 16384); // L: 316 } - if (var4 == 1) { - this.setFlagOff(var1, var2, 5120); - this.setFlagOff(var1, var2 + 1, 16384); - this.setFlagOff(var1 + 1, var2, 65536); + if (var4 == 1) { // L: 318 + this.setFlagOff(var1, var2, 5120); // L: 319 + this.setFlagOff(var1, var2 + 1, 16384); // L: 320 + this.setFlagOff(var1 + 1, var2, 65536); // L: 321 } - if (var4 == 2) { - this.setFlagOff(var1, var2, 20480); - this.setFlagOff(var1 + 1, var2, 65536); - this.setFlagOff(var1, var2 - 1, 1024); + if (var4 == 2) { // L: 323 + this.setFlagOff(var1, var2, 20480); // L: 324 + this.setFlagOff(var1 + 1, var2, 65536); // L: 325 + this.setFlagOff(var1, var2 - 1, 1024); // L: 326 } - if (var4 == 3) { - this.setFlagOff(var1, var2, 81920); - this.setFlagOff(var1, var2 - 1, 1024); - this.setFlagOff(var1 - 1, var2, 4096); + if (var4 == 3) { // L: 328 + this.setFlagOff(var1, var2, 81920); // L: 329 + this.setFlagOff(var1, var2 - 1, 1024); // L: 330 + this.setFlagOff(var1 - 1, var2, 4096); // L: 331 } } } - } + } // L: 335 - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIIIZB)V", - garbageValue = "-35" + descriptor = "(IIIIIZI)V", + garbageValue = "65280" ) @Export("setFlagOffNonSquare") public void setFlagOffNonSquare(int var1, int var2, int var3, int var4, int var5, boolean var6) { - int var7 = 256; - if (var6) { + int var7 = 256; // L: 338 + if (var6) { // L: 339 var7 += 131072; } - var1 -= this.xInset; - var2 -= this.yInset; + var1 -= this.xInset; // L: 340 + var2 -= this.yInset; // L: 341 int var8; - if (var5 == 1 || var5 == 3) { - var8 = var3; - var3 = var4; - var4 = var8; + if (var5 == 1 || var5 == 3) { // L: 342 + var8 = var3; // L: 343 + var3 = var4; // L: 344 + var4 = var8; // L: 345 } - for (var8 = var1; var8 < var3 + var1; ++var8) { - if (var8 >= 0 && var8 < this.xSize) { - for (int var9 = var2; var9 < var2 + var4; ++var9) { + for (var8 = var1; var8 < var3 + var1; ++var8) { // L: 347 + if (var8 >= 0 && var8 < this.xSize) { // L: 348 + for (int var9 = var2; var9 < var2 + var4; ++var9) { // L: 349 if (var9 >= 0 && var9 < this.ySize) { - this.setFlagOff(var8, var9, var7); + this.setFlagOff(var8, var9, var7); // L: 350 } } } } - } + } // L: 354 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-299380257" + garbageValue = "-1445892610" ) @Export("setFlagOff") void setFlagOff(int var1, int var2, int var3) { - int[] var10000 = this.flags[var1]; + int[] var10000 = this.flags[var1]; // L: 357 var10000[var2] &= ~var3; - } + } // L: 358 - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "1" + descriptor = "(III)V", + garbageValue = "794579216" ) - public void method3689(int var1, int var2) { - var1 -= this.xInset; - var2 -= this.yInset; - int[] var10000 = this.flags[var1]; + public void method3638(int var1, int var2) { + var1 -= this.xInset; // L: 361 + var2 -= this.yInset; // L: 362 + int[] var10000 = this.flags[var1]; // L: 363 var10000[var2] &= -262145; - } + } // L: 364 - @ObfuscatedName("fd") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1042513280" + garbageValue = "-1810709507" ) - static final void method3707() { - if (Client.logoutTimer > 0) { - MouseRecorder.logOut(); - } else { - Client.timer.method5161(); - ClientPreferences.updateGameState(40); - class8.field35 = Client.packetWriter.getSocket(); - Client.packetWriter.removeSocket(); + public static void method3653() { + ParamDefinition.ParamDefinition_cached.clear(); // L: 68 + } // L: 69 + + @ObfuscatedName("ez") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1831550493" + ) + @Export("updateGameState") + static void updateGameState(int var0) { + if (var0 != Client.gameState) { // L: 1279 + if (Client.gameState == 0) { // L: 1280 + class2.client.method1002(); + } + + if (var0 == 20 || var0 == 40 || var0 == 45) { // L: 1281 + Client.loginState = 0; // L: 1282 + Client.field822 = 0; // L: 1283 + Client.field708 = 0; // L: 1284 + Client.timer.method5110(var0); // L: 1285 + if (var0 != 20) { // L: 1286 + class22.method245(false); + } + } + + if (var0 != 20 && var0 != 40 && MouseHandler.field508 != null) { // L: 1288 1289 + MouseHandler.field508.close(); // L: 1290 + MouseHandler.field508 = null; // L: 1291 + } + + if (Client.gameState == 25) { // L: 1294 + Client.field732 = 0; // L: 1295 + Client.field728 = 0; // L: 1296 + Client.field711 = 1; // L: 1297 + Client.field895 = 0; // L: 1298 + Client.field791 = 1; // L: 1299 + } + + if (var0 != 5 && var0 != 10) { // L: 1301 + if (var0 == 20) { // L: 1304 + UserComparator1.method6041(Occluder.archive10, Huffman.archive8, true, Client.gameState == 11 ? 4 : 0); // L: 1305 + } else if (var0 == 11) { // L: 1307 + UserComparator1.method6041(Occluder.archive10, Huffman.archive8, false, 4); // L: 1308 + } else { + Strings.method4202(); // L: 1310 + } + } else { + UserComparator1.method6041(Occluder.archive10, Huffman.archive8, true, 0); // L: 1302 + } + + Client.gameState = var0; // L: 1311 } + } // L: 1312 + + @ObfuscatedName("fi") + @ObfuscatedSignature( + descriptor = "(Lcg;II)V", + garbageValue = "1018652463" + ) + @Export("updateActorSequence") + static final void updateActorSequence(Actor var0, int var1) { + SequenceDefinition var2; + int var3; + int var4; + int var11; + if (var0.field1026 >= Client.cycle) { // L: 3570 + Coord.method4084(var0); + } else { + int var5; + int var7; + if (var0.field1019 >= Client.cycle) { // L: 3571 + if (var0.field1019 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapRegion.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3572 + var11 = var0.field1019 - var0.field1026; // L: 3573 + var3 = Client.cycle - var0.field1026; // L: 3574 + var4 = var0.field1014 * 64 + var0.field997 * 128; // L: 3575 + var5 = var0.field1014 * 64 + var0.field1016 * 128; // L: 3576 + int var6 = var0.field1014 * 64 + var0.field1015 * 128; // L: 3577 + var7 = var0.field1014 * 64 + var0.field1017 * 128; // L: 3578 + var0.x = (var3 * var6 + var4 * (var11 - var3)) / var11; // L: 3579 + var0.y = (var3 * var7 + var5 * (var11 - var3)) / var11; // L: 3580 + } + + var0.field1032 = 0; // L: 3582 + var0.orientation = var0.field1027; // L: 3583 + var0.rotation = var0.orientation; // L: 3584 + } else { + var0.movementSequence = var0.idleSequence; // L: 3587 + if (var0.pathLength == 0) { // L: 3588 + var0.field1032 = 0; // L: 3589 + } else { + label540: { + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3592 + var2 = WorldMapRegion.SequenceDefinition_get(var0.sequence); // L: 3593 + if (var0.field973 > 0 && var2.field3549 == 0) { // L: 3594 + ++var0.field1032; // L: 3595 + break label540; // L: 3596 + } + + if (var0.field973 <= 0 && var2.field3541 == 0) { // L: 3598 + ++var0.field1032; // L: 3599 + break label540; // L: 3600 + } + } + + var11 = var0.x; // L: 3603 + var3 = var0.y; // L: 3604 + var4 = var0.field1014 * 64 + var0.pathX[var0.pathLength - 1] * 128; // L: 3605 + var5 = var0.field1014 * 64 + var0.pathY[var0.pathLength - 1] * 128; // L: 3606 + if (var11 < var4) { // L: 3607 + if (var3 < var5) { // L: 3608 + var0.orientation = 1280; + } else if (var3 > var5) { // L: 3609 + var0.orientation = 1792; + } else { + var0.orientation = 1536; // L: 3610 + } + } else if (var11 > var4) { // L: 3612 + if (var3 < var5) { // L: 3613 + var0.orientation = 768; + } else if (var3 > var5) { // L: 3614 + var0.orientation = 256; + } else { + var0.orientation = 512; // L: 3615 + } + } else if (var3 < var5) { // L: 3617 + var0.orientation = 1024; + } else if (var3 > var5) { // L: 3618 + var0.orientation = 0; + } + + byte var15 = var0.pathTraversed[var0.pathLength - 1]; // L: 3619 + if (var4 - var11 <= 256 && var4 - var11 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { // L: 3620 + var7 = var0.orientation - var0.rotation & 2047; // L: 3627 + if (var7 > 1024) { // L: 3628 + var7 -= 2048; + } + + int var8 = var0.walkBackSequence; // L: 3629 + if (var7 >= -256 && var7 <= 256) { // L: 3630 + var8 = var0.walkSequence; + } else if (var7 >= 256 && var7 < 768) { // L: 3631 + var8 = var0.walkRightSequence; + } else if (var7 >= -768 && var7 <= -256) { // L: 3632 + var8 = var0.walkLeftSequence; + } + + if (var8 == -1) { // L: 3633 + var8 = var0.walkSequence; + } + + var0.movementSequence = var8; // L: 3634 + int var9 = 4; // L: 3635 + boolean var10 = true; // L: 3636 + if (var0 instanceof NPC) { // L: 3637 + var10 = ((NPC)var0).definition.isClickable; + } + + if (var10) { // L: 3638 + if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1025 != 0) { // L: 3639 + var9 = 2; + } + + if (var0.pathLength > 2) { // L: 3640 + var9 = 6; + } + + if (var0.pathLength > 3) { // L: 3641 + var9 = 8; + } + + if (var0.field1032 > 0 && var0.pathLength > 1) { // L: 3642 + var9 = 8; // L: 3643 + --var0.field1032; // L: 3644 + } + } else { + if (var0.pathLength > 1) { // L: 3648 + var9 = 6; + } + + if (var0.pathLength > 2) { // L: 3649 + var9 = 8; + } + + if (var0.field1032 > 0 && var0.pathLength > 1) { // L: 3650 + var9 = 8; // L: 3651 + --var0.field1032; // L: 3652 + } + } + + if (var15 == 2) { // L: 3655 + var9 <<= 1; + } + + if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) { // L: 3656 + var0.movementSequence = var0.runSequence; + } + + if (var4 != var11 || var5 != var3) { // L: 3657 + if (var11 < var4) { // L: 3658 + var0.x += var9; // L: 3659 + if (var0.x > var4) { // L: 3660 + var0.x = var4; + } + } else if (var11 > var4) { // L: 3662 + var0.x -= var9; // L: 3663 + if (var0.x < var4) { // L: 3664 + var0.x = var4; + } + } + + if (var3 < var5) { // L: 3666 + var0.y += var9; // L: 3667 + if (var0.y > var5) { // L: 3668 + var0.y = var5; + } + } else if (var3 > var5) { // L: 3670 + var0.y -= var9; // L: 3671 + if (var0.y < var5) { // L: 3672 + var0.y = var5; + } + } + } + + if (var4 == var0.x && var5 == var0.y) { // L: 3675 + --var0.pathLength; // L: 3676 + if (var0.field973 > 0) { // L: 3677 + --var0.field973; + } + } + } else { + var0.x = var4; // L: 3621 + var0.y = var5; // L: 3622 + --var0.pathLength; // L: 3623 + if (var0.field973 > 0) { // L: 3624 + --var0.field973; + } + } + } + } + } + } + + if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { // L: 3680 + var0.sequence = -1; // L: 3681 + var0.spotAnimation = -1; // L: 3682 + var0.field1026 = 0; // L: 3683 + var0.field1019 = 0; // L: 3684 + var0.x = var0.pathX[0] * 128 + var0.field1014 * 64; // L: 3685 + var0.y = var0.field1014 * 64 + var0.pathY[0] * 128; // L: 3686 + var0.method1797(); // L: 3687 + } + + if (WorldMapLabelSize.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { // L: 3689 3690 + var0.sequence = -1; // L: 3691 + var0.spotAnimation = -1; // L: 3692 + var0.field1026 = 0; // L: 3693 + var0.field1019 = 0; // L: 3694 + var0.x = var0.pathX[0] * 128 + var0.field1014 * 64; // L: 3695 + var0.y = var0.field1014 * 64 + var0.pathY[0] * 128; // L: 3696 + var0.method1797(); // L: 3697 + } + + if (var0.field1025 != 0) { // L: 3701 + if (var0.targetIndex != -1) { // L: 3702 + Object var13 = null; // L: 3703 + if (var0.targetIndex < 32768) { // L: 3704 + var13 = Client.npcs[var0.targetIndex]; + } else if (var0.targetIndex >= 32768) { // L: 3705 + var13 = Client.players[var0.targetIndex - 32768]; + } + + if (var13 != null) { // L: 3706 + var3 = var0.x - ((Actor)var13).x; // L: 3707 + var4 = var0.y - ((Actor)var13).y; // L: 3708 + if (var3 != 0 || var4 != 0) { // L: 3709 + var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; + } + } else if (var0.false0) { // L: 3711 + var0.targetIndex = -1; // L: 3712 + var0.false0 = false; // L: 3713 + } + } + + if (var0.field1000 != -1 && (var0.pathLength == 0 || var0.field1032 > 0)) { // L: 3716 + var0.orientation = var0.field1000; // L: 3717 + var0.field1000 = -1; // L: 3718 + } + + var11 = var0.orientation - var0.rotation & 2047; // L: 3720 + if (var11 == 0 && var0.false0) { // L: 3721 + var0.targetIndex = -1; // L: 3722 + var0.false0 = false; // L: 3723 + } + + if (var11 != 0) { // L: 3725 + ++var0.field1024; // L: 3726 + boolean var14; + if (var11 > 1024) { // L: 3727 + var0.rotation -= var0.field1025; // L: 3728 + var14 = true; // L: 3729 + if (var11 < var0.field1025 || var11 > 2048 - var0.field1025) { // L: 3730 + var0.rotation = var0.orientation; // L: 3731 + var14 = false; // L: 3732 + } + + if (var0.movementSequence == var0.idleSequence && (var0.field1024 > 25 || var14)) { // L: 3734 + if (var0.turnLeftSequence != -1) { + var0.movementSequence = var0.turnLeftSequence; // L: 3735 + } else { + var0.movementSequence = var0.walkSequence; // L: 3736 + } + } + } else { + var0.rotation += var0.field1025; // L: 3740 + var14 = true; // L: 3741 + if (var11 < var0.field1025 || var11 > 2048 - var0.field1025) { // L: 3742 + var0.rotation = var0.orientation; // L: 3743 + var14 = false; // L: 3744 + } + + if (var0.idleSequence == var0.movementSequence && (var0.field1024 > 25 || var14)) { // L: 3746 + if (var0.turnRightSequence != -1) { // L: 3747 + var0.movementSequence = var0.turnRightSequence; + } else { + var0.movementSequence = var0.walkSequence; // L: 3748 + } + } + } + + var0.rotation &= 2047; // L: 3752 + } else { + var0.field1024 = 0; // L: 3754 + } + } + + var0.isWalking = false; // L: 3757 + if (var0.movementSequence != -1) { // L: 3758 + var2 = WorldMapRegion.SequenceDefinition_get(var0.movementSequence); // L: 3759 + if (var2 != null && var2.frameIds != null) { // L: 3760 + ++var0.movementFrameCycle; // L: 3761 + if (var0.movementFrame < var2.frameIds.length && var0.movementFrameCycle > var2.frameLengths[var0.movementFrame]) { // L: 3762 + var0.movementFrameCycle = 1; // L: 3763 + ++var0.movementFrame; // L: 3764 + GrandExchangeEvent.addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); // L: 3765 + } + + if (var0.movementFrame >= var2.frameIds.length) { // L: 3767 + var0.movementFrameCycle = 0; // L: 3768 + var0.movementFrame = 0; // L: 3769 + GrandExchangeEvent.addSequenceSoundEffect(var2, var0.movementFrame, var0.x, var0.y); // L: 3770 + } + } else { + var0.movementSequence = -1; // L: 3773 + } + } + + if (var0.spotAnimation != -1 && Client.cycle >= var0.field1013) { // L: 3775 + if (var0.spotAnimationFrame < 0) { // L: 3776 + var0.spotAnimationFrame = 0; + } + + var11 = Tiles.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 3777 + if (var11 != -1) { // L: 3778 + SequenceDefinition var12 = WorldMapRegion.SequenceDefinition_get(var11); // L: 3779 + if (var12 != null && var12.frameIds != null) { // L: 3780 + ++var0.spotAnimationFrameCycle; // L: 3781 + if (var0.spotAnimationFrame < var12.frameIds.length && var0.spotAnimationFrameCycle > var12.frameLengths[var0.spotAnimationFrame]) { // L: 3782 + var0.spotAnimationFrameCycle = 1; // L: 3783 + ++var0.spotAnimationFrame; // L: 3784 + GrandExchangeEvent.addSequenceSoundEffect(var12, var0.spotAnimationFrame, var0.x, var0.y); // L: 3785 + } + + if (var0.spotAnimationFrame >= var12.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var12.frameIds.length)) { // L: 3787 3788 + var0.spotAnimation = -1; + } + } else { + var0.spotAnimation = -1; // L: 3791 + } + } else { + var0.spotAnimation = -1; // L: 3793 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 3795 + var2 = WorldMapRegion.SequenceDefinition_get(var0.sequence); // L: 3796 + if (var2.field3549 == 1 && var0.field973 > 0 && var0.field1026 <= Client.cycle && var0.field1019 < Client.cycle) { // L: 3797 3798 + var0.sequenceDelay = 1; // L: 3799 + return; // L: 3826 + } + } + + if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3804 + var2 = WorldMapRegion.SequenceDefinition_get(var0.sequence); // L: 3805 + if (var2 != null && var2.frameIds != null) { // L: 3806 + ++var0.sequenceFrameCycle; // L: 3807 + if (var0.sequenceFrame < var2.frameIds.length && var0.sequenceFrameCycle > var2.frameLengths[var0.sequenceFrame]) { // L: 3808 + var0.sequenceFrameCycle = 1; // L: 3809 + ++var0.sequenceFrame; // L: 3810 + GrandExchangeEvent.addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); // L: 3811 + } + + if (var0.sequenceFrame >= var2.frameIds.length) { // L: 3813 + var0.sequenceFrame -= var2.frameCount; // L: 3814 + ++var0.field1009; // L: 3815 + if (var0.field1009 >= var2.field3548) { // L: 3816 + var0.sequence = -1; + } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var2.frameIds.length) { // L: 3817 + GrandExchangeEvent.addSequenceSoundEffect(var2, var0.sequenceFrame, var0.x, var0.y); // L: 3818 + } else { + var0.sequence = -1; + } + } + + var0.isWalking = var2.field3544; // L: 3820 + } else { + var0.sequence = -1; // L: 3822 + } + } + + if (var0.sequenceDelay > 0) { // L: 3824 + --var0.sequenceDelay; + } + } + + @ObfuscatedName("gj") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-1510761090" + ) + @Export("addNpcsToScene") + static final void addNpcsToScene(boolean var0) { + for (int var1 = 0; var1 < Client.npcCount; ++var1) { // L: 4289 + NPC var2 = Client.npcs[Client.npcIndices[var1]]; // L: 4290 + if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { // L: 4291 + int var3 = var2.x >> 7; // L: 4292 + int var4 = var2.y >> 7; // L: 4293 + if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { // L: 4294 + if (var2.field1014 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { // L: 4295 + if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { // L: 4296 + continue; + } + + Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; // L: 4297 + } + + long var5 = class227.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); // L: 4299 + var2.playerCycle = Client.cycle; // L: 4300 + ScriptEvent.scene.drawEntity(Huffman.Client_plane, var2.x, var2.y, ArchiveLoader.getTileHeight(var2.field1014 * 64 - 64 + var2.x, var2.field1014 * 64 - 64 + var2.y, Huffman.Client_plane), var2.field1014 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); // L: 4301 + } + } + } + + } // L: 4305 } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index 7b40242508..7ecf9b15c7 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -7,21 +7,21 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("hg") @Implements("Coord") public class Coord { - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1064559233 + intValue = -877871317 ) @Export("plane") public int plane; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 381144149 + intValue = 1594066417 ) @Export("x") public int x; - @ObfuscatedName("q") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -63925861 + intValue = -1889586591 ) @Export("y") public int y; @@ -30,155 +30,155 @@ public class Coord { descriptor = "(Lhg;)V" ) public Coord(Coord var1) { - this.plane = var1.plane; - this.x = var1.x; - this.y = var1.y; - } + this.plane = var1.plane; // L: 15 + this.x = var1.x; // L: 16 + this.y = var1.y; // L: 17 + } // L: 18 public Coord(int var1, int var2, int var3) { - this.plane = var1; - this.x = var2; - this.y = var3; - } + this.plane = var1; // L: 9 + this.x = var2; // L: 10 + this.y = var3; // L: 11 + } // L: 12 public Coord(int var1) { - if (var1 == -1) { + if (var1 == -1) { // L: 21 this.plane = -1; } else { - this.plane = var1 >> 28 & 3; - this.x = var1 >> 14 & 16383; - this.y = var1 & 16383; + this.plane = var1 >> 28 & 3; // L: 23 + this.x = var1 >> 14 & 16383; // L: 24 + this.y = var1 & 16383; // L: 25 } - } + } // L: 27 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(B)I", - garbageValue = "57" + garbageValue = "-78" ) @Export("packed") public int packed() { - return this.plane << 28 | this.x << 14 | this.y; + return this.plane << 28 | this.x << 14 | this.y; // L: 30 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(Lhg;I)Z", - garbageValue = "1413568323" + garbageValue = "24386397" ) @Export("equalsCoord") boolean equalsCoord(Coord var1) { - if (this.plane != var1.plane) { + if (this.plane != var1.plane) { // L: 40 return false; - } else if (this.x != var1.x) { + } else if (this.x != var1.x) { // L: 41 return false; } else { - return this.y == var1.y; + return this.y == var1.y; // L: 42 } } + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "0" + ) + @Export("toString") + String toString(String var1) { + return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); // L: 55 + } + + public boolean equals(Object var1) { + if (this == var1) { // L: 34 + return true; + } else { + return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); // L: 35 36 + } + } + + public int hashCode() { + return this.packed(); // L: 47 + } + + public String toString() { + return this.toString(","); // L: 51 + } + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)Ljava/lang/String;", - garbageValue = "-17265" + descriptor = "(IIB)I", + garbageValue = "-34" ) - @Export("toString") - String toString(String var1) { - return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63); - } + static final int method4083(int var0, int var1) { + if (var0 == -2) { // L: 871 + return 12345678; + } else if (var0 == -1) { // L: 872 + if (var1 < 2) { // L: 873 + var1 = 2; + } else if (var1 > 126) { // L: 874 + var1 = 126; + } - public int hashCode() { - return this.packed(); - } - - public String toString() { - return this.toString(","); - } - - public boolean equals(Object var1) { - if (this == var1) { - return true; + return var1; // L: 875 } else { - return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); + var1 = (var0 & 127) * var1 / 128; // L: 877 + if (var1 < 2) { // L: 878 + var1 = 2; + } else if (var1 > 126) { // L: 879 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 880 } } - @ObfuscatedName("am") + @ObfuscatedName("fy") @ObfuscatedSignature( - descriptor = "([BB)[B", - garbageValue = "113" + descriptor = "(Lcg;B)V", + garbageValue = "115" ) - @Export("decompressBytes") - static final byte[] decompressBytes(byte[] var0) { - Buffer var1 = new Buffer(var0); - int var2 = var1.readUnsignedByte(); - int var3 = var1.readInt(); - if (var3 < 0 || AbstractArchive.field3177 != 0 && var3 > AbstractArchive.field3177) { - throw new RuntimeException(); - } else if (var2 == 0) { - byte[] var4 = new byte[var3]; - var1.readBytes(var4, 0, var3); - return var4; - } else { - int var6 = var1.readInt(); - if (var6 >= 0 && (AbstractArchive.field3177 == 0 || var6 <= AbstractArchive.field3177)) { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } + static final void method4084(Actor var0) { + int var1 = Math.max(1, var0.field1026 - Client.cycle); // L: 3829 + int var2 = var0.field1014 * 64 + var0.field997 * 128; // L: 3830 + int var3 = var0.field1014 * 64 + var0.field1016 * 128; // L: 3831 + var0.x += (var2 - var0.x) / var1; // L: 3832 + var0.y += (var3 - var0.y) / var1; // L: 3833 + var0.field1032 = 0; // L: 3834 + var0.orientation = var0.field1027; // L: 3835 + } // L: 3836 - return var5; - } else { - throw new RuntimeException(); - } - } - } - - @ObfuscatedName("iy") + @ObfuscatedName("gz") @ObfuscatedSignature( - descriptor = "(Lhd;IIIIIIB)V", - garbageValue = "-69" + descriptor = "(Lcg;IB)V", + garbageValue = "-77" ) - static final void method4135(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (Client.field740) { - Client.alternativeScrollbarWidth = 32; + static final void method4086(Actor var0, int var1) { + class89.worldToScreen(var0.x, var0.y, var1); // L: 4941 + } // L: 4942 + + @ObfuscatedName("jz") + @ObfuscatedSignature( + descriptor = "(IIIILlp;Lhz;I)V", + garbageValue = "-334370993" + ) + @Export("worldToMinimap") + static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { + int var6 = var3 * var3 + var2 * var2; // L: 10644 + if (var6 > 4225 && var6 < 90000) { // L: 10645 + int var7 = Client.camAngleY & 2047; // L: 10646 + int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 10647 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 10648 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 10649 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 10650 + double var12 = Math.atan2((double)var10, (double)var11); // L: 10651 + int var14 = var5.width / 2 - 25; // L: 10652 + int var15 = (int)(Math.sin(var12) * (double)var14); // L: 10653 + int var16 = (int)(Math.cos(var12) * (double)var14); // L: 10654 + byte var17 = 20; // L: 10655 + FontName.redHintArrowSprite.method6264(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); // L: 10656 } else { - Client.alternativeScrollbarWidth = 0; + HealthBar.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); // L: 10658 } - Client.field740 = false; - int var7; - if (MouseHandler.MouseHandler_currentButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { - if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { - var0.scrollY -= 4; - class234.invalidateWidget(var0); - } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { - var0.scrollY += 4; - class234.invalidateWidget(var0); - } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { - var7 = var3 * (var3 - 32) / var4; - if (var7 < 8) { - var7 = 8; - } - - int var8 = var6 - var2 - 16 - var7 / 2; - int var9 = var3 - 32 - var7; - var0.scrollY = var8 * (var4 - var3) / var9; - class234.invalidateWidget(var0); - Client.field740 = true; - } - } - - if (Client.mouseWheelRotation != 0) { - var7 = var0.width; - if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { - var0.scrollY += Client.mouseWheelRotation * 45; - class234.invalidateWidget(var0); - } - } - - } + } // L: 10659 } diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 281dd5956f..a7e857611c 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -1,75 +1,92 @@ +import java.io.BufferedReader; +import java.io.DataInputStream; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dv") +@ObfuscatedName("df") @Implements("Decimator") public class Decimator { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "[Llh;" - ) - @Export("title_muteSprite") - static IndexedSprite[] title_muteSprite; - @ObfuscatedName("j") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 566194753 + intValue = -1258605941 + ) + static int field1491; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1300343433 ) @Export("inputRate") int inputRate; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -690101149 + intValue = 1507874041 ) @Export("outputRate") int outputRate; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("table") int[][] table; public Decimator(int var1, int var2) { - if (var2 != var1) { - int var3 = class204.method3818(var1, var2); - var1 /= var3; - var2 /= var3; + if (var2 != var1) { // L: 14 + int var4 = var1; // L: 16 + int var5 = var2; // L: 17 + if (var2 > var1) { // L: 19 + var4 = var2; // L: 21 + var5 = var1; // L: 22 + } + + while (var5 != 0) { // L: 24 + int var6 = var4 % var5; // L: 25 + var4 = var5; // L: 26 + var5 = var6; // L: 27 + } + + var1 /= var4; // L: 32 + var2 /= var4; this.inputRate = var1; - this.outputRate = var2; + this.outputRate = var2; // L: 35 this.table = new int[var1][14]; - for (int var4 = 0; var4 < var1; ++var4) { - int[] var5 = this.table[var4]; - double var6 = (double)var4 / (double)var1 + 6.0D; - int var8 = (int)Math.floor(1.0D + (var6 - 7.0D)); - if (var8 < 0) { - var8 = 0; + for (int var7 = 0; var7 < var1; ++var7) { // L: 37 + int[] var8 = this.table[var7]; // L: 38 + double var9 = 6.0D + (double)var7 / (double)var1; + int var11 = (int)Math.floor(var9 - 7.0D + 1.0D); + if (var11 < 0) { + var11 = 0; } - int var9 = (int)Math.ceil(var6 + 7.0D); - if (var9 > 14) { - var9 = 14; + int var12 = (int)Math.ceil(7.0D + var9); + if (var12 > 14) { // L: 43 + var12 = 14; } - for (double var10 = (double)var2 / (double)var1; var8 < var9; ++var8) { - double var12 = ((double)var8 - var6) * 3.141592653589793D; - double var14 = var10; - if (var12 < -1.0E-4D || var12 > 1.0E-4D) { - var14 = var10 * (Math.sin(var12) / var12); + for (double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) { + double var15 = ((double)var11 - var9) * 3.141592653589793D; + double var17 = var13; + if (var15 < -1.0E-4D || var15 > 1.0E-4D) { + var17 = var13 * (Math.sin(var15) / var15); } - var14 *= 0.54D + 0.46D * Math.cos(((double)var8 - var6) * 0.2243994752564138D); - var5[var8] = (int)Math.floor(0.5D + var14 * 65536.0D); + var17 *= 0.54D + 0.46D * Math.cos(0.2243994752564138D * ((double)var11 - var9)); + var8[var11] = (int)Math.floor(var17 * 65536.0D + 0.5D); } } } } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "880157357" + descriptor = "([BB)[B", + garbageValue = "-47" ) @Export("resample") byte[] resample(byte[] var1) { @@ -85,23 +102,23 @@ public class Decimator { int[] var8 = this.table[var5]; int var9; - for (var9 = 0; var9 < 14; ++var9) { - var3[var9 + var4] += var8[var9] * var7; + for (var9 = 0; var9 < 14; ++var9) { // L: 64 + var3[var4 + var9] += var7 * var8[var9]; } var5 += this.outputRate; - var9 = var5 / this.inputRate; + var9 = var5 / this.inputRate; // L: 66 var4 += var9; var5 -= var9 * this.inputRate; } var1 = new byte[var2]; - for (var6 = 0; var6 < var2; ++var6) { + for (var6 = 0; var6 < var2; ++var6) { // L: 71 int var10 = var3[var6] + 32768 >> 16; - if (var10 < -128) { + if (var10 < -128) { // L: 73 var1[var6] = -128; - } else if (var10 > 127) { + } else if (var10 > 127) { // L: 74 var1[var6] = 127; } else { var1[var6] = (byte)var10; @@ -112,10 +129,10 @@ public class Decimator { return var1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "124" + garbageValue = "0" ) @Export("scaleRate") int scaleRate(int var1) { @@ -126,10 +143,10 @@ public class Decimator { return var1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "70" + descriptor = "(II)I", + garbageValue = "-1133574944" ) @Export("scalePosition") int scalePosition(int var1) { @@ -139,4 +156,746 @@ public class Decimator { return var1; } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;B)V", + garbageValue = "0" + ) + @Export("RunException_sendStackTrace") + public static void RunException_sendStackTrace(String var0, Throwable var1) { + if (var1 != null) { + var1.printStackTrace(); + } else { + try { + String var2 = ""; // L: 33 + if (var1 != null) { // L: 34 + Throwable var4 = var1; // L: 36 + String var5; + if (var1 instanceof RunException) { // L: 39 + RunException var6 = (RunException)var1; // L: 40 + var5 = var6.message + " | "; // L: 41 + var4 = var6.throwable; // L: 42 + } else { + var5 = ""; // L: 44 + } + + StringWriter var18 = new StringWriter(); // L: 45 + PrintWriter var7 = new PrintWriter(var18); // L: 46 + var4.printStackTrace(var7); // L: 47 + var7.close(); // L: 48 + String var8 = var18.toString(); // L: 49 + BufferedReader var9 = new BufferedReader(new StringReader(var8)); // L: 50 + String var10 = var9.readLine(); // L: 51 + + label61: + while (true) { + while (true) { + String var11 = var9.readLine(); // L: 53 + if (var11 == null) { // L: 54 + var5 = var5 + "| " + var10; // L: 72 + var2 = var5; // L: 75 + break label61; + } + + int var12 = var11.indexOf(40); // L: 55 + int var13 = var11.indexOf(41, var12 + 1); // L: 56 + if (var12 >= 0 && var13 >= 0) { // L: 57 + String var14 = var11.substring(var12 + 1, var13); // L: 58 + int var15 = var14.indexOf(".java:"); // L: 59 + if (var15 >= 0) { // L: 60 + var14 = var14.substring(0, var15) + var14.substring(var15 + 5); // L: 61 + var5 = var5 + var14 + ' '; // L: 62 + continue; // L: 63 + } + + var11 = var11.substring(0, var12); // L: 65 + } + + var11 = var11.trim(); // L: 67 + var11 = var11.substring(var11.lastIndexOf(32) + 1); // L: 68 + var11 = var11.substring(var11.lastIndexOf(9) + 1); // L: 69 + var5 = var5 + var11 + ' '; // L: 70 + } + } + } + + if (var0 != null) { // L: 77 + if (var1 != null) { // L: 78 + var2 = var2 + " | "; + } + + var2 = var2 + var0; // L: 79 + } + + System.out.println("Error: " + var2); // L: 81 + var2 = var2.replace(':', '.'); // L: 82 + var2 = var2.replace('@', '_'); // L: 83 + var2 = var2.replace('&', '_'); // L: 84 + var2 = var2.replace('#', '_'); // L: 85 + if (RunException.RunException_applet == null) { // L: 86 + return; + } + + URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + ObjectDefinition.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + WorldMapID.clientType + "&e=" + var2); // L: 87 + DataInputStream var17 = new DataInputStream(var3.openStream()); // L: 88 + var17.read(); // L: 89 + var17.close(); // L: 90 + } catch (Exception var16) { // L: 92 + } + + } + } // L: 93 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)Lct;", + garbageValue = "-1387826100" + ) + @Export("worldListStart") + static World worldListStart() { + World.World_listCount = 0; // L: 237 + return WorldMapEvent.getNextWorldListWorld(); // L: 238 + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)I", + garbageValue = "-65" + ) + @Export("stringCp1252NullTerminatedByteSize") + public static int stringCp1252NullTerminatedByteSize(String var0) { + return var0.length() + 1; // L: 119 + } + + @ObfuscatedName("ij") + @ObfuscatedSignature( + descriptor = "([Lhq;IIIIIIIII)V", + garbageValue = "1194287146" + ) + @Export("drawInterface") + static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8669 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 8670 + + for (int var9 = 0; var9 < var0.length; ++var9) { // L: 8671 + Widget var10 = var0[var9]; // L: 8672 + if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { // L: 8673 8674 + int var11; + if (var8 == -1) { // L: 8676 + Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; // L: 8677 + Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; // L: 8678 + Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; // L: 8679 + Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; // L: 8680 + var11 = ++Client.rootWidgetCount - 1; // L: 8681 + } else { + var11 = var8; // L: 8683 + } + + var10.rootIndex = var11; // L: 8684 + var10.cycle = Client.cycle; // L: 8685 + if (!var10.isIf3 || !GrandExchangeOfferUnitPriceComparator.isComponentHidden(var10)) { // L: 8686 + if (var10.contentType > 0) { // L: 8687 + Canvas.method903(var10); + } + + int var12 = var10.x + var6; // L: 8688 + int var13 = var7 + var10.y; // L: 8689 + int var14 = var10.transparencyTop; // L: 8690 + int var15; + int var16; + if (var10 == Client.clickedWidget) { // L: 8691 + if (var1 != -1412584499 && !var10.isScrollBar) { // L: 8692 + GrandExchangeOfferNameComparator.field115 = var0; // L: 8693 + Client.field947 = var6; // L: 8694 + class219.field2547 = var7; // L: 8695 + continue; // L: 8696 + } + + if (Client.isDraggingWidget && Client.field799) { // L: 8698 + var15 = MouseHandler.MouseHandler_x; // L: 8699 + var16 = MouseHandler.MouseHandler_y; // L: 8700 + var15 -= Client.widgetClickX; // L: 8701 + var16 -= Client.widgetClickY; // L: 8702 + if (var15 < Client.field856) { // L: 8703 + var15 = Client.field856; + } + + if (var15 + var10.width > Client.field856 + Client.clickedWidgetParent.width) { // L: 8704 + var15 = Client.field856 + Client.clickedWidgetParent.width - var10.width; + } + + if (var16 < Client.field785) { // L: 8705 + var16 = Client.field785; + } + + if (var16 + var10.height > Client.field785 + Client.clickedWidgetParent.height) { // L: 8706 + var16 = Client.field785 + Client.clickedWidgetParent.height - var10.height; + } + + var12 = var15; // L: 8707 + var13 = var16; // L: 8708 + } + + if (!var10.isScrollBar) { // L: 8710 + var14 = 128; + } + } + + int var17; + int var18; + int var19; + int var20; + int var21; + int var22; + if (var10.type == 2) { // L: 8716 + var15 = var2; // L: 8717 + var16 = var3; // L: 8718 + var17 = var4; // L: 8719 + var18 = var5; // L: 8720 + } else if (var10.type == 9) { // L: 8722 + var19 = var12; // L: 8723 + var20 = var13; // L: 8724 + var21 = var12 + var10.width; // L: 8725 + var22 = var13 + var10.height; // L: 8726 + if (var21 < var12) { // L: 8727 + var19 = var21; // L: 8729 + var21 = var12; // L: 8730 + } + + if (var22 < var13) { // L: 8732 + var20 = var22; // L: 8734 + var22 = var13; // L: 8735 + } + + ++var21; // L: 8737 + ++var22; // L: 8738 + var15 = var19 > var2 ? var19 : var2; // L: 8739 + var16 = var20 > var3 ? var20 : var3; // L: 8740 + var17 = var21 < var4 ? var21 : var4; // L: 8741 + var18 = var22 < var5 ? var22 : var5; // L: 8742 + } else { + var19 = var12 + var10.width; // L: 8745 + var20 = var13 + var10.height; // L: 8746 + var15 = var12 > var2 ? var12 : var2; // L: 8747 + var16 = var13 > var3 ? var13 : var3; // L: 8748 + var17 = var19 < var4 ? var19 : var4; // L: 8749 + var18 = var20 < var5 ? var20 : var5; // L: 8750 + } + + if (!var10.isIf3 || var15 < var17 && var16 < var18) { // L: 8752 + if (var10.contentType != 0) { // L: 8753 + if (var10.contentType == 1336) { // L: 8754 + if (Client.displayFps) { // L: 8755 + var13 += 15; // L: 8756 + ItemDefinition.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); // L: 8757 + var13 += 15; // L: 8758 + Runtime var42 = Runtime.getRuntime(); // L: 8759 + var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 8760 + var21 = 16776960; // L: 8761 + if (var20 > 327680 && !Client.isLowDetail) { // L: 8762 + var21 = 16711680; + } + + ItemDefinition.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); // L: 8763 + var13 += 15; // L: 8764 + } + continue; + } + + if (var10.contentType == 1337) { // L: 8768 + Client.viewportX = var12; // L: 8769 + Client.viewportY = var13; // L: 8770 + GrandExchangeOfferOwnWorldComparator.drawEntities(var12, var13, var10.width, var10.height); // L: 8771 + Client.field882[var10.rootIndex] = true; // L: 8772 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8773 + continue; // L: 8774 + } + + if (var10.contentType == 1338) { // L: 8776 + AbstractUserComparator.drawMinimap(var10, var12, var13, var11); // L: 8777 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8778 + continue; // L: 8779 + } + + if (var10.contentType == 1339) { // L: 8781 + class69.drawCompass(var10, var12, var13, var11); // L: 8782 + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8783 + continue; // L: 8784 + } + + if (var10.contentType == 1400) { // L: 8786 + Message.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); // L: 8787 + } + + if (var10.contentType == 1401) { // L: 8789 + Message.worldMap.drawOverview(var12, var13, var10.width, var10.height); // L: 8790 + } + + if (var10.contentType == 1402) { // L: 8792 + Varcs.loginScreenRunesAnimation.draw(var12, Client.cycle); // L: 8793 + } + } + + if (var10.type == 0) { // L: 8796 + if (!var10.isIf3 && GrandExchangeOfferUnitPriceComparator.isComponentHidden(var10) && var10 != TriBool.mousedOverWidgetIf1) { // L: 8797 + continue; + } + + if (!var10.isIf3) { // L: 8798 + if (var10.scrollY > var10.scrollHeight - var10.height) { // L: 8799 + var10.scrollY = var10.scrollHeight - var10.height; + } + + if (var10.scrollY < 0) { // L: 8800 + var10.scrollY = 0; + } + } + + drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); // L: 8802 + if (var10.children != null) { // L: 8803 + drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); + } + + InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); // L: 8804 + if (var30 != null) { // L: 8805 + PlayerAppearance.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); // L: 8806 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8808 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 8809 + } + + if (Client.isResizable || Client.field884[var11] || Client.gameDrawingMode > 1) { // L: 8811 + if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { // L: 8812 8813 + Clock.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); + } + + if (var10.type != 1) { // L: 8815 + int var23; + int var24; + int var25; + int var26; + if (var10.type == 2) { // L: 8818 + var19 = 0; // L: 8819 + + for (var20 = 0; var20 < var10.rawHeight; ++var20) { // L: 8820 + for (var21 = 0; var21 < var10.rawWidth; ++var21) { // L: 8821 + var22 = var12 + var21 * (var10.paddingX + 32); // L: 8822 + var23 = var13 + var20 * (var10.paddingY + 32); // L: 8823 + if (var19 < 20) { // L: 8824 + var22 += var10.inventoryXOffsets[var19]; // L: 8825 + var23 += var10.inventoryYOffsets[var19]; // L: 8826 + } + + if (var10.itemIds[var19] <= 0) { // L: 8828 + if (var10.inventorySprites != null && var19 < 20) { // L: 8873 + Sprite var46 = var10.getInventorySprite(var19); // L: 8874 + if (var46 != null) { // L: 8875 + var46.drawTransBgAt(var22, var23); + } else if (Widget.field2611) { // L: 8876 + class52.invalidateWidget(var10); + } + } + } else { + boolean var37 = false; // L: 8829 + boolean var38 = false; // L: 8830 + var26 = var10.itemIds[var19] - 1; // L: 8831 + if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == BuddyRankComparator.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 8832 + Sprite var35; + if (Client.isItemSelected == 1 && var19 == GrandExchangeOfferUnitPriceComparator.selectedItemSlot && var10.id == class105.selectedItemWidget) { // L: 8834 + var35 = ChatChannel.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); + } else { + var35 = ChatChannel.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); // L: 8835 + } + + if (var35 != null) { // L: 8836 + if (var10 == BuddyRankComparator.dragInventoryWidget && var19 == Client.dragItemSlotSource) { // L: 8837 + var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; // L: 8838 + var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; // L: 8839 + if (var24 < 5 && var24 > -5) { // L: 8840 + var24 = 0; + } + + if (var25 < 5 && var25 > -5) { // L: 8841 + var25 = 0; + } + + if (Client.itemDragDuration < 5) { // L: 8842 + var24 = 0; // L: 8843 + var25 = 0; // L: 8844 + } + + var35.drawTransAt(var22 + var24, var23 + var25, 128); // L: 8846 + if (var1 != -1) { // L: 8847 + Widget var28 = var0[var1 & 65535]; // L: 8848 + int var29; + if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { // L: 8849 + var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field737 / 3; // L: 8850 + if (var29 > Client.field737 * 10) { // L: 8851 + var29 = Client.field737 * 10; + } + + if (var29 > var28.scrollY) { // L: 8852 + var29 = var28.scrollY; + } + + var28.scrollY -= var29; // L: 8853 + Client.draggedWidgetY += var29; // L: 8854 + class52.invalidateWidget(var28); // L: 8855 + } + + if (var23 + var25 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { // L: 8857 + var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field737 / 3; // L: 8858 + if (var29 > Client.field737 * 10) { // L: 8859 + var29 = Client.field737 * 10; + } + + if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { // L: 8860 + var29 = var28.scrollHeight - var28.height - var28.scrollY; + } + + var28.scrollY += var29; // L: 8861 + Client.draggedWidgetY -= var29; // L: 8862 + class52.invalidateWidget(var28); // L: 8863 + } + } + } else if (var10 == GrandExchangeEvent.field79 && var19 == Client.field944) { // L: 8867 + var35.drawTransAt(var22, var23, 128); + } else { + var35.drawTransBgAt(var22, var23); // L: 8868 + } + } else { + class52.invalidateWidget(var10); // L: 8870 + } + } + } + + ++var19; // L: 8878 + } + } + } else if (var10.type == 3) { // L: 8883 + if (MusicPatch.runCs1(var10)) { // L: 8885 + var19 = var10.color2; // L: 8886 + if (var10 == TriBool.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 8887 + var19 = var10.mouseOverColor2; + } + } else { + var19 = var10.color; // L: 8890 + if (var10 == TriBool.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 8891 + var19 = var10.mouseOverColor; + } + } + + if (var10.fill) { // L: 8893 + switch(var10.fillMode.id) { // L: 8894 + case 1: + Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); // L: 8896 + break; // L: 8897 + case 2: + Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); // L: 8903 + break; // L: 8904 + default: + if (var14 == 0) { // L: 8899 + Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 8900 + } + } + } else if (var14 == 0) { // L: 8908 + Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); + } else { + Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); // L: 8909 + } + } else { + Font var39; + if (var10.type == 4) { // L: 8913 + var39 = var10.getFont(); // L: 8914 + if (var39 == null) { // L: 8915 + if (Widget.field2611) { // L: 8916 + class52.invalidateWidget(var10); + } + } else { + String var44 = var10.text; // L: 8920 + if (MusicPatch.runCs1(var10)) { // L: 8921 + var20 = var10.color2; // L: 8922 + if (var10 == TriBool.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { // L: 8923 + var20 = var10.mouseOverColor2; + } + + if (var10.text2.length() > 0) { // L: 8924 + var44 = var10.text2; + } + } else { + var20 = var10.color; // L: 8927 + if (var10 == TriBool.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { // L: 8928 + var20 = var10.mouseOverColor; + } + } + + if (var10.isIf3 && var10.itemId != -1) { // L: 8930 + ItemDefinition var45 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var10.itemId); // L: 8931 + var44 = var45.name; // L: 8932 + if (var44 == null) { // L: 8933 + var44 = "null"; + } + + if ((var45.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { // L: 8934 + var44 = WorldMapAreaData.colorStartTag(16748608) + var44 + "" + " " + 'x' + class297.formatItemStacks(var10.itemQuantity); + } + } + + if (var10 == Client.meslayerContinueWidget) { // L: 8936 + var44 = "Please wait..."; // L: 8937 + var20 = var10.color; // L: 8938 + } + + if (!var10.isIf3) { // L: 8940 + var44 = AbstractByteArrayCopier.method4028(var44, var10); + } + + var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); // L: 8941 + } + } else if (var10.type == 5) { // L: 8944 + Sprite var40; + if (!var10.isIf3) { // L: 8945 + var40 = var10.getSprite(MusicPatch.runCs1(var10)); // L: 8946 + if (var40 != null) { // L: 8947 + var40.drawTransBgAt(var12, var13); + } else if (Widget.field2611) { // L: 8948 + class52.invalidateWidget(var10); + } + } else { + if (var10.itemId != -1) { // L: 8952 + var40 = ChatChannel.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); + } else { + var40 = var10.getSprite(false); // L: 8953 + } + + if (var40 == null) { // L: 8954 + if (Widget.field2611) { // L: 8978 + class52.invalidateWidget(var10); + } + } else { + var20 = var40.width; // L: 8955 + var21 = var40.height; // L: 8956 + if (!var10.spriteTiling) { // L: 8957 + var22 = var10.width * 4096 / var20; // L: 8971 + if (var10.spriteAngle != 0) { // L: 8972 + var40.method6296(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); + } else if (var14 != 0) { // L: 8973 + var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); + } else if (var20 == var10.width && var21 == var10.height) { // L: 8974 + var40.drawTransBgAt(var12, var13); // L: 8975 + } else { + var40.drawScaledAt(var12, var13, var10.width, var10.height); + } + } else { + Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); // L: 8958 + var22 = (var20 - 1 + var10.width) / var20; // L: 8959 + var23 = (var21 - 1 + var10.height) / var21; // L: 8960 + + for (var24 = 0; var24 < var22; ++var24) { // L: 8961 + for (var25 = 0; var25 < var23; ++var25) { // L: 8962 + if (var10.spriteAngle != 0) { // L: 8963 + var40.method6296(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096); + } else if (var14 != 0) { // L: 8964 + var40.drawTransAt(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255)); + } else { + var40.drawTransBgAt(var12 + var20 * var24, var13 + var21 * var25); // L: 8965 + } + } + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); // L: 8968 + } + } + } + } else { + ItemDefinition var33; + if (var10.type == 6) { // L: 8982 + boolean var36 = MusicPatch.runCs1(var10); // L: 8983 + if (var36) { // L: 8985 + var20 = var10.sequenceId2; + } else { + var20 = var10.sequenceId; // L: 8986 + } + + Model var41 = null; // L: 8987 + var22 = 0; // L: 8988 + if (var10.itemId != -1) { // L: 8989 + var33 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var10.itemId); // L: 8990 + if (var33 != null) { // L: 8991 + var33 = var33.getCountObj(var10.itemQuantity); // L: 8992 + var41 = var33.getModel(1); // L: 8993 + if (var41 != null) { // L: 8994 + var41.calculateBoundsCylinder(); // L: 8995 + var22 = var41.height / 2; // L: 8996 + } else { + class52.invalidateWidget(var10); // L: 8998 + } + } + } else if (var10.modelType == 5) { // L: 9001 + if (var10.modelId == 0) { // L: 9002 + var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); + } else { + var41 = WorldMapLabelSize.localPlayer.getModel(); // L: 9003 + } + } else if (var20 == -1) { // L: 9005 + var41 = var10.getModel((SequenceDefinition)null, -1, var36, WorldMapLabelSize.localPlayer.appearance); // L: 9006 + if (var41 == null && Widget.field2611) { // L: 9007 + class52.invalidateWidget(var10); + } + } else { + SequenceDefinition var47 = WorldMapRegion.SequenceDefinition_get(var20); // L: 9010 + var41 = var10.getModel(var47, var10.modelFrame, var36, WorldMapLabelSize.localPlayer.appearance); // L: 9011 + if (var41 == null && Widget.field2611) { // L: 9012 + class52.invalidateWidget(var10); + } + } + + Rasterizer3D.method3181(var10.width / 2 + var12, var10.height / 2 + var13); // L: 9014 + var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9015 + var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; // L: 9016 + if (var41 != null) { // L: 9017 + if (!var10.isIf3) { // L: 9018 + var41.method3003(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); + } else { + var41.calculateBoundsCylinder(); // L: 9020 + if (var10.modelOrthog) { // L: 9021 + var41.method3005(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); + } else { + var41.method3003(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY); // L: 9022 + } + } + } + + Rasterizer3D.Rasterizer3D_method3(); // L: 9025 + } else { + if (var10.type == 7) { // L: 9028 + var39 = var10.getFont(); // L: 9029 + if (var39 == null) { // L: 9030 + if (Widget.field2611) { // L: 9031 + class52.invalidateWidget(var10); + } + continue; + } + + var20 = 0; // L: 9034 + + for (var21 = 0; var21 < var10.rawHeight; ++var21) { // L: 9035 + for (var22 = 0; var22 < var10.rawWidth; ++var22) { // L: 9036 + if (var10.itemIds[var20] > 0) { // L: 9037 + var33 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var10.itemIds[var20] - 1); // L: 9038 + String var34; + if (var33.isStackable != 1 && var10.itemQuantities[var20] == 1) { // L: 9040 + var34 = WorldMapAreaData.colorStartTag(16748608) + var33.name + ""; // L: 9041 + } else { + var34 = WorldMapAreaData.colorStartTag(16748608) + var33.name + "" + " " + 'x' + class297.formatItemStacks(var10.itemQuantities[var20]); + } + + var25 = var22 * (var10.paddingX + 115) + var12; // L: 9042 + var26 = var13 + (var10.paddingY + 12) * var21; // L: 9043 + if (var10.textXAlignment == 0) { // L: 9044 + var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else if (var10.textXAlignment == 1) { // L: 9045 + var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); + } else { + var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); // L: 9046 + } + } + + ++var20; // L: 9048 + } + } + } + + if (var10.type == 8 && var10 == Occluder.field1950 && Client.field828 == Client.field770) { // L: 9052 9053 + var19 = 0; // L: 9054 + var20 = 0; // L: 9055 + Font var31 = ItemDefinition.fontPlain12; // L: 9056 + String var32 = var10.text; // L: 9057 + + String var43; + for (var32 = AbstractByteArrayCopier.method4028(var32, var10); var32.length() > 0; var20 = var20 + var31.ascent + 1) { // L: 9059 9060 9072 + var24 = var32.indexOf("
"); // L: 9061 + if (var24 != -1) { // L: 9062 + var43 = var32.substring(0, var24); // L: 9063 + var32 = var32.substring(var24 + 4); // L: 9064 + } else { + var43 = var32; // L: 9067 + var32 = ""; // L: 9068 + } + + var25 = var31.stringWidth(var43); // L: 9070 + if (var25 > var19) { // L: 9071 + var19 = var25; + } + } + + var19 += 6; // L: 9074 + var20 += 7; // L: 9075 + var24 = var12 + var10.width - 5 - var19; // L: 9076 + var25 = var13 + var10.height + 5; // L: 9077 + if (var24 < var12 + 5) { // L: 9078 + var24 = var12 + 5; + } + + if (var24 + var19 > var4) { // L: 9079 + var24 = var4 - var19; + } + + if (var25 + var20 > var5) { // L: 9080 + var25 = var5 - var20; + } + + Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); // L: 9081 + Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); // L: 9082 + var32 = var10.text; // L: 9083 + var26 = var25 + var31.ascent + 2; // L: 9084 + + for (var32 = AbstractByteArrayCopier.method4028(var32, var10); var32.length() > 0; var26 = var26 + var31.ascent + 1) { // L: 9085 9086 9097 + int var27 = var32.indexOf("
"); // L: 9087 + if (var27 != -1) { // L: 9088 + var43 = var32.substring(0, var27); // L: 9089 + var32 = var32.substring(var27 + 4); // L: 9090 + } else { + var43 = var32; // L: 9093 + var32 = ""; // L: 9094 + } + + var31.draw(var43, var24 + 3, var26, 0, -1); // L: 9096 + } + } + + if (var10.type == 9) { // L: 9101 + if (var10.field2639) { // L: 9106 + var19 = var12; // L: 9107 + var20 = var13 + var10.height; // L: 9108 + var21 = var12 + var10.width; // L: 9109 + var22 = var13; // L: 9110 + } else { + var19 = var12; // L: 9113 + var20 = var13; // L: 9114 + var21 = var12 + var10.width; // L: 9115 + var22 = var13 + var10.height; // L: 9116 + } + + if (var10.lineWid == 1) { // L: 9118 + Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); // L: 9119 + } else { + ObjectSound.method1987(var19, var20, var21, var22, var10.color, var10.lineWid); // L: 9122 + } + } + } + } + } + } + } + } + } + } + } + + } // L: 9127 } diff --git a/runescape-client/src/main/java/DefaultsGroup.java b/runescape-client/src/main/java/DefaultsGroup.java index 096710feed..3670ee3c75 100644 --- a/runescape-client/src/main/java/DefaultsGroup.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -4,26 +4,26 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lm") +@ObfuscatedName("la") @Implements("DefaultsGroup") public class DefaultsGroup { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Llm;" + descriptor = "Lla;" ) - static final DefaultsGroup field3822; - @ObfuscatedName("o") + static final DefaultsGroup field3828; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1462614597 + intValue = -116036803 ) @Export("group") final int group; static { - field3822 = new DefaultsGroup(3); + field3828 = new DefaultsGroup(3); // L: 4 } DefaultsGroup(int var1) { - this.group = var1; - } + this.group = var1; // L: 8 + } // L: 9 } diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index f12bbeef79..635abb82ca 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -3,154 +3,154 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fr") +@ObfuscatedName("fp") @Implements("DemotingHashTable") public final class DemotingHashTable { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("capacity") int capacity; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("remaining") int remaining; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llq;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljh;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lee;" + descriptor = "Lea;" ) - class155 field1987; + class155 field2001; public DemotingHashTable(int var1, int var2) { - this.queue = new IterableDualNodeQueue(); - this.capacity = var1; - this.remaining = var1; + this.queue = new IterableDualNodeQueue(); // L: 11 + this.capacity = var1; // L: 15 + this.remaining = var1; // L: 16 int var3; - for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { + for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) { // L: 17 18 } - this.hashTable = new IterableNodeHashTable(var3); - } + this.hashTable = new IterableNodeHashTable(var3); // L: 19 + } // L: 20 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("get") public Object get(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); - if (var3 == null) { + Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 23 + if (var3 == null) { // L: 24 return null; } else { - Object var4 = var3.get(); - if (var4 == null) { - var3.remove(); - var3.removeDual(); - this.remaining += var3.size; - return null; + Object var4 = var3.get(); // L: 25 + if (var4 == null) { // L: 26 + var3.remove(); // L: 27 + var3.removeDual(); // L: 28 + this.remaining += var3.size; // L: 29 + return null; // L: 30 } else { - if (var3.isSoft()) { - DirectWrapper var5 = new DirectWrapper(var4, var3.size); - this.hashTable.put(var5, var3.key); - this.queue.add(var5); - var5.keyDual = 0L; - var3.remove(); - var3.removeDual(); + if (var3.isSoft()) { // L: 32 + DirectWrapper var5 = new DirectWrapper(var4, var3.size); // L: 33 + this.hashTable.put(var5, var3.key); // L: 34 + this.queue.add(var5); // L: 35 + var5.keyDual = 0L; // L: 36 + var3.remove(); // L: 37 + var3.removeDual(); // L: 38 } else { - this.queue.add(var3); - var3.keyDual = 0L; + this.queue.add(var3); // L: 41 + var3.keyDual = 0L; // L: 42 } - return var4; + return var4; // L: 44 } } } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("remove") void remove(long var1) { - Wrapper var3 = (Wrapper)this.hashTable.get(var1); - this.removeWrapper(var3); - } + Wrapper var3 = (Wrapper)this.hashTable.get(var1); // L: 48 + this.removeWrapper(var3); // L: 49 + } // L: 50 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lfi;)V" + descriptor = "(Lfx;)V" ) @Export("removeWrapper") void removeWrapper(Wrapper var1) { - if (var1 != null) { - var1.remove(); - var1.removeDual(); - this.remaining += var1.size; + if (var1 != null) { // L: 53 + var1.remove(); // L: 54 + var1.removeDual(); // L: 55 + this.remaining += var1.size; // L: 56 } - } + } // L: 58 - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("put") public void put(Object var1, long var2, int var4) { - if (var4 > this.capacity) { + if (var4 > this.capacity) { // L: 61 throw new IllegalStateException(); } else { - this.remove(var2); - this.remaining -= var4; + this.remove(var2); // L: 62 + this.remaining -= var4; // L: 63 - while (this.remaining < 0) { - Wrapper var5 = (Wrapper)this.queue.removeLast(); - if (var5 == null) { - throw new RuntimeException(""); + while (this.remaining < 0) { // L: 64 + Wrapper var5 = (Wrapper)this.queue.removeLast(); // L: 65 + if (var5 == null) { // L: 66 + throw new RuntimeException(""); // L: 67 } - if (!var5.isSoft()) { + if (!var5.isSoft()) { // L: 69 } - this.removeWrapper(var5); - if (this.field1987 != null) { - this.field1987.method3449(var5.get()); + this.removeWrapper(var5); // L: 70 + if (this.field2001 != null) { // L: 71 + this.field2001.method3442(var5.get()); // L: 72 } } - DirectWrapper var6 = new DirectWrapper(var1, var4); - this.hashTable.put(var6, var2); - this.queue.add(var6); - var6.keyDual = 0L; + DirectWrapper var6 = new DirectWrapper(var1, var4); // L: 75 + this.hashTable.put(var6, var2); // L: 76 + this.queue.add(var6); // L: 77 + var6.keyDual = 0L; // L: 78 } - } + } // L: 79 - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("demote") public void demote(int var1) { - for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { - if (var2.isSoft()) { - if (var2.get() == null) { - var2.remove(); - var2.removeDual(); - this.remaining += var2.size; + for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) { // L: 82 + if (var2.isSoft()) { // L: 83 + if (var2.get() == null) { // L: 84 + var2.remove(); // L: 85 + var2.removeDual(); // L: 86 + this.remaining += var2.size; // L: 87 } - } else if (++var2.keyDual > (long)var1) { - SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); - this.hashTable.put(var3, var2.key); - IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); - var2.remove(); - var2.removeDual(); + } else if (++var2.keyDual > (long)var1) { // L: 92 + SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size); // L: 93 + this.hashTable.put(var3, var2.key); // L: 94 + IterableDualNodeQueue.DualNodeDeque_addBefore(var3, var2); // L: 95 + var2.remove(); // L: 96 + var2.removeDual(); // L: 97 } } - } + } // L: 101 - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("clear") public void clear() { - this.queue.clear(); - this.hashTable.clear(); - this.remaining = this.capacity; - } + this.queue.clear(); // L: 104 + this.hashTable.clear(); // L: 105 + this.remaining = this.capacity; // L: 106 + } // L: 107 } diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java index 0813cdb07e..9f7492303b 100644 --- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java +++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java @@ -4,210 +4,201 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ms") +@ObfuscatedName("mf") @Implements("DesktopPlatformInfoProvider") public class DesktopPlatformInfoProvider implements PlatformInfoProvider { - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1476161003 + intValue = 1098787301 ) - int field3925; - @ObfuscatedName("p") + int field3933; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 602625261 + intValue = 125115333 ) - int field3926; - @ObfuscatedName("g") + int field3936; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 35397071 + intValue = 1328442545 ) - int field3927; + int field3930; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Lmc;", - garbageValue = "-1826697521" + descriptor = "(I)Lmr;", + garbageValue = "-1896317364" ) @Export("get") public PlatformInfo get() { byte var1; - if (JagexCache.field2077.startsWith("win")) { + if (JagexCache.field2094.startsWith("win")) { // L: 15 var1 = 1; - } else if (JagexCache.field2077.startsWith("mac")) { + } else if (JagexCache.field2094.startsWith("mac")) { // L: 16 var1 = 2; - } else if (JagexCache.field2077.startsWith("linux")) { + } else if (JagexCache.field2094.startsWith("linux")) { // L: 17 var1 = 3; } else { - var1 = 4; + var1 = 4; // L: 18 } String var2; try { - var2 = System.getProperty("os.arch").toLowerCase(); - } catch (Exception var27) { - var2 = ""; + var2 = System.getProperty("os.arch").toLowerCase(); // L: 22 + } catch (Exception var27) { // L: 24 + var2 = ""; // L: 25 } String var3; try { - var3 = System.getProperty("os.version").toLowerCase(); - } catch (Exception var26) { - var3 = ""; + var3 = System.getProperty("os.version").toLowerCase(); // L: 28 + } catch (Exception var26) { // L: 30 + var3 = ""; // L: 31 } - String var4 = "Unknown"; - String var5 = "1.1"; + String var4 = "Unknown"; // L: 33 + String var5 = "1.1"; // L: 34 try { - var4 = System.getProperty("java.vendor"); - var5 = System.getProperty("java.version"); - } catch (Exception var25) { + var4 = System.getProperty("java.vendor"); // L: 36 + var5 = System.getProperty("java.version"); // L: 37 + } catch (Exception var25) { // L: 39 } boolean var24; - if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { - var24 = false; + if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) { // L: 41 + var24 = false; // L: 42 } else { var24 = true; } - byte var7 = 0; - if (var1 == 1) { - if (var3.indexOf("4.0") != -1) { + byte var7 = 0; // L: 43 + if (var1 == 1) { // L: 44 + if (var3.indexOf("4.0") != -1) { // L: 45 var7 = 1; - } else if (var3.indexOf("4.1") != -1) { + } else if (var3.indexOf("4.1") != -1) { // L: 46 var7 = 2; - } else if (var3.indexOf("4.9") != -1) { + } else if (var3.indexOf("4.9") != -1) { // L: 47 var7 = 3; - } else if (var3.indexOf("5.0") != -1) { + } else if (var3.indexOf("5.0") != -1) { // L: 48 var7 = 4; - } else if (var3.indexOf("5.1") != -1) { + } else if (var3.indexOf("5.1") != -1) { // L: 49 var7 = 5; - } else if (var3.indexOf("5.2") != -1) { + } else if (var3.indexOf("5.2") != -1) { // L: 50 var7 = 8; - } else if (var3.indexOf("6.0") != -1) { + } else if (var3.indexOf("6.0") != -1) { // L: 51 var7 = 6; - } else if (var3.indexOf("6.1") != -1) { + } else if (var3.indexOf("6.1") != -1) { // L: 52 var7 = 7; - } else if (var3.indexOf("6.2") != -1) { + } else if (var3.indexOf("6.2") != -1) { // L: 53 var7 = 9; - } else if (var3.indexOf("6.3") != -1) { + } else if (var3.indexOf("6.3") != -1) { // L: 54 var7 = 10; - } else if (var3.indexOf("10.0") != -1) { + } else if (var3.indexOf("10.0") != -1) { // L: 55 var7 = 11; } - } else if (var1 == 2) { - if (var3.indexOf("10.4") != -1) { + } else if (var1 == 2) { // L: 57 + if (var3.indexOf("10.4") != -1) { // L: 58 var7 = 20; - } else if (var3.indexOf("10.5") != -1) { + } else if (var3.indexOf("10.5") != -1) { // L: 59 var7 = 21; - } else if (var3.indexOf("10.6") != -1) { + } else if (var3.indexOf("10.6") != -1) { // L: 60 var7 = 22; - } else if (var3.indexOf("10.7") != -1) { + } else if (var3.indexOf("10.7") != -1) { // L: 61 var7 = 23; - } else if (var3.indexOf("10.8") != -1) { + } else if (var3.indexOf("10.8") != -1) { // L: 62 var7 = 24; - } else if (var3.indexOf("10.9") != -1) { + } else if (var3.indexOf("10.9") != -1) { // L: 63 var7 = 25; - } else if (var3.indexOf("10.10") != -1) { + } else if (var3.indexOf("10.10") != -1) { // L: 64 var7 = 26; - } else if (var3.indexOf("10.11") != -1) { + } else if (var3.indexOf("10.11") != -1) { // L: 65 var7 = 27; - } else if (var3.indexOf("10.12") != -1) { + } else if (var3.indexOf("10.12") != -1) { // L: 66 var7 = 28; - } else if (var3.indexOf("10.13") != -1) { + } else if (var3.indexOf("10.13") != -1) { // L: 67 var7 = 29; } } byte var8; - if (var4.toLowerCase().indexOf("sun") != -1) { + if (var4.toLowerCase().indexOf("sun") != -1) { // L: 70 var8 = 1; - } else if (var4.toLowerCase().indexOf("microsoft") != -1) { + } else if (var4.toLowerCase().indexOf("microsoft") != -1) { // L: 71 var8 = 2; - } else if (var4.toLowerCase().indexOf("apple") != -1) { + } else if (var4.toLowerCase().indexOf("apple") != -1) { // L: 72 var8 = 3; - } else if (var4.toLowerCase().indexOf("oracle") != -1) { + } else if (var4.toLowerCase().indexOf("oracle") != -1) { // L: 73 var8 = 5; } else { - var8 = 4; + var8 = 4; // L: 74 } - this.method6495(var5); - int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; + this.method6396(var5); // L: 75 + int var10 = (int)(Runtime.getRuntime().maxMemory() / 1048576L) + 1; // L: 77 int var11; - if (this.field3925 > 3) { + if (this.field3933 > 3) { // L: 80 var11 = Runtime.getRuntime().availableProcessors(); } else { - var11 = 0; + var11 = 0; // L: 81 } - byte var12 = 0; - String var13 = ""; - String var14 = ""; - String var15 = ""; - String var16 = ""; - String var17 = ""; - String var18 = ""; - int[] var23 = new int[3]; - return new PlatformInfo(var1, var24, var7, var8, this.field3925, this.field3926, this.field3927, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); + byte var12 = 0; // L: 82 + String var13 = ""; // L: 83 + String var14 = ""; // L: 84 + String var15 = ""; // L: 85 + String var16 = ""; // L: 86 + String var17 = ""; // L: 87 + String var18 = ""; // L: 88 + int[] var23 = new int[3]; // L: 93 + return new PlatformInfo(var1, var24, var7, var8, this.field3933, this.field3936, this.field3930, false, var10, var11, var12, 0, var13, var14, var15, var16, 0, 0, 0, 0, var17, var18, var23, 0, ""); // L: 97 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1686875071" + garbageValue = "395335674" ) - void method6495(String var1) { - if (var1.startsWith("1.")) { - this.method6484(var1); + void method6396(String var1) { + if (var1.startsWith("1.")) { // L: 101 + this.method6399(var1); // L: 102 } else { - this.method6485(var1); + this.method6400(var1); // L: 105 } - } + } // L: 107 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1385366754" + garbageValue = "1051455651" ) - void method6484(String var1) { - String[] var2 = var1.split("\\."); + void method6399(String var1) { + String[] var2 = var1.split("\\."); // L: 110 try { - this.field3925 = Integer.parseInt(var2[1]); - var2 = var2[2].split("_"); - this.field3926 = Integer.parseInt(var2[0]); - this.field3927 = Integer.parseInt(var2[1]); - } catch (Exception var4) { + this.field3933 = Integer.parseInt(var2[1]); // L: 112 + var2 = var2[2].split("_"); // L: 113 + this.field3936 = Integer.parseInt(var2[0]); // L: 114 + this.field3930 = Integer.parseInt(var2[1]); // L: 115 + } catch (Exception var4) { // L: 117 } - } + } // L: 118 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "1" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-2119124304" ) - void method6485(String var1) { - String[] var2 = var1.split("\\."); + void method6400(String var1) { + String[] var2 = var1.split("\\."); // L: 121 try { - this.field3925 = Integer.parseInt(var2[0]); - this.field3926 = Integer.parseInt(var2[1]); - this.field3927 = Integer.parseInt(var2[2]); - } catch (Exception var4) { + this.field3933 = Integer.parseInt(var2[0]); // L: 123 + this.field3936 = Integer.parseInt(var2[1]); // L: 124 + this.field3930 = Integer.parseInt(var2[2]); // L: 125 + } catch (Exception var4) { // L: 127 } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "2111177426" - ) - static final boolean method6481(char var0) { - return var0 == 160 || var0 == ' ' || var0 == '_' || var0 == '-'; - } + } // L: 128 } diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java index 78def42818..a592561653 100644 --- a/runescape-client/src/main/java/DevicePcmPlayer.java +++ b/runescape-client/src/main/java/DevicePcmPlayer.java @@ -9,121 +9,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bb") +@ObfuscatedName("br") @Implements("DevicePcmPlayer") public class DevicePcmPlayer extends PcmPlayer { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("format") AudioFormat format; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("line") SourceDataLine line; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1034506245 + intValue = -636994811 ) @Export("capacity2") int capacity2; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("byteSamples") byte[] byteSamples; DevicePcmPlayer() { - } + } // L: 18 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2128910021" + garbageValue = "-841767260" ) @Export("init") protected void init() { - this.format = new AudioFormat((float)class237.field3113, 16, Messages.PcmPlayer_stereo ? 2 : 1, true, false); - this.byteSamples = new byte[256 << (Messages.PcmPlayer_stereo ? 2 : 1)]; - } + this.format = new AudioFormat((float)PcmPlayer.field1447, 16, PcmPlayer.PcmPlayer_stereo ? 2 : 1, true, false); // L: 21 + this.byteSamples = new byte[256 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 22 + } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-14" + garbageValue = "-120" ) @Export("open") protected void open(int var1) throws LineUnavailableException { try { - Info var2 = new Info(SourceDataLine.class, this.format, var1 << (Messages.PcmPlayer_stereo ? 2 : 1)); - this.line = (SourceDataLine)AudioSystem.getLine(var2); - this.line.open(); - this.line.start(); - this.capacity2 = var1; - } catch (LineUnavailableException var5) { - if (DynamicObject.method2375(var1) != 1) { - int var4 = var1 - 1; - var4 |= var4 >>> 1; - var4 |= var4 >>> 2; - var4 |= var4 >>> 4; - var4 |= var4 >>> 8; - var4 |= var4 >>> 16; - int var3 = var4 + 1; - this.open(var3); + Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 27 + this.line = (SourceDataLine)AudioSystem.getLine(var2); // L: 28 + this.line.open(); // L: 29 + this.line.start(); // L: 30 + this.capacity2 = var1; // L: 31 + } catch (LineUnavailableException var3) { // L: 33 + if (Canvas.method905(var1) != 1) { // L: 34 + this.open(class297.method5378(var1)); // L: 35 } else { - this.line = null; - throw var5; + this.line = null; // L: 38 + throw var3; // L: 39 } } - } + } // L: 36 41 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1868944096" + descriptor = "(B)I", + garbageValue = "106" ) @Export("position") protected int position() { - return this.capacity2 - (this.line.available() >> (Messages.PcmPlayer_stereo ? 2 : 1)); + return this.capacity2 - (this.line.available() >> (PcmPlayer.PcmPlayer_stereo ? 2 : 1)); // L: 44 } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("write") protected void write() { - int var1 = 256; - if (Messages.PcmPlayer_stereo) { + int var1 = 256; // L: 49 + if (PcmPlayer.PcmPlayer_stereo) { // L: 50 var1 <<= 1; } - for (int var2 = 0; var2 < var1; ++var2) { - int var3 = super.samples[var2]; - if ((var3 + 8388608 & -16777216) != 0) { - var3 = 8388607 ^ var3 >> 31; + for (int var2 = 0; var2 < var1; ++var2) { // L: 51 + int var3 = super.samples[var2]; // L: 52 + if ((var3 + 8388608 & -16777216) != 0) { // L: 53 + var3 = 8388607 ^ var3 >> 31; // L: 54 } - this.byteSamples[var2 * 2] = (byte)(var3 >> 8); - this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); + this.byteSamples[var2 * 2] = (byte)(var3 >> 8); // L: 56 + this.byteSamples[var2 * 2 + 1] = (byte)(var3 >> 16); // L: 57 } - this.line.write(this.byteSamples, 0, var1 << 1); - } + this.line.write(this.byteSamples, 0, var1 << 1); // L: 59 + } // L: 60 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1900446281" + garbageValue = "667465439" ) @Export("close") protected void close() { - if (this.line != null) { - this.line.close(); - this.line = null; + if (this.line != null) { // L: 63 + this.line.close(); // L: 64 + this.line = null; // L: 65 } - } + } // L: 67 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "630637593" + garbageValue = "-2027971398" ) @Export("discard") protected void discard() { - this.line.flush(); - } + this.line.flush(); // L: 70 + } // L: 71 } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index 03983ae9d5..3b188d5b29 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -4,186 +4,133 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("be") +@ObfuscatedName("bj") @Implements("DevicePcmPlayerProvider") public class DevicePcmPlayerProvider implements PlayerProvider { - @ObfuscatedName("rr") - @ObfuscatedGetter( - intValue = 1326431277 - ) - static int field435; - @ObfuscatedName("y") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "Lhz;" + descriptor = "Lkl;" ) - @Export("musicTrack") - public static MusicTrack musicTrack; + @Export("WorldMapElement_fonts") + static Fonts WorldMapElement_fonts; + @ObfuscatedName("lf") + @ObfuscatedGetter( + intValue = 1325063249 + ) + @Export("menuWidth") + static int menuWidth; DevicePcmPlayerProvider() { - } + } // L: 7 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Ldt;", - garbageValue = "-1371983171" + descriptor = "(I)Ldr;", + garbageValue = "-1032997343" ) @Export("player") public PcmPlayer player() { - return new DevicePcmPlayer(); + return new DevicePcmPlayer(); // L: 10 } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;Ljava/lang/String;I)I", - garbageValue = "-420633495" + descriptor = "(IB)I", + garbageValue = "1" ) - public static int method917(Buffer var0, String var1) { - int var2 = var0.offset; - int var4 = var1.length(); - byte[] var5 = new byte[var4]; - - for (int var6 = 0; var6 < var4; ++var6) { - char var7 = var1.charAt(var6); - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { - var5[var6] = (byte)var7; - } else if (var7 == 8364) { - var5[var6] = -128; - } else if (var7 == 8218) { - var5[var6] = -126; - } else if (var7 == 402) { - var5[var6] = -125; - } else if (var7 == 8222) { - var5[var6] = -124; - } else if (var7 == 8230) { - var5[var6] = -123; - } else if (var7 == 8224) { - var5[var6] = -122; - } else if (var7 == 8225) { - var5[var6] = -121; - } else if (var7 == 710) { - var5[var6] = -120; - } else if (var7 == 8240) { - var5[var6] = -119; - } else if (var7 == 352) { - var5[var6] = -118; - } else if (var7 == 8249) { - var5[var6] = -117; - } else if (var7 == 338) { - var5[var6] = -116; - } else if (var7 == 381) { - var5[var6] = -114; - } else if (var7 == 8216) { - var5[var6] = -111; - } else if (var7 == 8217) { - var5[var6] = -110; - } else if (var7 == 8220) { - var5[var6] = -109; - } else if (var7 == 8221) { - var5[var6] = -108; - } else if (var7 == 8226) { - var5[var6] = -107; - } else if (var7 == 8211) { - var5[var6] = -106; - } else if (var7 == 8212) { - var5[var6] = -105; - } else if (var7 == 732) { - var5[var6] = -104; - } else if (var7 == 8482) { - var5[var6] = -103; - } else if (var7 == 353) { - var5[var6] = -102; - } else if (var7 == 8250) { - var5[var6] = -101; - } else if (var7 == 339) { - var5[var6] = -100; - } else if (var7 == 382) { - var5[var6] = -98; - } else if (var7 == 376) { - var5[var6] = -97; - } else { - var5[var6] = 63; - } + @Export("iLog") + public static int iLog(int var0) { + int var1 = 0; // L: 54 + if (var0 < 0 || var0 >= 65536) { // L: 55 + var0 >>>= 16; // L: 56 + var1 += 16; // L: 57 } - var0.writeSmartByteShort(var5.length); - var0.offset += class219.huffman.compress(var5, 0, var5.length, var0.array, var0.offset); - return var0.offset - var2; + if (var0 >= 256) { // L: 59 + var0 >>>= 8; // L: 60 + var1 += 8; // L: 61 + } + + if (var0 >= 16) { // L: 63 + var0 >>>= 4; // L: 64 + var1 += 4; // L: 65 + } + + if (var0 >= 4) { // L: 67 + var0 >>>= 2; // L: 68 + var1 += 2; // L: 69 + } + + if (var0 >= 1) { // L: 71 + var0 >>>= 1; // L: 72 + ++var1; // L: 73 + } + + return var0 + var1; // L: 75 } - @ObfuscatedName("g") + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "(Lkn;IB)V", - garbageValue = "-128" + descriptor = "([BI)[B", + garbageValue = "-2036549161" ) - public static void method914(Buffer var0, int var1) { - if (JagexCache.JagexCache_randomDat != null) { - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); - } catch (Exception var3) { - } - } - - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-422462480" - ) - @Export("hslToRgb") - static final int hslToRgb(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } - - @ObfuscatedName("ie") - @ObfuscatedSignature( - descriptor = "(Lhd;B)Z", - garbageValue = "-86" - ) - @Export("runCs1") - static final boolean runCs1(Widget var0) { - if (var0.cs1Comparisons == null) { - return false; + @Export("decompressBytes") + static final byte[] decompressBytes(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 363 + int var2 = var1.readUnsignedByte(); // L: 364 + int var3 = var1.readInt(); // L: 365 + if (var3 < 0 || AbstractArchive.field3176 != 0 && var3 > AbstractArchive.field3176) { // L: 366 + throw new RuntimeException(); // L: 367 + } else if (var2 == 0) { // L: 369 + byte[] var6 = new byte[var3]; // L: 370 + var1.readBytes(var6, 0, var3); // L: 371 + return var6; // L: 372 } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = Canvas.method923(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; + int var4 = var1.readInt(); // L: 375 + if (var4 >= 0 && (AbstractArchive.field3176 == 0 || var4 <= AbstractArchive.field3176)) { // L: 376 + byte[] var5 = new byte[var4]; // L: 379 + if (var2 == 1) { // L: 380 + BZip2Decompressor.BZip2Decompressor_decompress(var5, var4, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); // L: 381 + } + + return var5; // L: 382 + } else { + throw new RuntimeException(); // L: 377 + } + } + } + + @ObfuscatedName("jl") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-334845913" + ) + static void method897() { + for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) { // L: 10265 + int var1 = var0.group; // L: 10266 + if (WorldMapSprite.loadInterface(var1)) { // L: 10267 + boolean var2 = true; // L: 10268 + Widget[] var3 = Widget.Widget_interfaceComponents[var1]; // L: 10269 + + int var4; + for (var4 = 0; var4 < var3.length; ++var4) { // L: 10270 + if (var3[var4] != null) { // L: 10271 + var2 = var3[var4].isIf3; // L: 10272 + break; } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; + } + + if (!var2) { // L: 10276 + var4 = (int)var0.key; // L: 10277 + Widget var5 = TileItem.getWidget(var4); // L: 10278 + if (var5 != null) { // L: 10279 + class52.invalidateWidget(var5); } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var3 == var2) { - return false; - } - } else if (var2 != var3) { - return false; } } - - return true; } - } + + } // L: 10283 } diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java index ac316ba938..a89d0c0a66 100644 --- a/runescape-client/src/main/java/DirectByteArrayCopier.java +++ b/runescape-client/src/main/java/DirectByteArrayCopier.java @@ -4,44 +4,86 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hk") +@ObfuscatedName("hi") @Implements("DirectByteArrayCopier") public class DirectByteArrayCopier extends AbstractByteArrayCopier { - @ObfuscatedName("m") + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + @Export("ObjectDefinition_modelsArchive") + public static AbstractArchive ObjectDefinition_modelsArchive; + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "Lij;" + ) + static GameBuild field2525; + @ObfuscatedName("z") @Export("directBuffer") ByteBuffer directBuffer; - @ObfuscatedName("j") + DirectByteArrayCopier() { + } // L: 10 + + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "300747627" + garbageValue = "-1021172953" ) @Export("get") byte[] get() { - byte[] var1 = new byte[this.directBuffer.capacity()]; - this.directBuffer.position(0); - this.directBuffer.get(var1); - return var1; + byte[] var1 = new byte[this.directBuffer.capacity()]; // L: 13 + this.directBuffer.position(0); // L: 14 + this.directBuffer.get(var1); // L: 15 + return var1; // L: 16 } - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "([BB)V", - garbageValue = "92" + descriptor = "([BI)V", + garbageValue = "-1366071744" ) @Export("set") - public void set(byte[] var1) { - this.directBuffer = ByteBuffer.allocateDirect(var1.length); - this.directBuffer.position(0); - this.directBuffer.put(var1); - } + void set(byte[] var1) { + this.directBuffer = ByteBuffer.allocateDirect(var1.length); // L: 20 + this.directBuffer.position(0); // L: 21 + this.directBuffer.put(var1); // L: 22 + } // L: 23 - @ObfuscatedName("gl") + @ObfuscatedName("it") @ObfuscatedSignature( - descriptor = "(Lcc;II)V", - garbageValue = "1934042219" + descriptor = "(Lhq;IIB)V", + garbageValue = "47" ) - static final void method4090(Actor var0, int var1) { - HealthBar.worldToScreen(var0.x, var0.y, var1); - } + @Export("alignWidgetPosition") + static void alignWidgetPosition(Widget var0, int var1, int var2) { + if (var0.xAlignment == 0) { // L: 9262 + var0.x = var0.rawX; + } else if (var0.xAlignment == 1) { // L: 9263 + var0.x = var0.rawX + (var1 - var0.width) / 2; + } else if (var0.xAlignment == 2) { // L: 9264 + var0.x = var1 - var0.width - var0.rawX; + } else if (var0.xAlignment == 3) { // L: 9265 + var0.x = var0.rawX * var1 >> 14; + } else if (var0.xAlignment == 4) { // L: 9266 + var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); + } else { + var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); // L: 9267 + } + + if (var0.yAlignment == 0) { // L: 9268 + var0.y = var0.rawY; + } else if (var0.yAlignment == 1) { // L: 9269 + var0.y = (var2 - var0.height) / 2 + var0.rawY; + } else if (var0.yAlignment == 2) { // L: 9270 + var0.y = var2 - var0.height - var0.rawY; + } else if (var0.yAlignment == 3) { + var0.y = var2 * var0.rawY >> 14; // L: 9271 + } else if (var0.yAlignment == 4) { // L: 9272 + var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2; + } else { + var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); // L: 9273 + } + + } // L: 9274 } diff --git a/runescape-client/src/main/java/DirectWrapper.java b/runescape-client/src/main/java/DirectWrapper.java index aec604e0ce..3b30b17547 100644 --- a/runescape-client/src/main/java/DirectWrapper.java +++ b/runescape-client/src/main/java/DirectWrapper.java @@ -2,27 +2,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fe") +@ObfuscatedName("fq") @Implements("DirectWrapper") public class DirectWrapper extends Wrapper { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("obj") Object obj; DirectWrapper(Object var1, int var2) { - super(var2); - this.obj = var1; - } + super(var2); // L: 7 + this.obj = var1; // L: 8 + } // L: 9 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("get") Object get() { - return this.obj; + return this.obj; // L: 12 } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("isSoft") boolean isSoft() { - return false; + return false; // L: 16 } } diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java index e122e529a6..9f720a43a9 100644 --- a/runescape-client/src/main/java/DualNode.java +++ b/runescape-client/src/main/java/DualNode.java @@ -3,33 +3,33 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gf") +@ObfuscatedName("gs") @Implements("DualNode") public class DualNode extends Node { - @ObfuscatedName("cq") + @ObfuscatedName("cj") @Export("keyDual") public long keyDual; - @ObfuscatedName("co") + @ObfuscatedName("cd") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgs;" ) @Export("previousDual") public DualNode previousDual; - @ObfuscatedName("ca") + @ObfuscatedName("cx") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgs;" ) @Export("nextDual") public DualNode nextDual; - @ObfuscatedName("ci") + @ObfuscatedName("dq") @Export("removeDual") public void removeDual() { - if (this.nextDual != null) { - this.nextDual.previousDual = this.previousDual; - this.previousDual.nextDual = this.nextDual; - this.previousDual = null; - this.nextDual = null; + if (this.nextDual != null) { // L: 9 + this.nextDual.previousDual = this.previousDual; // L: 10 + this.previousDual.nextDual = this.nextDual; // L: 11 + this.previousDual = null; // L: 12 + this.nextDual = null; // L: 13 } - } + } // L: 14 } diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java index d51d67e695..67c7ad8d66 100644 --- a/runescape-client/src/main/java/DualNodeDeque.java +++ b/runescape-client/src/main/java/DualNodeDeque.java @@ -3,61 +3,61 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jd") +@ObfuscatedName("jl") @Implements("DualNodeDeque") public final class DualNodeDeque { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgs;" ) @Export("sentinel") DualNode sentinel; public DualNodeDeque() { - this.sentinel = new DualNode(); - this.sentinel.previousDual = this.sentinel; - this.sentinel.nextDual = this.sentinel; - } + this.sentinel = new DualNode(); // L: 6 + this.sentinel.previousDual = this.sentinel; // L: 9 + this.sentinel.nextDual = this.sentinel; // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lgf;)V" + descriptor = "(Lgs;)V" ) @Export("addFirst") public void addFirst(DualNode var1) { - if (var1.nextDual != null) { + if (var1.nextDual != null) { // L: 14 var1.removeDual(); } - var1.nextDual = this.sentinel.nextDual; - var1.previousDual = this.sentinel; - var1.nextDual.previousDual = var1; - var1.previousDual.nextDual = var1; - } + var1.nextDual = this.sentinel.nextDual; // L: 15 + var1.previousDual = this.sentinel; // L: 16 + var1.nextDual.previousDual = var1; // L: 17 + var1.previousDual.nextDual = var1; // L: 18 + } // L: 19 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lgf;)V" + descriptor = "(Lgs;)V" ) @Export("addLast") public void addLast(DualNode var1) { - if (var1.nextDual != null) { + if (var1.nextDual != null) { // L: 22 var1.removeDual(); } - var1.nextDual = this.sentinel; - var1.previousDual = this.sentinel.previousDual; - var1.nextDual.previousDual = var1; - var1.previousDual.nextDual = var1; - } + var1.nextDual = this.sentinel; // L: 23 + var1.previousDual = this.sentinel.previousDual; // L: 24 + var1.nextDual.previousDual = var1; // L: 25 + var1.previousDual.nextDual = var1; // L: 26 + } // L: 27 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lgf;" + descriptor = "()Lgs;" ) @Export("removeLast") public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; - return var1 == this.sentinel ? null : var1; + DualNode var1 = this.sentinel.previousDual; // L: 30 + return var1 == this.sentinel ? null : var1; // L: 31 32 } } diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index faa39a5eb3..efcc25a509 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -4,362 +4,244 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cr") +@ObfuscatedName("cb") @Implements("DynamicObject") public class DynamicObject extends Entity { - @ObfuscatedName("m") + @ObfuscatedName("fo") + @ObfuscatedSignature( + descriptor = "Lkr;" + ) + @Export("fontPlain11") + static Font fontPlain11; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 909997849 + intValue = -992554479 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2017652637 + intValue = -224037215 ) @Export("type") int type; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1099859107 + intValue = -1337748479 ) @Export("orientation") int orientation; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1395519623 + intValue = 719138669 ) @Export("plane") int plane; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1502042193 + intValue = 1011089507 ) @Export("x") int x; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1335019499 + intValue = -1704315949 ) @Export("y") int y; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Ljm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 521544259 + intValue = -791329731 ) @Export("frame") int frame; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1788666009 + intValue = -1556832647 ) @Export("cycleStart") int cycleStart; @ObfuscatedSignature( - descriptor = "(IIIIIIIZLel;)V" + descriptor = "(IIIIIIIZLez;)V" ) DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) { - this.id = var1; - this.type = var2; - this.orientation = var3; - this.plane = var4; - this.x = var5; - this.y = var6; - if (var7 != -1) { - this.sequenceDefinition = NetSocket.SequenceDefinition_get(var7); - this.frame = 0; - this.cycleStart = Client.cycle - 1; - if (this.sequenceDefinition.field3561 == 0 && var9 != null && var9 instanceof DynamicObject) { - DynamicObject var10 = (DynamicObject)var9; - if (this.sequenceDefinition == var10.sequenceDefinition) { - this.frame = var10.frame; - this.cycleStart = var10.cycleStart; - return; + this.id = var1; // L: 20 + this.type = var2; // L: 21 + this.orientation = var3; // L: 22 + this.plane = var4; // L: 23 + this.x = var5; // L: 24 + this.y = var6; // L: 25 + if (var7 != -1) { // L: 26 + this.sequenceDefinition = WorldMapRegion.SequenceDefinition_get(var7); // L: 27 + this.frame = 0; // L: 28 + this.cycleStart = Client.cycle - 1; // L: 29 + if (this.sequenceDefinition.field3535 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30 + DynamicObject var10 = (DynamicObject)var9; // L: 31 + if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32 + this.frame = var10.frame; // L: 33 + this.cycleStart = var10.cycleStart; // L: 34 + return; // L: 35 } } - if (var8 && this.sequenceDefinition.frameCount != -1) { - this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); - this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); + if (var8 && this.sequenceDefinition.frameCount != -1) { // L: 38 + this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); // L: 39 + this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); // L: 40 } } - } + } // L: 43 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lef;", - garbageValue = "1832696685" + descriptor = "(I)Ler;", + garbageValue = "-2026237468" ) @Export("getModel") protected final Model getModel() { - if (this.sequenceDefinition != null) { - int var1 = Client.cycle - this.cycleStart; - if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { + if (this.sequenceDefinition != null) { // L: 46 + int var1 = Client.cycle - this.cycleStart; // L: 47 + if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { // L: 48 var1 = 100; } - label55: { + label54: { do { do { - if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { - break label55; + if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 49 + break label54; } - var1 -= this.sequenceDefinition.frameLengths[this.frame]; - ++this.frame; - } while(this.frame < this.sequenceDefinition.frameIds.length); + var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 50 + ++this.frame; // L: 51 + } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 52 - this.frame -= this.sequenceDefinition.frameCount; - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); + this.frame -= this.sequenceDefinition.frameCount; // L: 53 + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 54 - this.sequenceDefinition = null; + this.sequenceDefinition = null; // L: 55 } - this.cycleStart = Client.cycle - var1; + this.cycleStart = Client.cycle - var1; // L: 60 } - ObjectDefinition var12 = Canvas.getObjectDefinition(this.id); - if (var12.transforms != null) { + ObjectDefinition var12 = MidiPcmStream.getObjectDefinition(this.id); // L: 62 + if (var12.transforms != null) { // L: 63 var12 = var12.transform(); } - if (var12 == null) { + if (var12 == null) { // L: 64 return null; } else { int var2; int var3; - if (this.orientation != 1 && this.orientation != 3) { - var2 = var12.sizeX; - var3 = var12.sizeY; + if (this.orientation != 1 && this.orientation != 3) { // L: 67 + var2 = var12.sizeX; // L: 72 + var3 = var12.sizeY; // L: 73 } else { - var2 = var12.sizeY; - var3 = var12.sizeX; + var2 = var12.sizeY; // L: 68 + var3 = var12.sizeX; // L: 69 } - int var4 = (var2 >> 1) + this.x; - int var5 = (var2 + 1 >> 1) + this.x; - int var6 = (var3 >> 1) + this.y; - int var7 = (var3 + 1 >> 1) + this.y; - int[][] var8 = Tiles.Tiles_heights[this.plane]; - int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2; - int var10 = (this.x << 7) + (var2 << 6); - int var11 = (this.y << 7) + (var3 << 6); - return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); + int var4 = (var2 >> 1) + this.x; // L: 75 + int var5 = (var2 + 1 >> 1) + this.x; // L: 76 + int var6 = (var3 >> 1) + this.y; // L: 77 + int var7 = (var3 + 1 >> 1) + this.y; // L: 78 + int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 79 + int var9 = var8[var4][var7] + var8[var4][var6] + var8[var5][var6] + var8[var5][var7] >> 2; // L: 80 + int var10 = (this.x << 7) + (var2 << 6); // L: 81 + int var11 = (this.y << 7) + (var3 << 6); // L: 82 + return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83 } } - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1062154046" + descriptor = "(Lkf;IIIIIIB)V", + garbageValue = "24" ) - public static int method2375(int var0) { - var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765); - var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459); - var0 = var0 + (var0 >>> 4) & 252645135; - var0 += var0 >>> 8; - var0 += var0 >>> 16; - return var0 & 255; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lkb;I)V", - garbageValue = "1312322364" - ) - static final void method2373(PacketBuffer var0) { - int var1 = 0; - var0.importIndex(); - - byte[] var10000; - int var2; - int var3; - int var4; - int var6; + @Export("loadTerrain") + static final void loadTerrain(Buffer var0, int var1, int var2, int var3, int var4, int var5, int var6) { int var7; - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1282[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var6 = var0.readBits(2); - if (var6 == 0) { - var7 = 0; - } else if (var6 == 1) { - var7 = var0.readBits(5); - } else if (var6 == 2) { - var7 = var0.readBits(8); - } else { - var7 = var0.readBits(11); + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 108 + Tiles.Tiles_renderFlags[var1][var2][var3] = 0; // L: 109 + + while (true) { + var7 = var0.readUnsignedByte(); // L: 111 + if (var7 == 0) { // L: 112 + if (var1 == 0) { // L: 113 + int[] var14 = Tiles.Tiles_heights[0][var2]; // L: 114 + int var11 = var2 + var4 + 932731; // L: 117 + int var12 = var3 + var5 + 556238; // L: 118 + int var13 = class60.method947(45365 + var11, 91923 + var12, 4) - 128 + (class60.method947(var11 + 10294, 37821 + var12, 2) - 128 >> 1) + (class60.method947(var11, var12, 1) - 128 >> 2); // L: 120 + var13 = (int)((double)var13 * 0.3D) + 35; // L: 121 + if (var13 < 10) { // L: 122 + var13 = 10; + } else if (var13 > 60) { // L: 123 + var13 = 60; } - var1 = var7; - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); + var14[var3] = -var13 * 8; // L: 126 } else { - class92.readPlayerUpdate(var0, var3); + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240; // L: 128 } + break; + } + + if (var7 == 1) { // L: 131 + int var8 = var0.readUnsignedByte(); // L: 132 + if (var8 == 1) { // L: 133 + var8 = 0; + } + + if (var1 == 0) { // L: 134 + Tiles.Tiles_heights[0][var2][var3] = -var8 * 8; + } else { + Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var8 * 8; // L: 135 + } + break; + } + + if (var7 <= 49) { // L: 138 + Tiles.field521[var1][var2][var3] = var0.readByte(); // L: 139 + class297.field3668[var1][var2][var3] = (byte)((var7 - 2) / 4); // L: 140 + class171.field2049[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3); // L: 141 + } else if (var7 <= 81) { // L: 144 + Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49); // L: 145 + } else { + Tiles.field528[var1][var2][var3] = (byte)(var7 - 81); // L: 148 } } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1282[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var6 = var0.readBits(2); - if (var6 == 0) { - var7 = 0; - } else if (var6 == 1) { - var7 = var0.readBits(5); - } else if (var6 == 2) { - var7 = var0.readBits(8); - } else { - var7 = var0.readBits(11); - } - - var1 = var7; - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - class92.readPlayerUpdate(var0, var3); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1282[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var6 = var0.readBits(2); - if (var6 == 0) { - var7 = 0; - } else if (var6 == 1) { - var7 = var0.readBits(5); - } else if (var6 == 2) { - var7 = var0.readBits(8); - } else { - var7 = var0.readBits(11); - } - - var1 = var7; - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (ArchiveDiskAction.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } + while (true) { + var7 = var0.readUnsignedByte(); // L: 153 + if (var7 == 0) { // L: 154 + break; } - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); + if (var7 == 1) { // L: 155 + var0.readUnsignedByte(); // L: 156 + break; + } - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1282[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var6 = var0.readBits(2); - if (var6 == 0) { - var7 = 0; - } else if (var6 == 1) { - var7 = var0.readBits(5); - } else if (var6 == 2) { - var7 = var0.readBits(8); - } else { - var7 = var0.readBits(11); - } - - var1 = var7; - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (ArchiveDiskAction.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1282; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - for (var2 = 1; var2 < 2048; ++var2) { - var10000 = Players.field1282; - var10000[var2] = (byte)(var10000[var2] >> 1); - Player var8 = Client.players[var2]; - if (var8 != null) { - Players.Players_indices[++Players.Players_count - 1] = var2; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; - } - } - - } + if (var7 <= 49) { // L: 159 + var0.readUnsignedByte(); } } } - } - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "-627685416" - ) - @Export("stringCp1252NullTerminatedByteSize") - public static int stringCp1252NullTerminatedByteSize(String var0) { - return var0.length() + 1; - } + } // L: 162 + + @ObfuscatedName("m") + @Export("addEntityUnderMouse") + static final void addEntityUnderMouse(long var0) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; // L: 99 + } // L: 100 } diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java index 2a09e7983c..380543afd0 100644 --- a/runescape-client/src/main/java/Entity.java +++ b/runescape-client/src/main/java/Entity.java @@ -3,336 +3,56 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("el") +@ObfuscatedName("ez") @Implements("Entity") public abstract class Entity extends DualNode { - @ObfuscatedName("cu") + @ObfuscatedName("pe") + @ObfuscatedSignature( + descriptor = "Lkx;" + ) + @Export("clanChat") + static ClanChat clanChat; + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = -1335402999 + intValue = -282434447 ) @Export("height") public int height; protected Entity() { - this.height = 1000; - } + this.height = 1000; // L: 6 + } // L: 8 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lef;", - garbageValue = "1832696685" + descriptor = "(I)Ler;", + garbageValue = "-2026237468" ) @Export("getModel") protected Model getModel() { - return null; + return null; // L: 19 } - @ObfuscatedName("cz") + @ObfuscatedName("cb") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - Model var11 = this.getModel(); - if (var11 != null) { - this.height = var11.height; - var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9); + Model var11 = this.getModel(); // L: 11 + if (var11 != null) { // L: 12 + this.height = var11.height; // L: 13 + var11.draw(var1, var2, var3, var4, var5, var6, var7, var8, var9); // L: 14 } - } + } // L: 16 - @ObfuscatedName("a") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "67" + descriptor = "(Lic;Lic;B)V", + garbageValue = "28" ) - public static void method3387() { - KitDefinition.KitDefinition_cached.clear(); - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "-1309600698" - ) - static int method3376(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.publicChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { - UrlRequester.Interpreter_intStackSize -= 3; - Client.publicChatMode = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - World.privateChatMode = ItemContainer.method1232(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); - if (World.privateChatMode == null) { - World.privateChatMode = PrivateChatMode.field3818; - } - - Client.tradeChatMode = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - PacketBufferNode var18 = UserComparator4.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); - var18.packetBuffer.writeByte(Client.publicChatMode); - var18.packetBuffer.writeByte(World.privateChatMode.field3817); - var18.packetBuffer.writeByte(Client.tradeChatMode); - Client.packetWriter.addNode(var18); - return 1; - } else { - String var3; - int var4; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - UrlRequester.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - PacketBufferNode var6 = UserComparator4.getPacketBufferNode(ClientPacket.field2341, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.addNode(var6); - return 1; - } else { - int var10; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { - UrlRequester.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Message var15 = class3.Messages_getByChannelAndID(var10, var4); - if (var15 != null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.count; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.cycle; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Message var16 = Language.Messages_getMessage(var10); - if (var16 != null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var16.type; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var16.cycle; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (World.privateChatMode == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = World.privateChatMode.field3817; - } - - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - String var14 = var3.toLowerCase(); - byte var17 = 0; - if (var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if (var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if (var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if (var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if (var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if (var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if (var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if (var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if (var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if (var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if (var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if (var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } else if (UserComparator9.clientLanguage != Language.Language_EN) { - if (var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if (var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if (var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if (var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if (var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if (var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if (var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if (var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if (var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if (var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if (var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if (var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } - } - - var14 = var3.toLowerCase(); - byte var7 = 0; - if (var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if (var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if (var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if (var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if (var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } else if (Language.Language_EN != UserComparator9.clientLanguage) { - if (var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if (var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if (var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if (var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if (var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } - } - - PacketBufferNode var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - int var9 = var8.packetBuffer.offset; - var8.packetBuffer.writeByte(var4); - var8.packetBuffer.writeByte(var17); - var8.packetBuffer.writeByte(var7); - DevicePcmPlayerProvider.method917(var8.packetBuffer, var3); - var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); - Client.packetWriter.addNode(var8); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - WorldMapEvent.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; - String var12 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; - PacketBufferNode var11 = UserComparator4.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShort(0); - int var13 = var11.packetBuffer.offset; - var11.packetBuffer.writeStringCp1252NullTerminated(var3); - DevicePcmPlayerProvider.method917(var11.packetBuffer, var12); - var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13); - Client.packetWriter.addNode(var11); - return 1; - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.tradeChatMode; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = GrandExchangeEvent.Messages_getHistorySize(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class171.Messages_getNextChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapLabel.Messages_getLastChatID(var10); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - WallDecoration.doCheat(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field755 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = Client.field755; - return 1; - } else if (var0 == ScriptOpcodes.DEBUGMES) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else { - return 2; - } - } else { - if (class60.localPlayer != null && class60.localPlayer.username != null) { - var3 = class60.localPlayer.username.getName(); - } else { - var3 = ""; - } - - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3; - return 1; - } - } - } - } - - @ObfuscatedName("kl") - @ObfuscatedSignature( - descriptor = "(Lhd;I)Z", - garbageValue = "-36347772" - ) - @Export("isComponentHidden") - static boolean isComponentHidden(Widget var0) { - return var0.isHidden; - } + public static void method3381(AbstractArchive var0, AbstractArchive var1) { + KitDefinition.KitDefinition_archive = var0; // L: 27 + KitDefinition.KitDefinition_modelsArchive = var1; // L: 28 + KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); // L: 29 + } // L: 30 } diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index 81a93cba62..b32040fd90 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -4,119 +4,200 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jr") +@ObfuscatedName("jp") @Implements("EnumDefinition") public class EnumDefinition extends DualNode { - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lic;" + ) + @Export("EnumDefinition_archive") + static AbstractArchive EnumDefinition_archive; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lel;" ) @Export("EnumDefinition_cached") static EvictingDualNodeHashTable EnumDefinition_cached; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("inputType") public char inputType; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("outputType") public char outputType; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 296936223 + intValue = -1401922337 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -306934909 + intValue = -1452935225 ) @Export("outputCount") public int outputCount; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("keys") public int[] keys; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("intVals") public int[] intVals; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("strVals") public String[] strVals; static { - EnumDefinition_cached = new EvictingDualNodeHashTable(64); + EnumDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 } EnumDefinition() { - this.defaultStr = "null"; - this.outputCount = 0; - } + this.defaultStr = "null"; // L: 15 + this.outputCount = 0; // L: 17 + } // L: 22 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "1372956041" + descriptor = "(Lkf;I)V", + garbageValue = "-2086226438" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 40 + if (var2 == 0) { // L: 41 + return; // L: 44 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 42 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;IB)V", - garbageValue = "63" + descriptor = "(Lkf;IB)V", + garbageValue = "57" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { + if (var2 == 1) { // L: 47 this.inputType = (char)var1.readUnsignedByte(); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 48 this.outputType = (char)var1.readUnsignedByte(); - } else if (var2 == 3) { + } else if (var2 == 3) { // L: 49 this.defaultStr = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 50 this.defaultInt = var1.readInt(); } else { int var3; - if (var2 == 5) { - this.outputCount = var1.readUnsignedShort(); - this.keys = new int[this.outputCount]; - this.strVals = new String[this.outputCount]; + if (var2 == 5) { // L: 51 + this.outputCount = var1.readUnsignedShort(); // L: 52 + this.keys = new int[this.outputCount]; // L: 53 + this.strVals = new String[this.outputCount]; // L: 54 - for (var3 = 0; var3 < this.outputCount; ++var3) { - this.keys[var3] = var1.readInt(); - this.strVals[var3] = var1.readStringCp1252NullTerminated(); + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 55 + this.keys[var3] = var1.readInt(); // L: 56 + this.strVals[var3] = var1.readStringCp1252NullTerminated(); // L: 57 } - } else if (var2 == 6) { - this.outputCount = var1.readUnsignedShort(); - this.keys = new int[this.outputCount]; - this.intVals = new int[this.outputCount]; + } else if (var2 == 6) { // L: 60 + this.outputCount = var1.readUnsignedShort(); // L: 61 + this.keys = new int[this.outputCount]; // L: 62 + this.intVals = new int[this.outputCount]; // L: 63 - for (var3 = 0; var3 < this.outputCount; ++var3) { - this.keys[var3] = var1.readInt(); - this.intVals[var3] = var1.readInt(); + for (var3 = 0; var3 < this.outputCount; ++var3) { // L: 64 + this.keys[var3] = var1.readInt(); // L: 65 + this.intVals[var3] = var1.readInt(); // L: 66 } } } - } + } // L: 70 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-24655" + descriptor = "(B)I", + garbageValue = "1" ) @Export("size") public int size() { - return this.outputCount; + return this.outputCount; // L: 73 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)[B", + garbageValue = "-2060894177" + ) + public static byte[] method4644(CharSequence var0) { + int var1 = var0.length(); // L: 84 + byte[] var2 = new byte[var1]; // L: 85 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 86 + char var4 = var0.charAt(var3); // L: 87 + if (var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) { // L: 88 + var2[var3] = (byte)var4; + } else if (var4 == 8364) { // L: 89 + var2[var3] = -128; + } else if (var4 == 8218) { // L: 90 + var2[var3] = -126; + } else if (var4 == 402) { // L: 91 + var2[var3] = -125; + } else if (var4 == 8222) { // L: 92 + var2[var3] = -124; + } else if (var4 == 8230) { // L: 93 + var2[var3] = -123; + } else if (var4 == 8224) { // L: 94 + var2[var3] = -122; + } else if (var4 == 8225) { // L: 95 + var2[var3] = -121; + } else if (var4 == 710) { // L: 96 + var2[var3] = -120; + } else if (var4 == 8240) { // L: 97 + var2[var3] = -119; + } else if (var4 == 352) { + var2[var3] = -118; // L: 98 + } else if (var4 == 8249) { // L: 99 + var2[var3] = -117; + } else if (var4 == 338) { // L: 100 + var2[var3] = -116; + } else if (var4 == 381) { // L: 101 + var2[var3] = -114; + } else if (var4 == 8216) { // L: 102 + var2[var3] = -111; + } else if (var4 == 8217) { // L: 103 + var2[var3] = -110; + } else if (var4 == 8220) { // L: 104 + var2[var3] = -109; + } else if (var4 == 8221) { // L: 105 + var2[var3] = -108; + } else if (var4 == 8226) { // L: 106 + var2[var3] = -107; + } else if (var4 == 8211) { // L: 107 + var2[var3] = -106; + } else if (var4 == 8212) { // L: 108 + var2[var3] = -105; + } else if (var4 == 732) { // L: 109 + var2[var3] = -104; + } else if (var4 == 8482) { // L: 110 + var2[var3] = -103; + } else if (var4 == 353) { // L: 111 + var2[var3] = -102; + } else if (var4 == 8250) { // L: 112 + var2[var3] = -101; + } else if (var4 == 339) { // L: 113 + var2[var3] = -100; + } else if (var4 == 382) { // L: 114 + var2[var3] = -98; + } else if (var4 == 376) { // L: 115 + var2[var3] = -97; + } else { + var2[var3] = 63; // L: 116 + } + } + + return var2; // L: 118 } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index 07483677ae..1d1a6ce73e 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gt") +@ObfuscatedName("gq") @Implements("Enumerated") public interface Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") int rsOrdinal(); diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java index 04fae7d057..079c1fd3ea 100644 --- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java +++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java @@ -3,101 +3,101 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ec") +@ObfuscatedName("el") @Implements("EvictingDualNodeHashTable") public final class EvictingDualNodeHashTable { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgs;" ) - DualNode field1978; - @ObfuscatedName("o") + DualNode field1995; + @ObfuscatedName("k") @Export("capacity") int capacity; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("remainingCapacity") int remainingCapacity; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llq;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljh;" ) @Export("deque") IterableDualNodeQueue deque; public EvictingDualNodeHashTable(int var1) { - this.field1978 = new DualNode(); - this.deque = new IterableDualNodeQueue(); - this.capacity = var1; - this.remainingCapacity = var1; + this.field1995 = new DualNode(); // L: 8 + this.deque = new IterableDualNodeQueue(); // L: 12 + this.capacity = var1; // L: 15 + this.remainingCapacity = var1; // L: 16 int var2; - for (var2 = 1; var2 + var2 < var1; var2 += var2) { + for (var2 = 1; var2 + var2 < var1; var2 += var2) { // L: 17 18 } - this.hashTable = new IterableNodeHashTable(var2); - } + this.hashTable = new IterableNodeHashTable(var2); // L: 19 + } // L: 20 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(J)Lgf;" + descriptor = "(J)Lgs;" ) @Export("get") public DualNode get(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); - if (var3 != null) { - this.deque.add(var3); + DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 23 + if (var3 != null) { // L: 24 + this.deque.add(var3); // L: 25 } - return var3; + return var3; // L: 28 } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("remove") public void remove(long var1) { - DualNode var3 = (DualNode)this.hashTable.get(var1); - if (var3 != null) { - var3.remove(); - var3.removeDual(); - ++this.remainingCapacity; + DualNode var3 = (DualNode)this.hashTable.get(var1); // L: 32 + if (var3 != null) { // L: 33 + var3.remove(); // L: 34 + var3.removeDual(); // L: 35 + ++this.remainingCapacity; // L: 36 } - } + } // L: 38 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lgf;J)V" + descriptor = "(Lgs;J)V" ) @Export("put") public void put(DualNode var1, long var2) { - if (this.remainingCapacity == 0) { - DualNode var4 = this.deque.removeLast(); - var4.remove(); - var4.removeDual(); - if (var4 == this.field1978) { - var4 = this.deque.removeLast(); - var4.remove(); - var4.removeDual(); + if (this.remainingCapacity == 0) { // L: 41 + DualNode var4 = this.deque.removeLast(); // L: 42 + var4.remove(); // L: 43 + var4.removeDual(); // L: 44 + if (var4 == this.field1995) { // L: 45 + var4 = this.deque.removeLast(); // L: 46 + var4.remove(); // L: 47 + var4.removeDual(); // L: 48 } } else { - --this.remainingCapacity; + --this.remainingCapacity; // L: 51 } - this.hashTable.put(var1, var2); - this.deque.add(var1); - } + this.hashTable.put(var1, var2); // L: 52 + this.deque.add(var1); // L: 53 + } // L: 54 - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("clear") public void clear() { - this.deque.clear(); - this.hashTable.clear(); - this.field1978 = new DualNode(); - this.remainingCapacity = this.capacity; - } + this.deque.clear(); // L: 57 + this.hashTable.clear(); // L: 58 + this.field1995 = new DualNode(); // L: 59 + this.remainingCapacity = this.capacity; // L: 60 + } // L: 61 } diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java index 66a48625d9..8338749332 100644 --- a/runescape-client/src/main/java/FaceNormal.java +++ b/runescape-client/src/main/java/FaceNormal.java @@ -4,56 +4,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ed") +@ObfuscatedName("et") @Implements("FaceNormal") public class FaceNormal { @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -552913965 + intValue = 1856660121 + ) + @Export("pcmSampleLength") + public static int pcmSampleLength; + @ObfuscatedName("ha") + @ObfuscatedGetter( + intValue = 1637295417 + ) + @Export("cameraY") + static int cameraY; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -364011515 ) @Export("x") int x; - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1122069433 + intValue = -1271035903 ) @Export("y") int y; - @ObfuscatedName("q") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -256548507 + intValue = -1616346001 ) @Export("z") int z; FaceNormal() { - } + } // L: 8 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([Lgt;II)Lgt;", - garbageValue = "-707018179" + descriptor = "(ILlz;Liw;B)V", + garbageValue = "81" ) - @Export("findEnumerated") - public static Enumerated findEnumerated(Enumerated[] var0, int var1) { - Enumerated[] var2 = var0; + static void method3388(int var0, ArchiveDisk var1, Archive var2) { + ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 30 + var3.type = 1; // L: 31 + var3.key = (long)var0; // L: 32 + var3.archiveDisk = var1; // L: 33 + var3.archive = var2; // L: 34 + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 35 + ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 36 + } // L: 37 - for (int var3 = 0; var3 < var2.length; ++var3) { - Enumerated var4 = var2[var3]; - if (var1 == var4.rsOrdinal()) { - return var4; - } - } - - return null; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "223741723" - ) - static String method3392() { - return NetSocket.clientPreferences.hideUsername ? WorldMapRegion.method613(Login.Login_username) : Login.Login_username; - } + WorldMapArea.method415(); // L: 38 + } // L: 39 } diff --git a/runescape-client/src/main/java/FileSystem.java b/runescape-client/src/main/java/FileSystem.java index 6188e20fab..24e45daf19 100644 --- a/runescape-client/src/main/java/FileSystem.java +++ b/runescape-client/src/main/java/FileSystem.java @@ -2,23 +2,146 @@ import java.io.File; import java.util.Hashtable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fl") +@ObfuscatedName("fw") @Implements("FileSystem") public class FileSystem { - @ObfuscatedName("m") + @ObfuscatedName("rt") + @ObfuscatedGetter( + intValue = -929980525 + ) + static int field2099; + @ObfuscatedName("z") @Export("FileSystem_hasPermissions") static boolean FileSystem_hasPermissions; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("FileSystem_cacheDir") static File FileSystem_cacheDir; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("FileSystem_cacheFiles") static Hashtable FileSystem_cacheFiles; static { - FileSystem_hasPermissions = false; + FileSystem_hasPermissions = false; // L: 7 FileSystem_cacheFiles = new Hashtable(16); + } // L: 9 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lky;IB)Z", + garbageValue = "1" + ) + @Export("updateExternalPlayer") + static boolean updateExternalPlayer(PacketBuffer var0, int var1) { + int var2 = var0.readBits(2); // L: 368 + int var3; + int var4; + int var7; + int var8; + int var9; + int var10; + if (var2 == 0) { // L: 369 + if (var0.readBits(1) != 0) { // L: 370 + updateExternalPlayer(var0, var1); + } + + var3 = var0.readBits(13); // L: 371 + var4 = var0.readBits(13); // L: 372 + boolean var12 = var0.readBits(1) == 1; // L: 373 + if (var12) { // L: 374 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + if (Client.players[var1] != null) { // L: 375 + throw new RuntimeException(); // L: 376 + } else { + Player var11 = Client.players[var1] = new Player(); // L: 378 + var11.index = var1; // L: 379 + if (Players.field1277[var1] != null) { // L: 380 + var11.read(Players.field1277[var1]); + } + + var11.orientation = Players.Players_orientations[var1]; // L: 381 + var11.targetIndex = Players.Players_targetIndices[var1]; // L: 382 + var7 = Players.Players_regions[var1]; // L: 383 + var8 = var7 >> 28; // L: 384 + var9 = var7 >> 14 & 255; // L: 385 + var10 = var7 & 255; // L: 386 + var11.pathTraversed[0] = Players.field1284[var1]; // L: 387 + var11.plane = (byte)var8; // L: 388 + var11.resetPath((var9 << 13) + var3 - WorldMapManager.baseX, (var10 << 13) + var4 - WorldMapLabel.baseY); // L: 389 + var11.field660 = false; // L: 390 + return true; // L: 391 + } + } else if (var2 == 1) { // L: 393 + var3 = var0.readBits(2); // L: 394 + var4 = Players.Players_regions[var1]; // L: 395 + Players.Players_regions[var1] = (var4 & 268435455) + (((var4 >> 28) + var3 & 3) << 28); // L: 396 + return false; // L: 397 + } else { + int var5; + int var6; + if (var2 == 2) { // L: 399 + var3 = var0.readBits(5); // L: 400 + var4 = var3 >> 3; // L: 401 + var5 = var3 & 7; // L: 402 + var6 = Players.Players_regions[var1]; // L: 403 + var7 = (var6 >> 28) + var4 & 3; // L: 404 + var8 = var6 >> 14 & 255; // L: 405 + var9 = var6 & 255; // L: 406 + if (var5 == 0) { // L: 407 + --var8; // L: 408 + --var9; // L: 409 + } + + if (var5 == 1) { // L: 411 + --var9; + } + + if (var5 == 2) { // L: 412 + ++var8; // L: 413 + --var9; // L: 414 + } + + if (var5 == 3) { // L: 416 + --var8; + } + + if (var5 == 4) { // L: 417 + ++var8; + } + + if (var5 == 5) { // L: 418 + --var8; // L: 419 + ++var9; // L: 420 + } + + if (var5 == 6) { // L: 422 + ++var9; + } + + if (var5 == 7) { // L: 423 + ++var8; // L: 424 + ++var9; // L: 425 + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); // L: 427 + return false; // L: 428 + } else { + var3 = var0.readBits(18); // L: 430 + var4 = var3 >> 16; // L: 431 + var5 = var3 >> 8 & 255; // L: 432 + var6 = var3 & 255; // L: 433 + var7 = Players.Players_regions[var1]; // L: 434 + var8 = (var7 >> 28) + var4 & 3; // L: 435 + var9 = var5 + (var7 >> 14) & 255; // L: 436 + var10 = var6 + var7 & 255; // L: 437 + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); // L: 438 + return false; // L: 439 + } + } } } diff --git a/runescape-client/src/main/java/FillMode.java b/runescape-client/src/main/java/FillMode.java new file mode 100644 index 0000000000..2a5395d601 --- /dev/null +++ b/runescape-client/src/main/java/FillMode.java @@ -0,0 +1,56 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("lm") +@Implements("FillMode") +public enum FillMode implements Enumerated { + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Llm;" + ) + @Export("SOLID") + SOLID(0, 0), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Llm;" + ) + @Export("GRADIENT") + GRADIENT(1, 1), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Llm;" + ) + @Export("GRADIENT_ALPHA") + GRADIENT_ALPHA(2, 2); + + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1262740687 + ) + @Export("id") + public final int id; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1489188623 + ) + @Export("index") + final int index; + + FillMode(int var3, int var4) { + this.id = var3; // L: 19 + this.index = var4; // L: 20 + } // L: 21 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "385513888" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.index; // L: 24 + } +} diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java index 404e6e8fae..a9d420de82 100644 --- a/runescape-client/src/main/java/FloorDecoration.java +++ b/runescape-client/src/main/java/FloorDecoration.java @@ -7,48 +7,166 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("eu") @Implements("FloorDecoration") public final class FloorDecoration { - @ObfuscatedName("m") + @ObfuscatedName("re") @ObfuscatedGetter( - longValue = 423292381861362449L + intValue = -1689305311 + ) + static int field1640; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = -339938865 + ) + @Export("canvasWidth") + public static int canvasWidth; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lez;" + ) + @Export("entity") + public Entity entity; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -894788303 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1021856255 + ) + @Export("x") + int x; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1156042873 + ) + @Export("y") + int y; + @ObfuscatedName("i") + @ObfuscatedGetter( + longValue = -1933481833005826137L ) @Export("tag") public long tag; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1344836879 - ) - @Export("tileHeight") - int tileHeight; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -732713561 - ) - @Export("x") - int x; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -799217819 - ) - @Export("y") - int y; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lel;" - ) - @Export("entity") - public Entity entity; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1173464785 + intValue = -124409527 ) @Export("flags") int flags; FloorDecoration() { - } + } // L: 11 - @ObfuscatedName("o") - static boolean method2977(long var0) { - return class171.Entity_unpackType(var0) == 2; - } + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([Lct;II[I[II)V", + garbageValue = "1270252584" + ) + @Export("sortWorlds") + static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { + if (var1 < var2) { // L: 81 + int var5 = var1 - 1; // L: 82 + int var6 = var2 + 1; // L: 83 + int var7 = (var2 + var1) / 2; // L: 84 + World var8 = var0[var7]; // L: 85 + var0[var7] = var0[var1]; // L: 86 + var0[var1] = var8; // L: 87 + + while (var5 < var6) { // L: 88 + boolean var9 = true; // L: 89 + + int var10; + int var11; + int var12; + do { + --var6; // L: 91 + + for (var10 = 0; var10 < 4; ++var10) { // L: 92 + if (var3[var10] == 2) { // L: 95 + var11 = var0[var6].index; // L: 96 + var12 = var8.index; // L: 97 + } else if (var3[var10] == 1) { // L: 99 + var11 = var0[var6].population; // L: 100 + var12 = var8.population; // L: 101 + if (var11 == -1 && var4[var10] == 1) { // L: 102 + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { // L: 103 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 105 + var11 = var0[var6].isMembersOnly() ? 1 : 0; // L: 106 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 107 + } else { + var11 = var0[var6].id; // L: 110 + var12 = var8.id; // L: 111 + } + + if (var11 != var12) { // L: 113 + if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { // L: 116 117 + var9 = false; // L: 119 + } + break; + } + + if (var10 == 3) { // L: 114 + var9 = false; + } + } + } while(var9); + + var9 = true; // L: 124 + + do { + ++var5; // L: 126 + + for (var10 = 0; var10 < 4; ++var10) { // L: 127 + if (var3[var10] == 2) { // L: 130 + var11 = var0[var5].index; // L: 131 + var12 = var8.index; // L: 132 + } else if (var3[var10] == 1) { // L: 134 + var11 = var0[var5].population; // L: 135 + var12 = var8.population; // L: 136 + if (var11 == -1 && var4[var10] == 1) { // L: 137 + var11 = 2001; + } + + if (var12 == -1 && var4[var10] == 1) { // L: 138 + var12 = 2001; + } + } else if (var3[var10] == 3) { // L: 140 + var11 = var0[var5].isMembersOnly() ? 1 : 0; // L: 141 + var12 = var8.isMembersOnly() ? 1 : 0; // L: 142 + } else { + var11 = var0[var5].id; // L: 145 + var12 = var8.id; // L: 146 + } + + if (var12 != var11) { // L: 148 + if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { // L: 151 152 + var9 = false; // L: 154 + } + break; + } + + if (var10 == 3) { // L: 149 + var9 = false; + } + } + } while(var9); + + if (var5 < var6) { // L: 159 + World var13 = var0[var5]; // L: 160 + var0[var5] = var0[var6]; // L: 161 + var0[var6] = var13; // L: 162 + } + } + + sortWorlds(var0, var1, var6, var3, var4); // L: 165 + sortWorlds(var0, var6 + 1, var2, var3, var4); // L: 166 + } + + } // L: 168 } diff --git a/runescape-client/src/main/java/FloorOverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java index 8f11b8f4c0..f080a31f29 100644 --- a/runescape-client/src/main/java/FloorOverlayDefinition.java +++ b/runescape-client/src/main/java/FloorOverlayDefinition.java @@ -7,72 +7,66 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jt") @Implements("FloorOverlayDefinition") public class FloorOverlayDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lic;" - ) - @Export("FloorOverlayDefinition_archive") - public static AbstractArchive FloorOverlayDefinition_archive; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("FloorOverlayDefinition_cached") - public static EvictingDualNodeHashTable FloorOverlayDefinition_cached; - @ObfuscatedName("q") + static EvictingDualNodeHashTable FloorOverlayDefinition_cached; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1755156673 + intValue = -1313207677 ) @Export("primaryRgb") public int primaryRgb; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1396694897 + intValue = 1768544221 ) @Export("texture") public int texture; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("hideUnderlay") public boolean hideUnderlay; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 241976547 + intValue = -1964387519 ) @Export("secondaryRgb") public int secondaryRgb; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 752648345 + intValue = -1954941483 ) @Export("hue") public int hue; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1759175445 + intValue = -935699783 ) @Export("saturation") public int saturation; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1976855017 + intValue = 1596036719 ) @Export("lightness") public int lightness; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -223897525 + intValue = 45293449 ) @Export("secondaryHue") public int secondaryHue; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1642260111 + intValue = 1367236851 ) @Export("secondarySaturation") public int secondarySaturation; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 841175665 + intValue = 1186195215 ) @Export("secondaryLightness") public int secondaryLightness; @@ -81,140 +75,326 @@ public class FloorOverlayDefinition extends DualNode { FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64); } - public FloorOverlayDefinition() { + FloorOverlayDefinition() { this.primaryRgb = 0; this.texture = -1; this.hideUnderlay = true; this.secondaryRgb = -1; - } + } // L: 23 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "9136" + descriptor = "(I)V", + garbageValue = "1294557825" ) @Export("postDecode") - public void postDecode() { - if (this.secondaryRgb != -1) { - this.setHsl(this.secondaryRgb); - this.secondaryHue = this.hue; - this.secondarySaturation = this.saturation; - this.secondaryLightness = this.lightness; + void postDecode() { + if (this.secondaryRgb != -1) { // L: 37 + this.setHsl(this.secondaryRgb); // L: 38 + this.secondaryHue = this.hue; // L: 39 + this.secondarySaturation = this.saturation; // L: 40 + this.secondaryLightness = this.lightness; // L: 41 } - this.setHsl(this.primaryRgb); - } + this.setHsl(this.primaryRgb); // L: 43 + } // L: 44 - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "1893541080" + descriptor = "(Lkf;II)V", + garbageValue = "-1509952388" ) @Export("decode") - public void decode(Buffer var1, int var2) { + void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); - if (var3 == 0) { - return; + int var3 = var1.readUnsignedByte(); // L: 48 + if (var3 == 0) { // L: 49 + return; // L: 52 } - this.decodeNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); // L: 50 } } - @ObfuscatedName("q") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;III)V", - garbageValue = "965813090" + descriptor = "(Lkf;III)V", + garbageValue = "211427426" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { + if (var2 == 1) { // L: 55 this.primaryRgb = var1.readMedium(); } else if (var2 == 2) { - this.texture = var1.readUnsignedByte(); - } else if (var2 == 5) { + this.texture = var1.readUnsignedByte(); // L: 56 + } else if (var2 == 5) { // L: 57 this.hideUnderlay = false; } else if (var2 == 7) { - this.secondaryRgb = var1.readMedium(); - } else if (var2 == 8) { + this.secondaryRgb = var1.readMedium(); // L: 58 + } else if (var2 == 8) { // L: 59 } - } + } // L: 61 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "304322495" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; - double var8 = var2; - if (var4 < var2) { + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 64 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 65 + double var6 = (double)(var1 & 255) / 256.0D; // L: 66 + double var8 = var2; // L: 67 + if (var4 < var2) { // L: 68 var8 = var4; } - if (var6 < var8) { + if (var6 < var8) { // L: 69 var8 = var6; } - double var10 = var2; - if (var4 > var2) { + double var10 = var2; // L: 70 + if (var4 > var2) { // L: 71 var10 = var4; } - if (var6 > var10) { + if (var6 > var10) { // L: 72 var10 = var6; } - double var12 = 0.0D; - double var14 = 0.0D; - double var16 = (var8 + var10) / 2.0D; - if (var10 != var8) { - if (var16 < 0.5D) { + double var12 = 0.0D; // L: 73 + double var14 = 0.0D; // L: 74 + double var16 = (var10 + var8) / 2.0D; // L: 75 + if (var8 != var10) { // L: 76 + if (var16 < 0.5D) { // L: 77 var14 = (var10 - var8) / (var8 + var10); } - if (var16 >= 0.5D) { + if (var16 >= 0.5D) { // L: 78 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var10 == var2) { + if (var10 == var2) { // L: 79 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { + } else if (var10 == var4) { // L: 80 var12 = 2.0D + (var6 - var2) / (var10 - var8); - } else if (var10 == var6) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + } else if (var6 == var10) { + var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 81 } } - var12 /= 6.0D; - this.hue = (int)(256.0D * var12); - this.saturation = (int)(256.0D * var14); - this.lightness = (int)(var16 * 256.0D); - if (this.saturation < 0) { + var12 /= 6.0D; // L: 83 + this.hue = (int)(256.0D * var12); // L: 84 + this.saturation = (int)(var14 * 256.0D); // L: 85 + this.lightness = (int)(var16 * 256.0D); // L: 86 + if (this.saturation < 0) { // L: 87 this.saturation = 0; - } else if (this.saturation > 255) { + } else if (this.saturation > 255) { // L: 88 this.saturation = 255; } - if (this.lightness < 0) { + if (this.lightness < 0) { // L: 89 this.lightness = 0; - } else if (this.lightness > 255) { + } else if (this.lightness > 255) { // L: 90 this.lightness = 255; } + } // L: 91 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "-1598465666" + ) + public static int method4871(CharSequence var0) { + int var1 = var0.length(); // L: 9 + int var2 = 0; // L: 10 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 11 + char var4 = var0.charAt(var3); // L: 12 + if (var4 <= 127) { // L: 13 + ++var2; + } else if (var4 <= 2047) { // L: 14 + var2 += 2; + } else { + var2 += 3; // L: 15 + } + } + + return var2; // L: 17 } - @ObfuscatedName("bk") + @ObfuscatedName("he") @ObfuscatedSignature( - descriptor = "([BII)I", - garbageValue = "-2091622873" + descriptor = "(ZLky;I)V", + garbageValue = "2034094426" ) - public static int method4936(byte[] var0, int var1) { - return Actor.method1822(var0, 0, var1); + @Export("updateNpcs") + static final void updateNpcs(boolean var0, PacketBuffer var1) { + Client.field771 = 0; // L: 6735 + Client.field702 = 0; // L: 6736 + PacketBuffer var2 = Client.packetWriter.packetBuffer; // L: 6738 + var2.importIndex(); // L: 6739 + int var3 = var2.readBits(8); // L: 6740 + int var4; + if (var3 < Client.npcCount) { // L: 6741 + for (var4 = var3; var4 < Client.npcCount; ++var4) { // L: 6742 + Client.field930[++Client.field771 - 1] = Client.npcIndices[var4]; + } + } + + if (var3 > Client.npcCount) { // L: 6744 + throw new RuntimeException(""); + } else { + Client.npcCount = 0; // L: 6745 + + for (var4 = 0; var4 < var3; ++var4) { // L: 6746 + int var5 = Client.npcIndices[var4]; // L: 6747 + NPC var6 = Client.npcs[var5]; // L: 6748 + int var7 = var2.readBits(1); // L: 6749 + if (var7 == 0) { // L: 6750 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 6751 + var6.npcCycle = Client.cycle; // L: 6752 + } else { + int var8 = var2.readBits(2); // L: 6755 + if (var8 == 0) { // L: 6756 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 6757 + var6.npcCycle = Client.cycle; // L: 6758 + Client.field721[++Client.field702 - 1] = var5; // L: 6759 + } else { + int var9; + int var10; + if (var8 == 1) { // L: 6762 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 6763 + var6.npcCycle = Client.cycle; // L: 6764 + var9 = var2.readBits(3); // L: 6765 + var6.method2115(var9, (byte)1); // L: 6766 + var10 = var2.readBits(1); // L: 6767 + if (var10 == 1) { // L: 6768 + Client.field721[++Client.field702 - 1] = var5; + } + } else if (var8 == 2) { // L: 6771 + Client.npcIndices[++Client.npcCount - 1] = var5; // L: 6772 + var6.npcCycle = Client.cycle; // L: 6773 + var9 = var2.readBits(3); // L: 6774 + var6.method2115(var9, (byte)2); // L: 6775 + var10 = var2.readBits(3); // L: 6776 + var6.method2115(var10, (byte)2); // L: 6777 + int var11 = var2.readBits(1); // L: 6778 + if (var11 == 1) { // L: 6779 + Client.field721[++Client.field702 - 1] = var5; + } + } else if (var8 == 3) { // L: 6782 + Client.field930[++Client.field771 - 1] = var5; // L: 6783 + } + } + } + } + + method4879(var0, var1); // L: 6788 + Archive.method4357(var1); // L: 6789 + + int var12; + for (var12 = 0; var12 < Client.field771; ++var12) { // L: 6790 + var3 = Client.field930[var12]; // L: 6791 + if (Client.npcs[var3].npcCycle != Client.cycle) { // L: 6792 + Client.npcs[var3].definition = null; // L: 6793 + Client.npcs[var3] = null; // L: 6794 + } + } + + if (var1.offset != Client.packetWriter.serverPacketLength) { // L: 6797 + throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else { + for (var12 = 0; var12 < Client.npcCount; ++var12) { // L: 6798 + if (Client.npcs[Client.npcIndices[var12]] == null) { // L: 6799 + throw new RuntimeException(var12 + "," + Client.npcCount); // L: 6800 + } + } + + } + } + } // L: 6803 + + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "(ZLky;B)V", + garbageValue = "46" + ) + static final void method4879(boolean var0, PacketBuffer var1) { + while (true) { + if (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { // L: 6807 + int var2 = var1.readBits(15); // L: 6808 + if (var2 != 32767) { // L: 6809 + boolean var3 = false; // L: 6810 + if (Client.npcs[var2] == null) { // L: 6811 + Client.npcs[var2] = new NPC(); // L: 6812 + var3 = true; // L: 6813 + } + + NPC var4 = Client.npcs[var2]; // L: 6815 + Client.npcIndices[++Client.npcCount - 1] = var2; // L: 6816 + var4.npcCycle = Client.cycle; // L: 6817 + int var5 = var1.readBits(1); // L: 6818 + if (var5 == 1) { // L: 6819 + Client.field721[++Client.field702 - 1] = var2; + } + + int var6; + if (var0) { // L: 6821 + var6 = var1.readBits(8); // L: 6822 + if (var6 > 127) { // L: 6823 + var6 -= 256; + } + } else { + var6 = var1.readBits(5); // L: 6826 + if (var6 > 15) { // L: 6827 + var6 -= 32; + } + } + + int var7 = var1.readBits(1); // L: 6829 + var4.definition = Skeleton.getNpcDefinition(var1.readBits(14)); // L: 6830 + int var8 = Client.defaultRotations[var1.readBits(3)]; // L: 6831 + if (var3) { // L: 6832 + var4.orientation = var4.rotation = var8; + } + + int var9; + if (var0) { // L: 6834 + var9 = var1.readBits(8); // L: 6835 + if (var9 > 127) { // L: 6836 + var9 -= 256; + } + } else { + var9 = var1.readBits(5); // L: 6839 + if (var9 > 15) { + var9 -= 32; // L: 6840 + } + } + + var4.field1014 = var4.definition.size; // L: 6842 + var4.field1025 = var4.definition.rotation; // L: 6843 + if (var4.field1025 == 0) { // L: 6844 + var4.rotation = 0; + } + + var4.walkSequence = var4.definition.walkSequence; // L: 6845 + var4.walkBackSequence = var4.definition.walkBackSequence; // L: 6846 + var4.walkLeftSequence = var4.definition.walkLeftSequence; // L: 6847 + var4.walkRightSequence = var4.definition.walkRightSequence; // L: 6848 + var4.idleSequence = var4.definition.idleSequence; // L: 6849 + var4.turnLeftSequence = var4.definition.turnLeftSequence; // L: 6850 + var4.turnRightSequence = var4.definition.turnRightSequence; // L: 6851 + var4.method2121(WorldMapLabelSize.localPlayer.pathX[0] + var9, WorldMapLabelSize.localPlayer.pathY[0] + var6, var7 == 1); // L: 6852 + continue; // L: 6853 + } + } + + var1.exportIndex(); // L: 6854 + return; // L: 6855 + } } } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index 48151cb3e3..7ab2b97e17 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -1,264 +1,177 @@ -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iw") +@ObfuscatedName("iu") @Implements("FloorUnderlayDefinition") public class FloorUnderlayDefinition extends DualNode { - @ObfuscatedName("sh") - @ObfuscatedSignature( - descriptor = "Llp;" - ) - @Export("masterDisk") - static ArchiveDisk masterDisk; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("FloorUnderlayDefinition_archive") public static AbstractArchive FloorUnderlayDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("FloorUnderlayDefinition_cached") public static EvictingDualNodeHashTable FloorUnderlayDefinition_cached; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 582353211 + intValue = 1526550495 ) @Export("rgb") int rgb; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -50831355 + intValue = -196392257 ) @Export("hue") public int hue; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 88823617 + intValue = -1341685519 ) @Export("saturation") public int saturation; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1334094789 + intValue = 57935727 ) @Export("lightness") public int lightness; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1647084533 + intValue = 1946992829 ) @Export("hueMultiplier") public int hueMultiplier; static { - FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); + FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } public FloorUnderlayDefinition() { - this.rgb = 0; + this.rgb = 0; // L: 12 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-33176492" + descriptor = "(B)V", + garbageValue = "-7" ) @Export("postDecode") public void postDecode() { - this.setHsl(this.rgb); - } + this.setHsl(this.rgb); // L: 23 + } // L: 24 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;IB)V", - garbageValue = "17" + descriptor = "(Lkf;II)V", + garbageValue = "-1970476156" ) @Export("decode") public void decode(Buffer var1, int var2) { while (true) { - int var3 = var1.readUnsignedByte(); - if (var3 == 0) { - return; + int var3 = var1.readUnsignedByte(); // L: 28 + if (var3 == 0) { // L: 29 + return; // L: 32 } - this.decodeNext(var1, var3, var2); + this.decodeNext(var1, var3, var2); // L: 30 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;IIB)V", - garbageValue = "-93" + descriptor = "(Lkf;III)V", + garbageValue = "-789345955" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2, int var3) { - if (var2 == 1) { + if (var2 == 1) { // L: 35 this.rgb = var1.readMedium(); } - } + } // L: 37 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-14" + garbageValue = "39" ) @Export("setHsl") void setHsl(int var1) { - double var2 = (double)(var1 >> 16 & 255) / 256.0D; - double var4 = (double)(var1 >> 8 & 255) / 256.0D; - double var6 = (double)(var1 & 255) / 256.0D; - double var8 = var2; - if (var4 < var2) { + double var2 = (double)(var1 >> 16 & 255) / 256.0D; // L: 40 + double var4 = (double)(var1 >> 8 & 255) / 256.0D; // L: 41 + double var6 = (double)(var1 & 255) / 256.0D; // L: 42 + double var8 = var2; // L: 43 + if (var4 < var2) { // L: 44 var8 = var4; } - if (var6 < var8) { + if (var6 < var8) { // L: 45 var8 = var6; } - double var10 = var2; - if (var4 > var2) { + double var10 = var2; // L: 46 + if (var4 > var2) { // L: 47 var10 = var4; } - if (var6 > var10) { + if (var6 > var10) { // L: 48 var10 = var6; } - double var12 = 0.0D; - double var14 = 0.0D; - double var16 = (var10 + var8) / 2.0D; - if (var8 != var10) { - if (var16 < 0.5D) { - var14 = (var10 - var8) / (var8 + var10); + double var12 = 0.0D; // L: 49 + double var14 = 0.0D; // L: 50 + double var16 = (var8 + var10) / 2.0D; // L: 51 + if (var10 != var8) { // L: 52 + if (var16 < 0.5D) { // L: 53 + var14 = (var10 - var8) / (var10 + var8); } - if (var16 >= 0.5D) { + if (var16 >= 0.5D) { // L: 54 var14 = (var10 - var8) / (2.0D - var10 - var8); } - if (var2 == var10) { + if (var10 == var2) { // L: 55 var12 = (var4 - var6) / (var10 - var8); - } else if (var10 == var4) { - var12 = 2.0D + (var6 - var2) / (var10 - var8); + } else if (var10 == var4) { // L: 56 + var12 = (var6 - var2) / (var10 - var8) + 2.0D; } else if (var6 == var10) { - var12 = 4.0D + (var2 - var4) / (var10 - var8); + var12 = 4.0D + (var2 - var4) / (var10 - var8); // L: 57 } } - var12 /= 6.0D; - this.saturation = (int)(256.0D * var14); - this.lightness = (int)(256.0D * var16); - if (this.saturation < 0) { + var12 /= 6.0D; // L: 59 + this.saturation = (int)(var14 * 256.0D); // L: 60 + this.lightness = (int)(256.0D * var16); // L: 61 + if (this.saturation < 0) { // L: 62 this.saturation = 0; - } else if (this.saturation > 255) { + } else if (this.saturation > 255) { // L: 63 this.saturation = 255; } - if (this.lightness < 0) { + if (this.lightness < 0) { // L: 64 this.lightness = 0; - } else if (this.lightness > 255) { + } else if (this.lightness > 255) { // L: 65 this.lightness = 255; } - if (var16 > 0.5D) { - this.hueMultiplier = (int)(512.0D * var14 * (1.0D - var16)); + if (var16 > 0.5D) { // L: 66 + this.hueMultiplier = (int)(512.0D * (1.0D - var16) * var14); } else { - this.hueMultiplier = (int)(512.0D * var16 * var14); + this.hueMultiplier = (int)(512.0D * var14 * var16); // L: 67 } - if (this.hueMultiplier < 1) { + if (this.hueMultiplier < 1) { // L: 68 this.hueMultiplier = 1; } - this.hue = (int)((double)this.hueMultiplier * var12); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "([BI)Llz;", - garbageValue = "619951505" - ) - @Export("convertJpgToSprite") - public static final Sprite convertJpgToSprite(byte[] var0) { - BufferedImage var1 = null; - - try { - var1 = ImageIO.read(new ByteArrayInputStream(var0)); - int var2 = var1.getWidth(); - int var3 = var1.getHeight(); - int[] var4 = new int[var3 * var2]; - PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); - var5.grabPixels(); - return new Sprite(var4, var2, var3); - } catch (IOException var7) { - } catch (InterruptedException var8) { - } - - return new Sprite(0, 0); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;ZB)[B", - garbageValue = "101" - ) - public static byte[] method4613(Object var0, boolean var1) { - if (var0 == null) { - return null; - } else if (var0 instanceof byte[]) { - byte[] var3 = (byte[])((byte[])var0); - return var1 ? class195.method3748(var3) : var3; - } else if (var0 instanceof AbstractByteArrayCopier) { - AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; - return var2.get(); - } else { - throw new IllegalArgumentException(); - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Llf;ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1916318659" - ) - static String method4612(IterableNodeHashTable var0, int var1, String var2) { - if (var0 == null) { - return var2; - } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); - return var3 == null ? var2 : (String)var3.obj; - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IB)Z", - garbageValue = "3" - ) - static boolean method4608(String var0, int var1) { - return GrandExchangeOfferTotalQuantityComparator.method165(var0, var1, "openjs"); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "7" - ) - @Export("Widget_isItemContainer") - public static boolean Widget_isItemContainer(int var0) { - return (var0 >> 30 & 1) != 0; - } + this.hue = (int)((double)this.hueMultiplier * var12); // L: 69 + } // L: 70 } diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java index fe9daa81e3..ab8604e6b3 100644 --- a/runescape-client/src/main/java/Font.java +++ b/runescape-client/src/main/java/Font.java @@ -2,98 +2,98 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ko") +@ObfuscatedName("kr") @Implements("Font") public final class Font extends AbstractFont { public Font(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) { - super(var1, var2, var3, var4, var5, var6, var7); - } + super(var1, var2, var3, var4, var5, var6, var7); // L: 7 + } // L: 8 public Font(byte[] var1) { - super(var1); - } + super(var1); // L: 11 + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("drawGlyph") final void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; - int var8 = Rasterizer2D.Rasterizer2D_width - var4; - int var9 = 0; - int var10 = 0; + int var7 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 15 + int var8 = Rasterizer2D.Rasterizer2D_width - var4; // L: 16 + int var9 = 0; // L: 17 + int var10 = 0; // L: 18 int var11; - if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3; - var5 -= var11; - var3 = Rasterizer2D.Rasterizer2D_yClipStart; - var10 += var11 * var4; - var7 += var11 * Rasterizer2D.Rasterizer2D_width; + if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 19 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3; // L: 20 + var5 -= var11; // L: 21 + var3 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 22 + var10 += var11 * var4; // L: 23 + var7 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 24 } - if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 26 var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2; - var4 -= var11; - var2 = Rasterizer2D.Rasterizer2D_xClipStart; - var10 += var11; - var7 += var11; - var9 += var11; - var8 += var11; + if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 27 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2; // L: 28 + var4 -= var11; // L: 29 + var2 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 30 + var10 += var11; // L: 31 + var7 += var11; // L: 32 + var9 += var11; // L: 33 + var8 += var11; // L: 34 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; - var4 -= var11; - var9 += var11; - var8 += var11; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 36 + var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 37 + var4 -= var11; // L: 38 + var9 += var11; // L: 39 + var8 += var11; // L: 40 } - if (var4 > 0 && var5 > 0) { - AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); + if (var4 > 0 && var5 > 0) { // L: 42 + AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9); // L: 43 } - } + } // L: 44 - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("drawGlyphAlpha") final void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; - int var9 = Rasterizer2D.Rasterizer2D_width - var4; - int var10 = 0; - int var11 = 0; + int var8 = var3 * Rasterizer2D.Rasterizer2D_width + var2; // L: 47 + int var9 = Rasterizer2D.Rasterizer2D_width - var4; // L: 48 + int var10 = 0; // L: 49 + int var11 = 0; // L: 50 int var12; - if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { - var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3; - var5 -= var12; - var3 = Rasterizer2D.Rasterizer2D_yClipStart; - var11 += var12 * var4; - var8 += var12 * Rasterizer2D.Rasterizer2D_width; + if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 51 + var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3; // L: 52 + var5 -= var12; // L: 53 + var3 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 54 + var11 += var12 * var4; // L: 55 + var8 += var12 * Rasterizer2D.Rasterizer2D_width; // L: 56 } - if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 58 var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { - var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2; - var4 -= var12; - var2 = Rasterizer2D.Rasterizer2D_xClipStart; - var11 += var12; - var8 += var12; - var10 += var12; - var9 += var12; + if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 59 + var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2; // L: 60 + var4 -= var12; // L: 61 + var2 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 62 + var11 += var12; // L: 63 + var8 += var12; // L: 64 + var10 += var12; // L: 65 + var9 += var12; // L: 66 } - if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; - var4 -= var12; - var10 += var12; - var9 += var12; + if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 68 + var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 69 + var4 -= var12; // L: 70 + var10 += var12; // L: 71 + var9 += var12; // L: 72 } - if (var4 > 0 && var5 > 0) { - AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); + if (var4 > 0 && var5 > 0) { // L: 74 + AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7); // L: 75 } - } + } // L: 76 } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index a322aa82a5..b6bc58c191 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -1,155 +1,133 @@ -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ke") +@ObfuscatedName("kz") @Implements("FontName") public class FontName { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkz;" ) @Export("FontName_plain11") public static final FontName FontName_plain11; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkz;" ) @Export("FontName_plain12") public static final FontName FontName_plain12; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkz;" ) @Export("FontName_bold12") public static final FontName FontName_bold12; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkz;" ) @Export("FontName_verdana11") public static final FontName FontName_verdana11; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkz;" ) @Export("FontName_verdana13") public static final FontName FontName_verdana13; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkz;" ) @Export("FontName_verdana15") public static final FontName FontName_verdana15; - @ObfuscatedName("n") + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 334630663 + ) + @Export("clientTickTimeIdx") + static int clientTickTimeIdx; + @ObfuscatedName("eo") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive20") + static Archive archive20; + @ObfuscatedName("gg") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("redHintArrowSprite") + static Sprite redHintArrowSprite; + @ObfuscatedName("x") @Export("name") String name; static { - FontName_plain11 = new FontName("p11_full"); - FontName_plain12 = new FontName("p12_full"); - FontName_bold12 = new FontName("b12_full"); - FontName_verdana11 = new FontName("verdana_11pt_regular"); - FontName_verdana13 = new FontName("verdana_13pt_regular"); - FontName_verdana15 = new FontName("verdana_15pt_regular"); + FontName_plain11 = new FontName("p11_full"); // L: 7 + FontName_plain12 = new FontName("p12_full"); // L: 8 + FontName_bold12 = new FontName("b12_full"); // L: 9 + FontName_verdana11 = new FontName("verdana_11pt_regular"); // L: 10 + FontName_verdana13 = new FontName("verdana_13pt_regular"); // L: 11 + FontName_verdana15 = new FontName("verdana_15pt_regular"); // L: 12 } FontName(String var1) { - this.name = var1; + this.name = var1; // L: 20 + } // L: 21 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)[Lkz;", + garbageValue = "1417653903" + ) + public static FontName[] method5439() { + return new FontName[]{FontName_verdana13, FontName_verdana15, FontName_verdana11, FontName_plain12, FontName_plain11, FontName_bold12}; // L: 16 } - @ObfuscatedName("u") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)Lch;", - garbageValue = "-18" + descriptor = "(Ljava/lang/String;II)Z", + garbageValue = "-1097380872" ) - @Export("worldListStart") - static World worldListStart() { - World.World_listCount = 0; - return class3.getNextWorldListWorld(); + static boolean method5444(String var0, int var1) { + return WorldMapIcon_1.method380(var0, var1, "openjs"); // L: 57 } - @ObfuscatedName("w") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lhd;II)V", - garbageValue = "1462159307" + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "1161805725" ) - @Export("Widget_setKeyIgnoreHeld") - static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { - if (var0.field2647 == null) { - throw new RuntimeException(); + public static String method5445(CharSequence var0) { + return ScriptEvent.method1236('*', var0.length()); // L: 179 + } + + @ObfuscatedName("fo") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1773491987" + ) + @Export("setWindowedMode") + static void setWindowedMode(int var0) { + Client.field890 = 0L; // L: 3866 + if (var0 >= 2) { // L: 3867 + Client.isResizable = true; } else { - if (var0.field2723 == null) { - var0.field2723 = new int[var0.field2647.length]; - } - - var0.field2723[var1] = Integer.MAX_VALUE; + Client.isResizable = false; // L: 3868 } - } - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Lfm;III)Ldt;", - garbageValue = "273987431" - ) - public static final PcmPlayer method5519(TaskHandler var0, int var1, int var2) { - if (class237.field3113 == 0) { - throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { - if (var2 < 256) { - var2 = 256; - } - - try { - PcmPlayer var3 = HealthBarUpdate.pcmPlayerProvider.player(); - var3.samples = new int[256 * (Messages.PcmPlayer_stereo ? 2 : 1)]; - var3.field1443 = var2; - var3.init(); - var3.capacity = (var2 & -1024) + 1024; - if (var3.capacity > 16384) { - var3.capacity = 16384; - } - - var3.open(var3.capacity); - if (UserComparator3.field2009 > 0 && PcmPlayer.soundSystem == null) { - PcmPlayer.soundSystem = new SoundSystem(); - class227.soundSystemExecutor = Executors.newScheduledThreadPool(1); - class227.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); - } - - if (PcmPlayer.soundSystem != null) { - if (PcmPlayer.soundSystem.players[var1] != null) { - throw new IllegalArgumentException(); - } - - PcmPlayer.soundSystem.players[var1] = var3; - } - - return var3; - } catch (Throwable var4) { - return new PcmPlayer(); - } + if (class39.getWindowedMode() == 1) { // L: 3869 + class2.client.setMaxCanvasSize(765, 503); // L: 3870 } else { - throw new IllegalArgumentException(); + class2.client.setMaxCanvasSize(7680, 2160); // L: 3873 } - } - @ObfuscatedName("hk") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1542752856" - ) - @Export("addCancelMenuEntry") - static void addCancelMenuEntry() { - Client.menuOptionsCount = 0; - Client.isMenuOpen = false; - Client.menuActions[0] = "Cancel"; - Client.menuTargets[0] = ""; - Client.menuOpcodes[0] = 1006; - Client.menuShiftClick[0] = false; - Client.menuOptionsCount = 1; - } + if (Client.gameState >= 25) { // L: 3875 + GrandExchangeEvent.method160(); + } + + } // L: 3876 } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index 5c7f7ab3d0..dca658e4a2 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -4,31 +4,22 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kv") +@ObfuscatedName("kl") @Implements("Fonts") public class Fonts { - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Llh;" - ) - @Export("titlebuttonSprite") - static IndexedSprite titlebuttonSprite; - @ObfuscatedName("a") - @Export("ByteArrayPool_arrays") - static byte[][][] ByteArrayPool_arrays; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("spritesArchive") AbstractArchive spritesArchive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("fontsArchive") AbstractArchive fontsArchive; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("map") HashMap map; @@ -36,39 +27,34 @@ public class Fonts { descriptor = "(Lic;Lic;)V" ) public Fonts(AbstractArchive var1, AbstractArchive var2) { - this.spritesArchive = var1; - this.fontsArchive = var2; - this.map = new HashMap(); - } + this.spritesArchive = var1; // L: 14 + this.fontsArchive = var2; // L: 15 + this.map = new HashMap(); // L: 16 + } // L: 17 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([Lke;B)Ljava/util/HashMap;", - garbageValue = "-100" + descriptor = "([Lkz;I)Ljava/util/HashMap;", + garbageValue = "376087905" ) @Export("createMap") public HashMap createMap(FontName[] var1) { - HashMap var2 = new HashMap(); - FontName[] var3 = var1; + HashMap var2 = new HashMap(); // L: 20 + FontName[] var3 = var1; // L: 22 - for (int var4 = 0; var4 < var3.length; ++var4) { - FontName var5 = var3[var4]; - if (this.map.containsKey(var5)) { - var2.put(var5, this.map.get(var5)); + for (int var4 = 0; var4 < var3.length; ++var4) { // L: 23 + FontName var5 = var3[var4]; // L: 24 + if (this.map.containsKey(var5)) { // L: 26 + var2.put(var5, this.map.get(var5)); // L: 27 } else { - AbstractArchive var7 = this.spritesArchive; - AbstractArchive var8 = this.fontsArchive; - String var9 = var5.name; - int var10 = var7.getGroupId(var9); - int var11 = var7.getFileId(var10, ""); - Font var6 = Frames.method3394(var7, var8, var10, var11); - if (var6 != null) { - this.map.put(var5, var6); - var2.put(var5, var6); + Font var6 = BufferedSink.method5983(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30 + if (var6 != null) { // L: 31 + this.map.put(var5, var6); // L: 32 + var2.put(var5, var6); // L: 33 } } } - return var2; + return var2; // L: 39 } } diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index 991beb0911..2e5083f522 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -1,19 +1,18 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eg") +@ObfuscatedName("ef") @Implements("Frames") public class Frames extends DualNode { - @ObfuscatedName("lc") - @ObfuscatedGetter( - intValue = -2096850733 + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lak;" ) - @Export("menuY") - static int menuY; - @ObfuscatedName("m") + @Export("worldMapEvent") + static WorldMapEvent worldMapEvent; + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "[Les;" ) @@ -21,239 +20,146 @@ public class Frames extends DualNode { Animation[] frames; @ObfuscatedSignature( - descriptor = "(Lic;Lic;IZ)V", - garbageValue = "0" + descriptor = "(Lic;Lic;IZ)V" ) - public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { + Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) { NodeDeque var5 = new NodeDeque(); int var6 = var1.getGroupFileCount(var3); this.frames = new Animation[var6]; int[] var7 = var1.getGroupFileIds(var3); for (int var8 = 0; var8 < var7.length; ++var8) { - byte[] var9 = var1.takeFile(var3, var7[var8]); - Skeleton var10 = null; - int var11 = (var9[0] & 255) << 8 | var9[1] & 255; + byte[] var9 = var1.takeFile(var3, var7[var8]); // L: 40 + Skeleton var10 = null; // L: 41 + int var11 = (var9[0] & 255) << 8 | var9[1] & 255; // L: 42 - for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { - if (var11 == var12.id) { - var10 = var12; + for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) { // L: 43 44 49 + if (var11 == var12.id) { // L: 45 + var10 = var12; // L: 46 break; } } - if (var10 == null) { - byte[] var13 = var2.getFile(var11, 0); - var10 = new Skeleton(var11, var13); - var5.addFirst(var10); + if (var10 == null) { // L: 51 + byte[] var13; + if (var4) { // L: 53 + var13 = var2.getFile(0, var11); + } else { + var13 = var2.getFile(var11, 0); // L: 54 + } + + var10 = new Skeleton(var11, var13); // L: 55 + var5.addFirst(var10); // L: 56 } - this.frames[var7[var8]] = new Animation(var9, var10); + this.frames[var7[var8]] = new Animation(var9, var10); // L: 58 } - } + } // L: 60 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-107" + descriptor = "(II)Z", + garbageValue = "-615268512" ) @Export("hasAlphaTransform") public boolean hasAlphaTransform(int var1) { - return this.frames[var1].hasAlphaTransform; + return this.frames[var1].hasAlphaTransform; // L: 63 } - @ObfuscatedName("m") - public static String method3398(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (var0 % 37L == 0L) { - return null; + @ObfuscatedName("z") + public static final int method3395(double var0, double var2, double var4) { + double var6 = var4; // L: 9 + double var8 = var4; // L: 10 + double var10 = var4; // L: 11 + if (0.0D != var2) { // L: 12 + double var12; + if (var4 < 0.5D) { // L: 14 + var12 = (var2 + 1.0D) * var4; } else { - int var2 = 0; - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5 = new StringBuilder(var2); - - while (0L != var0) { - long var6 = var0; - var0 /= 37L; - var5.append(class298.base37Table[(int)(var6 - var0 * 37L)]); - } - - return var5.reverse().toString(); - } - } else { - return null; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(CLgz;I)C", - garbageValue = "-959977971" - ) - @Export("standardizeChar") - static char standardizeChar(char var0, Language var1) { - if (var0 >= 192 && var0 <= 255) { - if (var0 >= 192 && var0 <= 198) { - return 'A'; + var12 = var4 + var2 - var2 * var4; // L: 15 } - if (var0 == 199) { - return 'C'; + double var14 = var4 * 2.0D - var12; // L: 16 + double var16 = 0.3333333333333333D + var0; // L: 17 + if (var16 > 1.0D) { // L: 18 + --var16; } - if (var0 >= 200 && var0 <= 203) { - return 'E'; + double var20 = var0 - 0.3333333333333333D; // L: 20 + if (var20 < 0.0D) { // L: 21 + ++var20; } - if (var0 >= 204 && var0 <= 207) { - return 'I'; - } - - if (var0 == 209 && var1 != Language.Language_ES) { - return 'N'; - } - - if (var0 >= 210 && var0 <= 214) { - return 'O'; - } - - if (var0 >= 217 && var0 <= 220) { - return 'U'; - } - - if (var0 == 221) { - return 'Y'; - } - - if (var0 == 223) { - return 's'; - } - - if (var0 >= 224 && var0 <= 230) { - return 'a'; - } - - if (var0 == 231) { - return 'c'; - } - - if (var0 >= 232 && var0 <= 235) { - return 'e'; - } - - if (var0 >= 236 && var0 <= 239) { - return 'i'; - } - - if (var0 == 241 && var1 != Language.Language_ES) { - return 'n'; - } - - if (var0 >= 242 && var0 <= 246) { - return 'o'; - } - - if (var0 >= 249 && var0 <= 252) { - return 'u'; - } - - if (var0 == 253 || var0 == 255) { - return 'y'; - } - } - - if (var0 == 338) { - return 'O'; - } else if (var0 == 339) { - return 'o'; - } else if (var0 == 376) { - return 'Y'; - } else { - return var0; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;III)Lko;", - garbageValue = "-2070991083" - ) - public static Font method3394(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - byte[] var5 = var0.takeFile(var2, var3); - boolean var4; - if (var5 == null) { - var4 = false; - } else { - class3.SpriteBuffer_decode(var5); - var4 = true; - } - - return !var4 ? null : class90.method2168(var1.takeFile(var2, var3)); - } - - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "150036680" - ) - static final void method3396() { - for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0.hitpoints > 0) { - --var0.hitpoints; - } - - if (var0.hitpoints == 0) { - if (var0.objectId >= 0) { - int var2 = var0.objectId; - int var3 = var0.field957; - ObjectDefinition var4 = Canvas.getObjectDefinition(var2); - if (var3 == 11) { - var3 = 10; - } - - if (var3 >= 5 && var3 <= 8) { - var3 = 4; - } - - boolean var1 = var4.method4786(var3); - if (!var1) { - continue; - } - } - - class1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.objectId, var0.field956, var0.field957); - var0.remove(); + if (var16 * 6.0D < 1.0D) { // L: 22 + var6 = var14 + 6.0D * (var12 - var14) * var16; + } else if (var16 * 2.0D < 1.0D) { // L: 23 + var6 = var12; + } else if (var16 * 3.0D < 2.0D) { // L: 24 + var6 = 6.0D * (var12 - var14) * (0.6666666666666666D - var16) + var14; } else { - if (var0.delay > 0) { - --var0.delay; - } + var6 = var14; // L: 25 + } - if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || class7.method97(var0.id, var0.field962))) { - class1.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field962); - var0.delay = -1; - if (var0.id == var0.objectId && var0.objectId == -1) { - var0.remove(); - } else if (var0.objectId == var0.id && var0.field956 == var0.orientation && var0.field957 == var0.field962) { - var0.remove(); - } - } + if (var0 * 6.0D < 1.0D) { // L: 26 + var8 = var14 + 6.0D * (var12 - var14) * var0; + } else if (2.0D * var0 < 1.0D) { // L: 27 + var8 = var12; + } else if (3.0D * var0 < 2.0D) { // L: 28 + var8 = (0.6666666666666666D - var0) * (var12 - var14) * 6.0D + var14; + } else { + var8 = var14; // L: 29 + } + + if (6.0D * var20 < 1.0D) { // L: 30 + var10 = var14 + (var12 - var14) * 6.0D * var20; + } else if (2.0D * var20 < 1.0D) { // L: 31 + var10 = var12; + } else if (3.0D * var20 < 2.0D) { // L: 32 + var10 = 6.0D * (0.6666666666666666D - var20) * (var12 - var14) + var14; + } else { + var10 = var14; // L: 33 } } + int var22 = (int)(var6 * 256.0D); // L: 35 + int var13 = (int)(256.0D * var8); // L: 36 + int var23 = (int)(var10 * 256.0D); // L: 37 + int var15 = var23 + (var13 << 8) + (var22 << 16); // L: 38 + return var15; // L: 39 } - @ObfuscatedName("ku") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-179061034" + descriptor = "(II)I", + garbageValue = "-500804162" ) - static final void method3399() { - Client.field943 = Client.cycleCntr; - class4.ClanChat_inClanChat = true; + @Export("getEntityIdUnderMouse") + public static int getEntityIdUnderMouse(int var0) { + return UserComparator9.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); // L: 72 } + + @ObfuscatedName("js") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "2077943773" + ) + @Export("clanKickUser") + static final void clanKickUser(String var0) { + if (Entity.clanChat != null) { // L: 10687 + PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); // L: 10688 + var1.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var0)); // L: 10689 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 10690 + Client.packetWriter.addNode(var1); // L: 10691 + } + } // L: 10692 + + @ObfuscatedName("kz") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "127790133" + ) + static void method3393(int var0) { + Client.oculusOrbState = var0; // L: 10876 + } // L: 10877 } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 19ec1b64eb..25dc48b3e0 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -3,76 +3,56 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kl") +@ObfuscatedName("kc") @Implements("Friend") public class Friend extends Buddy { - @ObfuscatedName("m") - boolean field3655; - @ObfuscatedName("o") - boolean field3654; + @ObfuscatedName("z") + boolean field3651; + @ObfuscatedName("k") + boolean field3652; Friend() { - } + } // L: 9 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkl;I)I", - garbageValue = "-1139109616" + descriptor = "(Lkc;I)I", + garbageValue = "1550059745" ) @Export("compareToFriend") int compareToFriend(Friend var1) { - if (super.world == Client.worldId && Client.worldId != var1.world) { + if (super.world == Client.worldId && Client.worldId != var1.world) { // L: 12 return -1; - } else if (Client.worldId == var1.world && super.world != Client.worldId) { + } else if (Client.worldId == var1.world && super.world != Client.worldId) { // L: 13 return 1; - } else if (super.world != 0 && var1.world == 0) { + } else if (super.world != 0 && var1.world == 0) { // L: 14 return -1; - } else if (var1.world != 0 && super.world == 0) { + } else if (var1.world != 0 && super.world == 0) { // L: 15 return 1; - } else if (this.field3655 && !var1.field3655) { + } else if (this.field3651 && !var1.field3651) { // L: 16 return -1; - } else if (!this.field3655 && var1.field3655) { + } else if (!this.field3651 && var1.field3651) { // L: 17 return 1; - } else if (this.field3654 && !var1.field3654) { + } else if (this.field3652 && !var1.field3652) { // L: 18 return -1; - } else if (!this.field3654 && var1.field3654) { + } else if (!this.field3652 && var1.field3652) { // L: 19 return 1; } else { - return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; + return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; // L: 20 21 24 } } - @ObfuscatedName("ah") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljf;I)I", - garbageValue = "334051838" + descriptor = "(Ljc;I)I", + garbageValue = "-243007320" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.compareToFriend((Friend)var1); + return this.compareToFriend((Friend)var1); // L: 29 } public int compareTo(Object var1) { - return this.compareToFriend((Friend)var1); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lch;I)V", - garbageValue = "-463373379" - ) - @Export("changeWorld") - static void changeWorld(World var0) { - if (var0.isMembersOnly() != Client.isMembersWorld) { - Client.isMembersWorld = var0.isMembersOnly(); - InvDefinition.method4523(var0.isMembersOnly()); - } - - class169.worldHost = var0.host; - Client.worldId = var0.id; - Client.worldProperties = var0.properties; - class90.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; - Client.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; - WorldMapLabel.port3 = class90.port1; + return this.compareToFriend((Friend)var1); // L: 33 } } diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java index e3a3c7f93a..8154cd8ccc 100644 --- a/runescape-client/src/main/java/FriendLoginUpdate.java +++ b/runescape-client/src/main/java/FriendLoginUpdate.java @@ -4,128 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kd") +@ObfuscatedName("kb") @Implements("FriendLoginUpdate") public class FriendLoginUpdate extends Link { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lfb;" - ) - @Export("clock") - protected static Clock clock; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1885881665 + intValue = -1710257939 ) - public int field3667; - @ObfuscatedName("j") + public int field3664; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lku;" ) @Export("username") public Username username; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("world") public short world; @ObfuscatedSignature( - descriptor = "(Lkq;I)V" + descriptor = "(Lku;I)V" ) FriendLoginUpdate(Username var1, int var2) { - this.field3667 = (int)(MilliClock.currentTimeMillis() / 1000L); - this.username = var1; - this.world = (short)var2; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgz;I)I", - garbageValue = "1283981780" - ) - @Export("compareStrings") - public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { - int var3 = var0.length(); - int var4 = var1.length(); - int var5 = 0; - int var6 = 0; - char var7 = 0; - char var8 = 0; - - while (var5 - var7 < var3 || var6 - var8 < var4) { - if (var5 - var7 >= var3) { - return -1; - } - - if (var6 - var8 >= var4) { - return 1; - } - - char var9; - if (var7 != 0) { - var9 = var7; - boolean var14 = false; - } else { - var9 = var0.charAt(var5++); - } - - char var10; - if (var8 != 0) { - var10 = var8; - boolean var15 = false; - } else { - var10 = var1.charAt(var6++); - } - - var7 = ModelData0.method3374(var9); - var8 = ModelData0.method3374(var10); - var9 = Frames.standardizeChar(var9, var2); - var10 = Frames.standardizeChar(var10, var2); - if (var10 != var9 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { - var9 = Character.toLowerCase(var9); - var10 = Character.toLowerCase(var10); - if (var10 != var9) { - return class1.lowercaseChar(var9, var2) - class1.lowercaseChar(var10, var2); - } - } - } - - int var16 = Math.min(var3, var4); - - char var12; - int var17; - for (var17 = 0; var17 < var16; ++var17) { - if (var2 == Language.Language_FR) { - var5 = var3 - 1 - var17; - var6 = var4 - 1 - var17; - } else { - var6 = var17; - var5 = var17; - } - - char var11 = var0.charAt(var5); - var12 = var1.charAt(var6); - if (var12 != var11 && Character.toUpperCase(var11) != Character.toUpperCase(var12)) { - var11 = Character.toLowerCase(var11); - var12 = Character.toLowerCase(var12); - if (var11 != var12) { - return class1.lowercaseChar(var11, var2) - class1.lowercaseChar(var12, var2); - } - } - } - - var17 = var3 - var4; - if (var17 != 0) { - return var17; - } else { - for (int var18 = 0; var18 < var16; ++var18) { - var12 = var0.charAt(var18); - char var13 = var1.charAt(var18); - if (var12 != var13) { - return class1.lowercaseChar(var12, var2) - class1.lowercaseChar(var13, var2); - } - } - - return 0; - } - } + this.field3664 = (int)(PacketWriter.currentTimeMillis() / 1000L); // L: 106 + this.username = var1; // L: 107 + this.world = (short)var2; // L: 108 + } // L: 109 } diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index b0a6afbb9c..c7a4444652 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -1,335 +1,542 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cg") +@ObfuscatedName("cr") @Implements("FriendSystem") public class FriendSystem { - @ObfuscatedName("q") - @ObfuscatedGetter( - longValue = 6990585350022661681L - ) - public static long field1093; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lki;" + descriptor = "Lkw;" ) @Export("friendsList") public final FriendsList friendsList; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Ljw;" + descriptor = "Ljs;" ) @Export("ignoreList") public final IgnoreList ignoreList; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 132482079 + intValue = 1061950327 ) - int field1094; + int field1099; @ObfuscatedSignature( - descriptor = "(Lmo;)V" + descriptor = "(Lmu;)V" ) FriendSystem(LoginType var1) { - this.field1094 = 0; - this.loginType = var1; - this.friendsList = new FriendsList(var1); - this.ignoreList = new IgnoreList(var1); - } + this.field1099 = 0; // L: 23 + this.loginType = var1; // L: 26 + this.friendsList = new FriendsList(var1); // L: 27 + this.ignoreList = new IgnoreList(var1); // L: 28 + } // L: 29 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-100444560" + garbageValue = "-1895979589" ) - boolean method1923() { - return this.field1094 == 2; + boolean method1972() { + return this.field1099 == 2; // L: 32 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-20972" + descriptor = "(I)V", + garbageValue = "1001513486" ) - final void method1981() { - this.field1094 = 1; + final void method1919() { + this.field1099 = 1; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "-11966056" + descriptor = "(Lkf;IS)V", + garbageValue = "-279" ) @Export("readUpdate") final void readUpdate(Buffer var1, int var2) { - this.friendsList.read(var1, var2); - this.field1094 = 2; + this.friendsList.read(var1, var2); // L: 40 + this.field1099 = 2; // L: 41 - for (int var3 = 0; var3 < Players.Players_count; ++var3) { - Player var4 = Client.players[Players.Players_indices[var3]]; - var4.clearIsFriend(); + for (int var3 = 0; var3 < Players.Players_count; ++var3) { // L: 43 + Player var4 = Client.players[Players.Players_indices[var3]]; // L: 44 + var4.clearIsFriend(); // L: 45 } - Iterator var5 = Messages.Messages_hashTable.iterator(); - - while (var5.hasNext()) { - Message var6 = (Message)var5.next(); - var6.clearIsFromFriend(); + class89.method2127(); // L: 47 + if (Entity.clanChat != null) { // L: 48 + Entity.clanChat.clearFriends(); // L: 49 } - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.clearFriends(); - } + } // L: 52 - } - - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "892305960" + garbageValue = "1616251932" ) @Export("processFriendUpdates") final void processFriendUpdates() { - for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { - if ((long)var1.field3667 < MilliClock.currentTimeMillis() / 1000L - 5L) { + for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) { // L: 55 + if ((long)var1.field3664 < PacketWriter.currentTimeMillis() / 1000L - 5L) { // L: 56 if (var1.world > 0) { - ObjectSound.addGameMessage(5, "", var1.username + " has logged in."); + WorldMapRectangle.addGameMessage(5, "", var1.username + " has logged in."); // L: 57 } - if (var1.world == 0) { - ObjectSound.addGameMessage(5, "", var1.username + " has logged out."); + if (var1.world == 0) { // L: 58 + WorldMapRectangle.addGameMessage(5, "", var1.username + " has logged out."); } - var1.remove(); + var1.remove(); // L: 59 } } - } + } // L: 62 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2071426788" + garbageValue = "16776960" ) @Export("clear") final void clear() { - this.field1094 = 0; - this.friendsList.clear(); - this.ignoreList.clear(); - } + this.field1099 = 0; // L: 65 + this.friendsList.clear(); // L: 66 + this.ignoreList.clear(); // L: 67 + } // L: 68 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkq;ZI)Z", - garbageValue = "1031830697" + descriptor = "(Lku;ZB)Z", + garbageValue = "6" ) @Export("isFriended") final boolean isFriended(Username var1, boolean var2) { - if (var1 == null) { + if (var1 == null) { // L: 71 return false; - } else if (var1.equals(class60.localPlayer.username)) { + } else if (var1.equals(WorldMapLabelSize.localPlayer.username)) { // L: 72 return true; } else { - return this.friendsList.isFriended(var1, var2); - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lkq;B)Z", - garbageValue = "41" - ) - @Export("isIgnored") - final boolean isIgnored(Username var1) { - if (var1 == null) { - return false; - } else { - return this.ignoreList.contains(var1); - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1198783878" - ) - @Export("addFriend") - final void addFriend(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - if (this.friendsListIsFull()) { - AbstractWorldMapData.method328(); - } else if (class60.localPlayer.username.equals(var2)) { - WorldMapLabelSize.method249(); - } else if (this.isFriended(var2, false)) { - Canvas.method927(var1); - } else if (this.isIgnored(var2)) { - class7.method95(var1); - } else { - PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2336, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); - } - } - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "276950128" - ) - @Export("friendsListIsFull") - final boolean friendsListIsFull() { - return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field791 != 1; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "467200787" - ) - @Export("addIgnore") - final void addIgnore(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - Object var10000; - String var4; - if (this.canAddIgnore()) { - var10000 = null; - var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; - ObjectSound.addGameMessage(30, "", var4); - } else if (class60.localPlayer.username.equals(var2)) { - var10000 = null; - var4 = "You can't add yourself to your own ignore list"; - ObjectSound.addGameMessage(30, "", var4); - } else if (this.isIgnored(var2)) { - WorldMapSection1.method655(var1); - } else if (this.isFriended(var2, false)) { - TileItemPile.method2904(var1); - } else { - PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2316, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); - } - } - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-516025853" - ) - @Export("canAddIgnore") - final boolean canAddIgnore() { - return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field791 != 1; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-964450223" - ) - @Export("removeFriend") - final void removeFriend(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - if (this.friendsList.removeByUsername(var2)) { - Client.field866 = Client.cycleCntr; - PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2306, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); - } - - for (int var5 = 0; var5 < Players.Players_count; ++var5) { - Player var4 = Client.players[Players.Players_indices[var5]]; - var4.clearIsFriend(); - } - - Iterator var6 = Messages.Messages_hashTable.iterator(); - - while (var6.hasNext()) { - Message var7 = (Message)var6.next(); - var7.clearIsFromFriend(); - } - - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.clearFriends(); - } - - } - } - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1026417394" - ) - @Export("removeIgnore") - final void removeIgnore(String var1) { - if (var1 != null) { - Username var2 = new Username(var1, this.loginType); - if (var2.hasCleanName()) { - if (this.ignoreList.removeByUsername(var2)) { - Client.field866 = Client.cycleCntr; - PacketBufferNode var3 = UserComparator4.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); - var3.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var1)); - var3.packetBuffer.writeStringCp1252NullTerminated(var1); - Client.packetWriter.addNode(var3); - } - - WorldMapSprite.FriendSystem_invalidateIgnoreds(); - } + return this.friendsList.isFriended(var1, var2); // L: 73 } } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lkq;B)Z", - garbageValue = "-1" + descriptor = "(Lku;B)Z", + garbageValue = "-12" + ) + @Export("isIgnored") + final boolean isIgnored(Username var1) { + if (var1 == null) { // L: 78 + return false; + } else { + return this.ignoreList.contains(var1); // L: 79 + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "597249959" + ) + @Export("addFriend") + final void addFriend(String var1) { + if (var1 != null) { // L: 84 + Username var2 = new Username(var1, this.loginType); // L: 85 + if (var2.hasCleanName()) { // L: 86 + if (this.friendsListIsFull()) { // L: 87 + Object var10000 = null; // L: 89 + String var3 = "Your friend list is full. Max of 200 for free users, and 400 for members"; + WorldMapRectangle.addGameMessage(30, "", var3); // L: 91 + } else if (WorldMapLabelSize.localPlayer.username.equals(var2)) { // L: 96 + WorldMapSection1.method649(); // L: 97 + } else if (this.isFriended(var2, false)) { // L: 100 + ModelData0.method3377(var1); // L: 101 + } else if (this.isIgnored(var2)) { // L: 104 + WorldMapRegion.method609(var1); // L: 105 + } else { + UserComparator9.method3492(var1); // L: 108 + } + } + } + } // L: 94 98 102 106 109 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(S)Z", + garbageValue = "-12193" + ) + @Export("friendsListIsFull") + final boolean friendsListIsFull() { + return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field888 != 1; // L: 141 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1984933223" + ) + @Export("addIgnore") + final void addIgnore(String var1) { + if (var1 != null) { // L: 148 + Username var2 = new Username(var1, this.loginType); // L: 149 + if (var2.hasCleanName()) { // L: 150 + StringBuilder var10000; + String var4; + if (this.canAddIgnore()) { // L: 151 + var10000 = null; // L: 153 + var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members"; + WorldMapRectangle.addGameMessage(30, "", var4); // L: 155 + } else if (WorldMapLabelSize.localPlayer.username.equals(var2)) { // L: 160 + var10000 = null; // L: 162 + var4 = "You can't add yourself to your own ignore list"; + WorldMapRectangle.addGameMessage(30, "", var4); // L: 164 + } else { + Object var10001; + if (this.isIgnored(var2)) { // L: 169 + var10000 = (new StringBuilder()).append(var1); // L: 171 + var10001 = null; + var4 = var10000.append(" is already on your ignore list").toString(); + WorldMapRectangle.addGameMessage(30, "", var4); // L: 173 + } else if (this.isFriended(var2, false)) { // L: 178 + var10000 = new StringBuilder(); + var10001 = null; // L: 180 + var10000 = var10000.append("Please remove ").append(var1); + var10001 = null; + var4 = var10000.append(" from your friend list first").toString(); + WorldMapRectangle.addGameMessage(30, "", var4); // L: 182 + } else { + PacketBufferNode var3 = Client.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); // L: 189 + var3.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var1)); // L: 190 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 191 + Client.packetWriter.addNode(var3); // L: 192 + } + } + } + } + } // L: 158 167 176 185 194 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "61" + ) + @Export("canAddIgnore") + final boolean canAddIgnore() { + return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field888 != 1; // L: 197 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-1937520523" + ) + @Export("removeFriend") + final void removeFriend(String var1) { + if (var1 != null) { // L: 204 + Username var2 = new Username(var1, this.loginType); // L: 205 + if (var2.hasCleanName()) { // L: 206 + if (this.friendsList.removeByUsername(var2)) { // L: 207 + Client.field870 = Client.cycleCntr; // L: 209 + PacketBufferNode var3 = Client.getPacketBufferNode(ClientPacket.field2319, Client.packetWriter.isaacCipher); // L: 212 + var3.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var1)); // L: 213 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 214 + Client.packetWriter.addNode(var3); // L: 215 + } + + for (int var5 = 0; var5 < Players.Players_count; ++var5) { // L: 218 + Player var4 = Client.players[Players.Players_indices[var5]]; // L: 219 + var4.clearIsFriend(); // L: 220 + } + + class89.method2127(); // L: 222 + if (Entity.clanChat != null) { // L: 223 + Entity.clanChat.clearFriends(); // L: 224 + } + + } + } + } // L: 227 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1683783285" + ) + @Export("removeIgnore") + final void removeIgnore(String var1) { + if (var1 != null) { // L: 230 + Username var2 = new Username(var1, this.loginType); // L: 231 + if (var2.hasCleanName()) { // L: 232 + if (this.ignoreList.removeByUsername(var2)) { // L: 233 + Client.field870 = Client.cycleCntr; // L: 235 + PacketBufferNode var3 = Client.getPacketBufferNode(ClientPacket.field2322, Client.packetWriter.isaacCipher); // L: 238 + var3.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var1)); // L: 239 + var3.packetBuffer.writeStringCp1252NullTerminated(var1); // L: 240 + Client.packetWriter.addNode(var3); // L: 241 + } + + KitDefinition.FriendSystem_invalidateIgnoreds(); // L: 243 + } + } + } // L: 244 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(Lku;I)Z", + garbageValue = "-1919732460" ) @Export("isFriendAndHasWorld") final boolean isFriendAndHasWorld(Username var1) { - Friend var2 = (Friend)this.friendsList.getByUsername(var1); - return var2 != null && var2.hasWorld(); + Friend var2 = (Friend)this.friendsList.getByUsername(var1); // L: 256 + return var2 != null && var2.hasWorld(); // L: 257 } - @ObfuscatedName("kq") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lhd;B)Lhd;", - garbageValue = "74" + descriptor = "(II)Lie;", + garbageValue = "-2171031" ) - static Widget method1994(Widget var0) { - int var1 = WorldMapDecoration.method402(KeyHandler.getWidgetFlags(var0)); - if (var1 == 0) { - return null; + @Export("KitDefinition_get") + public static KitDefinition KitDefinition_get(int var0) { + KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); // L: 33 + if (var1 != null) { // L: 34 + return var1; } else { - for (int var2 = 0; var2 < var1; ++var2) { - var0 = WorldMapSprite.getWidget(var0.parentId); - if (var0 == null) { - return null; - } + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); // L: 35 + var1 = new KitDefinition(); // L: 36 + if (var2 != null) { // L: 37 + var1.decode(new Buffer(var2)); } - return var0; + KitDefinition.KitDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 + } + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIILgk;Lft;B)Z", + garbageValue = "6" + ) + static final boolean method1976(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { + int var5 = var0; // L: 308 + int var6 = var1; // L: 309 + byte var7 = 64; // L: 310 + byte var8 = 64; // L: 311 + int var9 = var0 - var7; // L: 312 + int var10 = var1 - var8; // L: 313 + class182.directions[var7][var8] = 99; // L: 314 + class182.distances[var7][var8] = 0; // L: 315 + byte var11 = 0; // L: 316 + int var12 = 0; // L: 317 + class182.bufferX[var11] = var0; // L: 318 + int var20 = var11 + 1; + class182.bufferY[var11] = var1; // L: 319 + int[][] var13 = var4.flags; // L: 320 + + while (true) { + label311: + while (true) { + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + do { + do { + do { + label288: + do { + if (var20 == var12) { // L: 321 + class182.field2135 = var5; // L: 440 + class182.field2136 = var6; // L: 441 + return false; // L: 442 + } + + var5 = class182.bufferX[var12]; // L: 322 + var6 = class182.bufferY[var12]; // L: 323 + var12 = var12 + 1 & 4095; // L: 324 + var18 = var5 - var9; // L: 325 + var19 = var6 - var10; // L: 326 + var14 = var5 - var4.xInset; // L: 327 + var15 = var6 - var4.yInset; // L: 328 + if (var3.hasArrived(var2, var5, var6, var4)) { // L: 329 + class182.field2135 = var5; // L: 330 + class182.field2136 = var6; // L: 331 + return true; // L: 332 + } + + var16 = class182.distances[var18][var19] + 1; // L: 334 + if (var18 > 0 && class182.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { // L: 335 336 337 338 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class182.bufferX[var20] = var5 - 1; // L: 342 + class182.bufferY[var20] = var6; // L: 343 + var20 = var20 + 1 & 4095; // L: 344 + class182.directions[var18 - 1][var19] = 2; // L: 345 + class182.distances[var18 - 1][var19] = var16; // L: 346 + break; + } + + if ((var13[var14 - 1][var17 + var15] & 19136830) != 0) { // L: 340 + break; + } + + ++var17; // L: 339 + } + } + + if (var18 < 128 - var2 && class182.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { // L: 348 349 350 351 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class182.bufferX[var20] = var5 + 1; // L: 355 + class182.bufferY[var20] = var6; // L: 356 + var20 = var20 + 1 & 4095; // L: 357 + class182.directions[var18 + 1][var19] = 8; // L: 358 + class182.distances[var18 + 1][var19] = var16; // L: 359 + break; + } + + if ((var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 353 + break; + } + + ++var17; // L: 352 + } + } + + if (var19 > 0 && class182.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { // L: 361 362 363 364 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class182.bufferX[var20] = var5; // L: 368 + class182.bufferY[var20] = var6 - 1; // L: 369 + var20 = var20 + 1 & 4095; // L: 370 + class182.directions[var18][var19 - 1] = 1; // L: 371 + class182.distances[var18][var19 - 1] = var16; // L: 372 + break; + } + + if ((var13[var17 + var14][var15 - 1] & 19136911) != 0) { // L: 366 + break; + } + + ++var17; // L: 365 + } + } + + if (var19 < 128 - var2 && class182.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { // L: 374 375 376 377 + var17 = 1; + + while (true) { + if (var17 >= var2 - 1) { + class182.bufferX[var20] = var5; // L: 381 + class182.bufferY[var20] = var6 + 1; // L: 382 + var20 = var20 + 1 & 4095; // L: 383 + class182.directions[var18][var19 + 1] = 4; // L: 384 + class182.distances[var18][var19 + 1] = var16; // L: 385 + break; + } + + if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { // L: 379 + break; + } + + ++var17; // L: 378 + } + } + + if (var18 > 0 && var19 > 0 && class182.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { // L: 387 388 389 + var17 = 1; + + while (true) { + if (var17 >= var2) { + class182.bufferX[var20] = var5 - 1; // L: 394 + class182.bufferY[var20] = var6 - 1; // L: 395 + var20 = var20 + 1 & 4095; // L: 396 + class182.directions[var18 - 1][var19 - 1] = 3; // L: 397 + class182.distances[var18 - 1][var19 - 1] = var16; // L: 398 + break; + } + + if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { // L: 391 392 + break; + } + + ++var17; // L: 390 + } + } + + if (var18 < 128 - var2 && var19 > 0 && class182.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { // L: 400 401 402 + var17 = 1; + + while (true) { + if (var17 >= var2) { + class182.bufferX[var20] = var5 + 1; // L: 407 + class182.bufferY[var20] = var6 - 1; // L: 408 + var20 = var20 + 1 & 4095; // L: 409 + class182.directions[var18 + 1][var19 - 1] = 9; // L: 410 + class182.distances[var18 + 1][var19 - 1] = var16; // L: 411 + break; + } + + if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { // L: 404 405 + break; + } + + ++var17; // L: 403 + } + } + + if (var18 > 0 && var19 < 128 - var2 && class182.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { // L: 413 414 415 + for (var17 = 1; var17 < var2; ++var17) { // L: 416 + if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { // L: 417 418 + continue label288; + } + } + + class182.bufferX[var20] = var5 - 1; // L: 420 + class182.bufferY[var20] = var6 + 1; // L: 421 + var20 = var20 + 1 & 4095; // L: 422 + class182.directions[var18 - 1][var19 + 1] = 6; // L: 423 + class182.distances[var18 - 1][var19 + 1] = var16; // L: 424 + } + } while(var18 >= 128 - var2); // L: 426 + } while(var19 >= 128 - var2); + } while(class182.directions[var18 + 1][var19 + 1] != 0); // L: 427 + } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); // L: 428 + + for (var17 = 1; var17 < var2; ++var17) { // L: 429 + if ((var13[var17 + var14][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { // L: 430 431 + continue label311; + } + } + + class182.bufferX[var20] = var5 + 1; // L: 433 + class182.bufferY[var20] = var6 + 1; // L: 434 + var20 = var20 + 1 & 4095; // L: 435 + class182.directions[var18 + 1][var19 + 1] = 12; // L: 436 + class182.distances[var18 + 1][var19 + 1] = var16; // L: 437 + } } } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index 5eaa841f21..915d771324 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -4,158 +4,158 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ki") +@ObfuscatedName("kw") @Implements("FriendsList") public class FriendsList extends UserList { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) @Export("loginType") final LoginType loginType; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -6873433 + intValue = 1472429845 ) - int field3648; - @ObfuscatedName("w") + int field3641; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Ljn;" + descriptor = "Ljb;" ) @Export("friendLoginUpdates") public LinkDeque friendLoginUpdates; @ObfuscatedSignature( - descriptor = "(Lmo;)V" + descriptor = "(Lmu;)V" ) public FriendsList(LoginType var1) { - super(400); - this.field3648 = 1; - this.friendLoginUpdates = new LinkDeque(); - this.loginType = var1; - } + super(400); // L: 17 + this.field3641 = 1; // L: 13 + this.friendLoginUpdates = new LinkDeque(); // L: 14 + this.loginType = var1; // L: 18 + } // L: 19 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Ljf;", - garbageValue = "551595115" + descriptor = "(B)Ljc;", + garbageValue = "35" ) @Export("newInstance") User newInstance() { - return new Friend(); + return new Friend(); // L: 22 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IB)[Ljc;", + garbageValue = "-19" + ) + @Export("newTypedArray") + User[] newTypedArray(int var1) { + return new Friend[var1]; // L: 26 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lku;ZI)Z", + garbageValue = "-1059654626" + ) + @Export("isFriended") + public boolean isFriended(Username var1, boolean var2) { + Friend var3 = (Friend)this.getByUsername(var1); // L: 30 + if (var3 == null) { + return false; // L: 31 + } else { + return !var2 || var3.world != 0; // L: 32 + } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)[Ljf;", - garbageValue = "1959965595" - ) - @Export("newTypedArray") - User[] newTypedArray(int var1) { - return new Friend[var1]; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lkq;ZI)Z", - garbageValue = "2027561031" - ) - @Export("isFriended") - public boolean isFriended(Username var1, boolean var2) { - Friend var3 = (Friend)this.getByUsername(var1); - if (var3 == null) { - return false; - } else { - return !var2 || var3.world != 0; - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "-1956355163" + descriptor = "(Lkf;II)V", + garbageValue = "-233603151" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - if (var1.offset < var2) { - boolean var3 = var1.readUnsignedByte() == 1; - Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - int var6 = var1.readUnsignedShort(); - int var7 = var1.readUnsignedByte(); - int var8 = var1.readUnsignedByte(); - boolean var9 = (var8 & 2) != 0; - boolean var10 = (var8 & 1) != 0; - if (var6 > 0) { - var1.readStringCp1252NullTerminated(); - var1.readUnsignedByte(); - var1.readInt(); + if (var1.offset < var2) { // L: 37 + boolean var3 = var1.readUnsignedByte() == 1; // L: 38 + Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 39 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 40 + int var6 = var1.readUnsignedShort(); // L: 41 + int var7 = var1.readUnsignedByte(); // L: 42 + int var8 = var1.readUnsignedByte(); // L: 43 + boolean var9 = (var8 & 2) != 0; // L: 44 + boolean var10 = (var8 & 1) != 0; // L: 45 + if (var6 > 0) { // L: 46 + var1.readStringCp1252NullTerminated(); // L: 47 + var1.readUnsignedByte(); // L: 48 + var1.readInt(); // L: 49 } - var1.readStringCp1252NullTerminated(); - if (var4 != null && var4.hasCleanName()) { - Friend var11 = (Friend)this.getByCurrentUsername(var4); - if (var3) { - Friend var12 = (Friend)this.getByCurrentUsername(var5); - if (var12 != null && var12 != var11) { - if (var11 != null) { - this.remove(var12); + var1.readStringCp1252NullTerminated(); // L: 51 + if (var4 != null && var4.hasCleanName()) { // L: 52 + Friend var11 = (Friend)this.getByCurrentUsername(var4); // L: 53 + if (var3) { // L: 54 + Friend var12 = (Friend)this.getByCurrentUsername(var5); // L: 55 + if (var12 != null && var12 != var11) { // L: 56 + if (var11 != null) { // L: 57 + this.remove(var12); // L: 58 } else { - var11 = var12; + var11 = var12; // L: 61 } } } - if (var11 != null) { - this.changeName(var11, var4, var5); - if (var6 != var11.world) { - boolean var14 = true; + if (var11 != null) { // L: 65 + this.changeName(var11, var4, var5); // L: 66 + if (var6 != var11.world) { // L: 67 + boolean var14 = true; // L: 68 - for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { - if (var13.username.equals(var4)) { - if (var6 != 0 && var13.world == 0) { - var13.remove(); - var14 = false; - } else if (var6 == 0 && var13.world != 0) { - var13.remove(); - var14 = false; + for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) { // L: 69 + if (var13.username.equals(var4)) { // L: 70 + if (var6 != 0 && var13.world == 0) { // L: 71 + var13.remove(); // L: 72 + var14 = false; // L: 73 + } else if (var6 == 0 && var13.world != 0) { // L: 75 + var13.remove(); // L: 76 + var14 = false; // L: 77 } } } - if (var14) { + if (var14) { // L: 81 this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6)); } } } else { - if (this.getSize() >= 400) { + if (this.getSize() >= 400) { // L: 84 continue; } - var11 = (Friend)this.addLast(var4, var5); + var11 = (Friend)this.addLast(var4, var5); // L: 85 } - if (var6 != var11.world) { - var11.int2 = ++this.field3648 - 1; - if (var11.world == -1 && var6 == 0) { - var11.int2 = -(var11.int2 * -1924610525) * 2013337995; + if (var6 != var11.world) { // L: 88 + var11.int2 = ++this.field3641 - 1; // L: 89 + if (var11.world == -1 && var6 == 0) { // L: 90 + var11.int2 = -(var11.int2 * 1706616033) * -224698591; } - var11.world = var6; + var11.world = var6; // L: 91 } - var11.rank = var7; - var11.field3655 = var9; - var11.field3654 = var10; - continue; + var11.rank = var7; // L: 93 + var11.field3651 = var9; // L: 94 + var11.field3652 = var10; // L: 95 + continue; // L: 96 } throw new IllegalStateException(); } - this.sort(); - return; + this.sort(); // L: 97 + return; // L: 98 } } } diff --git a/runescape-client/src/main/java/GZipDecompressor.java b/runescape-client/src/main/java/GZipDecompressor.java index 62d566883c..a166bf9adc 100644 --- a/runescape-client/src/main/java/GZipDecompressor.java +++ b/runescape-client/src/main/java/GZipDecompressor.java @@ -1,50 +1,57 @@ import java.util.zip.Inflater; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mu") +@ObfuscatedName("ma") @Implements("GZipDecompressor") public class GZipDecompressor { - @ObfuscatedName("m") + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -198974001 + ) + @Export("idxCount") + public static int idxCount; + @ObfuscatedName("z") @Export("inflater") Inflater inflater; - public GZipDecompressor() { - this(-1, 1000000, 1000000); - } - @ObfuscatedSignature( descriptor = "(III)V", garbageValue = "1000000" ) GZipDecompressor(int var1, int var2, int var3) { - } + } // L: 13 - @ObfuscatedName("m") + public GZipDecompressor() { + this(-1, 1000000, 1000000); // L: 10 + } // L: 11 + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;[BI)V", - garbageValue = "1767160394" + descriptor = "(Lkf;[BI)V", + garbageValue = "-322147255" ) @Export("decompress") public void decompress(Buffer var1, byte[] var2) { - if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { - if (this.inflater == null) { + if (var1.array[var1.offset] == 31 && var1.array[var1.offset + 1] == -117) { // L: 16 + if (this.inflater == null) { // L: 17 this.inflater = new Inflater(true); } try { - this.inflater.setInput(var1.array, var1.offset + 10, var1.array.length - (var1.offset + 8 + 10)); - this.inflater.inflate(var2); - } catch (Exception var4) { - this.inflater.reset(); - throw new RuntimeException(""); + this.inflater.setInput(var1.array, var1.offset + 10, var1.array.length - (var1.offset + 8 + 10)); // L: 19 + this.inflater.inflate(var2); // L: 20 + } catch (Exception var4) { // L: 22 + this.inflater.reset(); // L: 23 + throw new RuntimeException(""); // L: 24 } - this.inflater.reset(); + this.inflater.reset(); // L: 26 } else { throw new RuntimeException(""); } - } + } // L: 27 } diff --git a/runescape-client/src/main/java/GameBuild.java b/runescape-client/src/main/java/GameBuild.java index e3a9b356f6..4e349eeb0e 100644 --- a/runescape-client/src/main/java/GameBuild.java +++ b/runescape-client/src/main/java/GameBuild.java @@ -1,118 +1,253 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("ij") @Implements("GameBuild") public class GameBuild { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lij;" ) @Export("LIVE") - public static final GameBuild LIVE; - @ObfuscatedName("o") + static final GameBuild LIVE; + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lij;" ) @Export("BUILDLIVE") - public static final GameBuild BUILDLIVE; - @ObfuscatedName("q") + static final GameBuild BUILDLIVE; + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lij;" ) @Export("RC") - public static final GameBuild RC; - @ObfuscatedName("j") + static final GameBuild RC; + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lij;" ) @Export("WIP") - public static final GameBuild WIP; - @ObfuscatedName("du") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive13") - static Archive archive13; - @ObfuscatedName("p") + static final GameBuild WIP; + @ObfuscatedName("i") @Export("name") public final String name; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1136221783 + intValue = 1493317811 ) @Export("buildId") - public final int buildId; + final int buildId; static { - LIVE = new GameBuild("LIVE", 0); - BUILDLIVE = new GameBuild("BUILDLIVE", 3); - RC = new GameBuild("RC", 1); - WIP = new GameBuild("WIP", 2); + LIVE = new GameBuild("LIVE", 0); // L: 5 + BUILDLIVE = new GameBuild("BUILDLIVE", 3); // L: 6 + RC = new GameBuild("RC", 1); // L: 7 + WIP = new GameBuild("WIP", 2); // L: 8 } GameBuild(String var1, int var2) { - this.name = var1; - this.buildId = var2; + this.name = var1; // L: 17 + this.buildId = var2; // L: 18 + } // L: 19 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lic;III)[Llp;", + garbageValue = "-1533970303" + ) + public static Sprite[] method4214(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 55 + boolean var3; + if (var4 == null) { // L: 56 + var3 = false; // L: 57 + } else { + Occluder.SpriteBuffer_decode(var4); // L: 60 + var3 = true; // L: 61 + } + + if (!var3) { // L: 63 + return null; + } else { + Sprite[] var5 = new Sprite[class335.SpriteBuffer_spriteCount]; // L: 66 + + for (int var6 = 0; var6 < class335.SpriteBuffer_spriteCount; ++var6) { // L: 67 + Sprite var7 = var5[var6] = new Sprite(); // L: 68 + var7.width = class335.SpriteBuffer_spriteWidth; // L: 69 + var7.height = class335.SpriteBuffer_spriteHeight; // L: 70 + var7.xOffset = Username.SpriteBuffer_xOffsets[var6]; // L: 71 + var7.yOffset = class335.SpriteBuffer_yOffsets[var6]; // L: 72 + var7.subWidth = class335.SpriteBuffer_spriteWidths[var6]; // L: 73 + var7.subHeight = class335.SpriteBuffer_spriteHeights[var6]; // L: 74 + int var8 = var7.subWidth * var7.subHeight; // L: 75 + byte[] var9 = class92.SpriteBuffer_pixels[var6]; // L: 76 + var7.pixels = new int[var8]; // L: 77 + + for (int var10 = 0; var10 < var8; ++var10) { // L: 78 + var7.pixels[var10] = TaskHandler.SpriteBuffer_spritePalette[var9[var10] & 255]; + } + } + + Username.SpriteBuffer_xOffsets = null; // L: 81 + class335.SpriteBuffer_yOffsets = null; // L: 82 + class335.SpriteBuffer_spriteWidths = null; // L: 83 + class335.SpriteBuffer_spriteHeights = null; // L: 84 + TaskHandler.SpriteBuffer_spritePalette = null; // L: 85 + class92.SpriteBuffer_pixels = null; // L: 86 + return var5; // L: 90 + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "-1136402672" + ) + static int method4218(int var0, Script var1, boolean var2) { + int var3 = -1; // L: 497 + Widget var4; + if (var0 >= 2000) { // L: 499 + var0 -= 1000; // L: 500 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 501 + var4 = TileItem.getWidget(var3); // L: 502 + } else { + var4 = var2 ? Canvas.field438 : class3.field12; // L: 504 + } + + if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 505 + Interpreter.Interpreter_intStackSize -= 4; // L: 506 + var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 507 + var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 508 + var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 509 + var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 510 + class52.invalidateWidget(var4); // L: 511 + class2.client.alignWidget(var4); // L: 512 + if (var3 != -1 && var4.type == 0) { // L: 513 + class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 514 + } else if (var0 == ScriptOpcodes.CC_SETSIZE) { // L: 516 + Interpreter.Interpreter_intStackSize -= 4; // L: 517 + var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 518 + var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 519 + var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 520 + var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 521 + class52.invalidateWidget(var4); // L: 522 + class2.client.alignWidget(var4); // L: 523 + if (var3 != -1 && var4.type == 0) { // L: 524 + class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); + } + + return 1; // L: 525 + } else if (var0 == ScriptOpcodes.CC_SETHIDE) { // L: 527 + boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 528 + if (var5 != var4.isHidden) { // L: 529 + var4.isHidden = var5; // L: 530 + class52.invalidateWidget(var4); // L: 531 + } + + return 1; // L: 533 + } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { // L: 535 + var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 536 + return 1; // L: 537 + } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { // L: 539 + var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 540 + return 1; // L: 541 + } else { + return 2; // L: 543 + } } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)[Lgl;", - garbageValue = "-290108173" + descriptor = "(Lbw;B)V", + garbageValue = "30" ) - public static class194[] method4291() { - return new class194[]{class194.field2357, class194.field2354, class194.field2355, class194.field2358, class194.field2353, class194.field2360, class194.field2359, class194.field2363, class194.field2361, class194.field2362}; - } + static void method4217(GameShell var0) { + while (class60.isKeyDown()) { // L: 1647 + if (PlayerAppearance.field2581 == 13) { // L: 1648 + PacketBufferNode.method3726(); // L: 1649 + return; // L: 1650 + } - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)Ljava/io/File;", - garbageValue = "-93" - ) - @Export("getFile") - static File getFile(String var0) { - if (!FileSystem.FileSystem_hasPermissions) { - throw new RuntimeException(""); - } else { - File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(FileSystem.FileSystem_cacheDir, var0); - RandomAccessFile var3 = null; - - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - FileSystem.FileSystem_cacheFiles.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); + if (PlayerAppearance.field2581 == 96) { // L: 1652 + if (Login.worldSelectPage > 0 && WorldMapIcon_0.worldSelectLeftSprite != null) { // L: 1653 + --Login.worldSelectPage; // L: 1654 } + } else if (PlayerAppearance.field2581 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && ArchiveDiskActionHandler.worldSelectRightSprite != null) { // L: 1657 1658 + ++Login.worldSelectPage; // L: 1659 } } - } + + if (MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 1663 + int var1 = Login.xPadding + 280; // L: 1664 + if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1665 + AbstractWorldMapData.changeWorldSelectSorting(0, 0); // L: 1666 + return; // L: 1667 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1669 + AbstractWorldMapData.changeWorldSelectSorting(0, 1); // L: 1670 + return; // L: 1671 + } + + int var2 = Login.xPadding + 390; // L: 1673 + if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1674 + AbstractWorldMapData.changeWorldSelectSorting(1, 0); // L: 1675 + return; // L: 1676 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1678 + AbstractWorldMapData.changeWorldSelectSorting(1, 1); // L: 1679 + return; // L: 1680 + } + + int var3 = Login.xPadding + 500; // L: 1682 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1683 + AbstractWorldMapData.changeWorldSelectSorting(2, 0); // L: 1684 + return; // L: 1685 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1687 + AbstractWorldMapData.changeWorldSelectSorting(2, 1); // L: 1688 + return; // L: 1689 + } + + int var4 = Login.xPadding + 610; // L: 1691 + if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1692 + AbstractWorldMapData.changeWorldSelectSorting(3, 0); // L: 1693 + return; // L: 1694 + } + + if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) { // L: 1696 + AbstractWorldMapData.changeWorldSelectSorting(3, 1); // L: 1697 + return; // L: 1698 + } + + if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) { // L: 1700 + PacketBufferNode.method3726(); // L: 1701 + return; // L: 1702 + } + + if (Login.hoveredWorldIndex != -1) { // L: 1704 + World var5 = AbstractByteArrayCopier.World_worlds[Login.hoveredWorldIndex]; // L: 1705 + Canvas.changeWorld(var5); // L: 1706 + PacketBufferNode.method3726(); // L: 1707 + return; // L: 1708 + } + + if (Login.worldSelectPage > 0 && WorldMapIcon_0.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= WorldMapIcon_0.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) { // L: 1710 + --Login.worldSelectPage; // L: 1711 + } + + if (Login.worldSelectPage < Login.worldSelectPagesCount && ArchiveDiskActionHandler.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= FloorDecoration.canvasWidth - ArchiveDiskActionHandler.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= FloorDecoration.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= GameShell.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= GameShell.canvasHeight / 2 + 50) { // L: 1713 + ++Login.worldSelectPage; // L: 1714 + } + } + + } // L: 1717 } diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index cfebfa7743..fa97e106b8 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -4,111 +4,130 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ev") +@ObfuscatedName("ed") @Implements("GameObject") public final class GameObject { - @ObfuscatedName("di") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Llj;" - ) - @Export("js5Socket") - static AbstractSocket js5Socket; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1824184779 - ) - @Export("orientation") - int orientation; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1881172017 - ) - @Export("plane") - int plane; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1546680727 - ) - @Export("height") - int height; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -49650103 - ) - @Export("centerX") - int centerX; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -32489331 - ) - @Export("centerY") - int centerY; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lez;" ) @Export("entity") public Entity entity; - @ObfuscatedName("n") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -136322441 + intValue = -1221048069 + ) + @Export("plane") + int plane; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -530812325 + ) + @Export("height") + int height; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1973574069 + ) + @Export("centerX") + int centerX; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 589322861 + ) + @Export("centerY") + int centerY; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 2067900831 + ) + @Export("orientation") + int orientation; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -37489551 ) @Export("startX") int startX; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 460055653 + intValue = 694891885 ) @Export("endX") int endX; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 198720377 + intValue = 977899527 ) @Export("startY") int startY; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1832139769 + intValue = 523071703 ) @Export("endY") int endY; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1766645403 + intValue = 1389208075 ) - int field1959; - @ObfuscatedName("y") + int field1974; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -665577125 + intValue = 2140125731 ) @Export("lastDrawn") int lastDrawn; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - longValue = -5581328528529906223L + longValue = 6418610507484255719L ) @Export("tag") public long tag; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -234800787 + intValue = -1693237637 ) @Export("flags") int flags; GameObject() { - this.tag = 0L; - this.flags = 0; - } + this.tag = 0L; // L: 16 + this.flags = 0; // L: 17 + } // L: 19 - @ObfuscatedName("a") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "1896739320" + descriptor = "(I)V", + garbageValue = "723631912" ) - @Export("isCharAlphabetic") - public static boolean isCharAlphabetic(char var0) { - return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } + public static void method3411() { + if (NetCache.NetCache_socket != null) { // L: 319 + NetCache.NetCache_socket.close(); + } + + } // L: 320 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1910859364" + ) + public static void method3412() { + ItemDefinition.ItemDefinition_cached.clear(); // L: 551 + ItemDefinition.ItemDefinition_cachedModels.clear(); // L: 552 + ItemDefinition.ItemDefinition_cachedSprites.clear(); // L: 553 + } // L: 554 + + @ObfuscatedName("il") + @ObfuscatedSignature( + descriptor = "(IIIIIIIB)V", + garbageValue = "-58" + ) + @Export("updateRootInterface") + static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (WorldMapSprite.loadInterface(var0)) { // L: 9643 + WorldMapSection1.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); // L: 9644 + } + } // L: 9645 } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index 526a5b5fe0..3ec25a32d0 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -2,7 +2,6 @@ import java.applet.Applet; import java.awt.Color; import java.awt.Container; import java.awt.EventQueue; -import java.awt.FontMetrics; import java.awt.Frame; import java.awt.Graphics; import java.awt.Insets; @@ -18,8 +17,6 @@ import java.awt.event.FocusListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.awt.image.ImageObserver; -import java.io.File; -import java.io.IOException; import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; @@ -27,536 +24,524 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bn") +@ObfuscatedName("bw") @Implements("GameShell") public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lbn;" + descriptor = "Lfo;" + ) + @Export("taskHandler") + protected static TaskHandler taskHandler; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lbw;" ) @Export("gameShell") static GameShell gameShell; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 163534127 + intValue = -823733869 ) @Export("GameShell_redundantStartThreadCount") static int GameShell_redundantStartThreadCount; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - longValue = -2327307276950282213L + longValue = 5260130147769638647L ) @Export("stopTimeMs") static long stopTimeMs; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("isKilled") static boolean isKilled; - @ObfuscatedName("n") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 922025779 - ) - @Export("gameCyclesToDo") - protected static int gameCyclesToDo; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1298368225 + intValue = -551512965 ) @Export("cycleDurationMillis") static int cycleDurationMillis; - @ObfuscatedName("a") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -35847139 + intValue = 1340319367 ) @Export("fiveOrOne") static int fiveOrOne; - @ObfuscatedName("z") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1815625351 + intValue = 253564767 ) @Export("fps") protected static int fps; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Llh;" - ) - @Export("options_buttons_2Sprite") - static IndexedSprite options_buttons_2Sprite; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("graphicsTickTimes") - protected static long[] graphicsTickTimes; - @ObfuscatedName("r") - @ObfuscatedGetter( - intValue = -713678755 - ) - @Export("graphicsTickTimeIdx") - static int graphicsTickTimeIdx; - @ObfuscatedName("s") + static long[] graphicsTickTimes; + @ObfuscatedName("f") @Export("clientTickTimes") - protected static long[] clientTickTimes; - @ObfuscatedName("ax") - @Export("loginScreenFontMetrics") - static FontMetrics loginScreenFontMetrics; - @ObfuscatedName("ad") + static long[] clientTickTimes; + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -986046037 + intValue = -744176475 ) - static int field486; - @ObfuscatedName("at") + @Export("canvasHeight") + public static int canvasHeight; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = 1469478575 + ) + static int field477; + @ObfuscatedName("ad") @Export("volatileFocus") static volatile boolean volatileFocus; - @ObfuscatedName("az") + @ObfuscatedName("ai") + @Export("hasFocus") + protected static boolean hasFocus; + @ObfuscatedName("aj") @ObfuscatedGetter( - longValue = 8410184394094094231L + longValue = 5656541566078499911L ) @Export("garbageCollectorLastCollectionTime") static long garbageCollectorLastCollectionTime; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - longValue = 3577293238906002649L + longValue = -6735850027157901575L ) @Export("garbageCollectorLastCheckTimeMs") static long garbageCollectorLastCheckTimeMs; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("hasErrored") boolean hasErrored; - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 2146499721 + intValue = -666140821 ) @Export("contentWidth") protected int contentWidth; - @ObfuscatedName("e") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1028356475 + intValue = 528808707 ) @Export("contentHeight") protected int contentHeight; - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -1337229323 + intValue = 2020225171 ) @Export("canvasX") int canvasX; - @ObfuscatedName("t") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1367831001 + intValue = -1122384321 ) @Export("canvasY") int canvasY; - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -895108673 + intValue = 236351201 ) - int field462; - @ObfuscatedName("ah") + int field475; + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1908584737 + intValue = 1328280729 ) - int field479; - @ObfuscatedName("ai") + int field476; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -1319555883 + intValue = 1655899873 ) @Export("maxCanvasWidth") int maxCanvasWidth; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -155636407 + intValue = 1639831573 ) @Export("maxCanvasHeight") int maxCanvasHeight; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("frame") Frame frame; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @Export("canvas") java.awt.Canvas canvas; - @ObfuscatedName("am") - volatile boolean field482; - @ObfuscatedName("as") + @ObfuscatedName("au") + volatile boolean field481; + @ObfuscatedName("at") @Export("resizeCanvasNextFrame") boolean resizeCanvasNextFrame; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("isCanvasInvalid") volatile boolean isCanvasInvalid; - @ObfuscatedName("ap") + @ObfuscatedName("al") @ObfuscatedGetter( - longValue = 3084699549014677093L + longValue = 158421572570045259L ) - volatile long field489; - @ObfuscatedName("ac") + volatile long field485; + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Lbh;" + descriptor = "Lbc;" ) @Export("mouseWheelHandler") MouseWheelHandler mouseWheelHandler; - @ObfuscatedName("av") + @ObfuscatedName("as") @Export("clipboard") Clipboard clipboard; - @ObfuscatedName("af") + @ObfuscatedName("az") @Export("eventQueue") final EventQueue eventQueue; static { - gameShell = null; - GameShell_redundantStartThreadCount = 0; - stopTimeMs = 0L; - isKilled = false; + gameShell = null; // L: 41 + GameShell_redundantStartThreadCount = 0; // L: 43 + stopTimeMs = 0L; // L: 44 + isKilled = false; // L: 45 cycleDurationMillis = 20; fiveOrOne = 1; - fps = 0; - graphicsTickTimes = new long[32]; - clientTickTimes = new long[32]; - field486 = 500; + fps = 0; // L: 50 + graphicsTickTimes = new long[32]; // L: 53 + clientTickTimes = new long[32]; // L: 55 + field477 = 500; // L: 73 volatileFocus = true; garbageCollectorLastCollectionTime = -1L; - garbageCollectorLastCheckTimeMs = -1L; + garbageCollectorLastCheckTimeMs = -1L; // L: 86 } protected GameShell() { - this.hasErrored = false; - this.canvasX = 0; - this.canvasY = 0; - this.field482 = true; - this.resizeCanvasNextFrame = false; - this.isCanvasInvalid = false; - this.field489 = 0L; - EventQueue var1 = null; + this.hasErrored = false; // L: 46 + this.canvasX = 0; // L: 59 + this.canvasY = 0; // L: 60 + this.field481 = true; // L: 71 + this.resizeCanvasNextFrame = false; // L: 74 + this.isCanvasInvalid = false; // L: 75 + this.field485 = 0L; // L: 76 + EventQueue var1 = null; // L: 89 try { - var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); - } catch (Throwable var3) { + var1 = Toolkit.getDefaultToolkit().getSystemEventQueue(); // L: 91 + } catch (Throwable var3) { // L: 93 } - this.eventQueue = var1; - NPC.method2144(new DevicePcmPlayerProvider()); - } + this.eventQueue = var1; // L: 94 + DevicePcmPlayerProvider var2 = new DevicePcmPlayerProvider(); // L: 95 + class300.pcmPlayerProvider = var2; // L: 97 + } // L: 99 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-2030982939" + garbageValue = "-2029851592" ) @Export("setMaxCanvasSize") protected final void setMaxCanvasSize(int var1, int var2) { - if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { - this.method1029(); + if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) { // L: 102 + this.method991(); } - this.maxCanvasWidth = var1; - this.maxCanvasHeight = var2; - } + this.maxCanvasWidth = var1; // L: 103 + this.maxCanvasHeight = var2; // L: 104 + } // L: 105 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ljava/lang/Object;I)V", - garbageValue = "-876824322" + garbageValue = "-1294823568" ) @Export("post") final void post(Object var1) { - if (this.eventQueue != null) { - for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { - SpriteMask.sleepExact(1L); + if (this.eventQueue != null) { // L: 108 + for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) { // L: 109 + class227.sleepExact(1L); } if (var1 != null) { - this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); + this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy")); // L: 110 } } - } + } // L: 111 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lfv;", - garbageValue = "-192453473" + descriptor = "(B)Lfd;", + garbageValue = "51" ) @Export("mouseWheel") protected MouseWheel mouseWheel() { - if (this.mouseWheelHandler == null) { - this.mouseWheelHandler = new MouseWheelHandler(); - this.mouseWheelHandler.addTo(this.canvas); + if (this.mouseWheelHandler == null) { // L: 114 + this.mouseWheelHandler = new MouseWheelHandler(); // L: 115 + this.mouseWheelHandler.addTo(this.canvas); // L: 116 } - return this.mouseWheelHandler; + return this.mouseWheelHandler; // L: 118 } + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-726775332" + ) + @Export("setUpClipboard") + protected void setUpClipboard() { + this.clipboard = this.getToolkit().getSystemClipboard(); // L: 122 + } // L: 123 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "783743664" + ) + @Export("clipboardSetString") + protected void clipboardSetString(String var1) { + this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); // L: 126 + } // L: 127 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-47" + ) + @Export("setUpKeyboard") + protected final void setUpKeyboard() { + class8.method105(); // L: 130 + java.awt.Canvas var1 = this.canvas; // L: 131 + var1.setFocusTraversalKeysEnabled(false); // L: 133 + var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 134 + var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 135 + } // L: 137 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "15264" + ) + @Export("setUpMouse") + protected final void setUpMouse() { + GrandExchangeOfferAgeComparator.method242(this.canvas); // L: 140 + } // L: 141 + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-981291570" - ) - @Export("setUpClipboard") - protected void setUpClipboard() { - this.clipboard = this.getToolkit().getSystemClipboard(); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-2023298912" - ) - @Export("clipboardSetString") - protected void clipboardSetString(String var1) { - this.clipboard.setContents(new StringSelection(var1), (ClipboardOwner)null); - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-316862367" - ) - @Export("setUpKeyboard") - protected final void setUpKeyboard() { - User.method5228(); - java.awt.Canvas var1 = this.canvas; - var1.setFocusTraversalKeysEnabled(false); - var1.addKeyListener(KeyHandler.KeyHandler_instance); - var1.addFocusListener(KeyHandler.KeyHandler_instance); - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "196707341" - ) - @Export("setUpMouse") - protected final void setUpMouse() { - AbstractWorldMapData.method342(this.canvas); - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-752017845" + garbageValue = "185905257" ) @Export("resizeCanvas") final void resizeCanvas() { - Container var1 = this.container(); - if (var1 != null) { - Bounds var2 = this.getFrameContentBounds(); - this.contentWidth = Math.max(var2.highX, this.field462); - this.contentHeight = Math.max(var2.highY, this.field479); - if (this.contentWidth <= 0) { + Container var1 = this.container(); // L: 144 + if (var1 != null) { // L: 145 + Bounds var2 = this.getFrameContentBounds(); // L: 146 + this.contentWidth = Math.max(var2.highX, this.field475); // L: 147 + this.contentHeight = Math.max(var2.highY, this.field476); // L: 148 + if (this.contentWidth <= 0) { // L: 149 this.contentWidth = 1; } - if (this.contentHeight <= 0) { + if (this.contentHeight <= 0) { // L: 150 this.contentHeight = 1; } - Varcs.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); - class52.canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); - this.canvasX = (this.contentWidth - Varcs.canvasWidth) / 2; - this.canvasY = 0; - this.canvas.setSize(Varcs.canvasWidth, class52.canvasHeight); - ArchiveLoader.rasterProvider = new RasterProvider(Varcs.canvasWidth, class52.canvasHeight, this.canvas); - if (var1 == this.frame) { - Insets var3 = this.frame.getInsets(); - this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); + FloorDecoration.canvasWidth = Math.min(this.contentWidth, this.maxCanvasWidth); // L: 151 + canvasHeight = Math.min(this.contentHeight, this.maxCanvasHeight); // L: 152 + this.canvasX = (this.contentWidth - FloorDecoration.canvasWidth) / 2; // L: 153 + this.canvasY = 0; // L: 154 + this.canvas.setSize(FloorDecoration.canvasWidth, canvasHeight); // L: 155 + WorldMapSprite.rasterProvider = new RasterProvider(FloorDecoration.canvasWidth, canvasHeight, this.canvas); // L: 156 + if (var1 == this.frame) { // L: 157 + Insets var3 = this.frame.getInsets(); // L: 158 + this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY); // L: 159 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 161 } - this.field482 = true; - this.resizeGame(); + this.field481 = true; // L: 162 + this.resizeGame(); // L: 163 } - } + } // L: 164 - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1805213007" + garbageValue = "912814062" ) @Export("resizeGame") protected abstract void resizeGame(); - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1664066560" + garbageValue = "1351857768" ) @Export("clearBackground") void clearBackground() { - int var1 = this.canvasX; - int var2 = this.canvasY; - int var3 = this.contentWidth - Varcs.canvasWidth - var1; - int var4 = this.contentHeight - class52.canvasHeight - var2; - if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { + int var1 = this.canvasX; // L: 169 + int var2 = this.canvasY; // L: 170 + int var3 = this.contentWidth - FloorDecoration.canvasWidth - var1; // L: 171 + int var4 = this.contentHeight - canvasHeight - var2; // L: 172 + if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) { // L: 173 try { - Container var5 = this.container(); - int var6 = 0; - int var7 = 0; - if (var5 == this.frame) { - Insets var8 = this.frame.getInsets(); - var6 = var8.left; - var7 = var8.top; + Container var5 = this.container(); // L: 175 + int var6 = 0; // L: 176 + int var7 = 0; // L: 177 + if (var5 == this.frame) { // L: 178 + Insets var8 = this.frame.getInsets(); // L: 179 + var6 = var8.left; // L: 180 + var7 = var8.top; // L: 181 } - Graphics var10 = var5.getGraphics(); - var10.setColor(Color.black); + Graphics var10 = var5.getGraphics(); // L: 183 + var10.setColor(Color.black); // L: 184 if (var1 > 0) { - var10.fillRect(var6, var7, var1, this.contentHeight); + var10.fillRect(var6, var7, var1, this.contentHeight); // L: 185 } - if (var2 > 0) { + if (var2 > 0) { // L: 186 var10.fillRect(var6, var7, this.contentWidth, var2); } - if (var3 > 0) { + if (var3 > 0) { // L: 187 var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight); } - if (var4 > 0) { + if (var4 > 0) { // L: 188 var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4); } - } catch (Exception var9) { + } catch (Exception var9) { // L: 190 } } - } + } // L: 192 - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "97" + descriptor = "(I)V", + garbageValue = "1486323299" ) @Export("replaceCanvas") final void replaceCanvas() { - java.awt.Canvas var1 = this.canvas; - var1.removeKeyListener(KeyHandler.KeyHandler_instance); - var1.removeFocusListener(KeyHandler.KeyHandler_instance); - KeyHandler.field411 = -1; - java.awt.Canvas var2 = this.canvas; - var2.removeMouseListener(MouseHandler.MouseHandler_instance); - var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance); - var2.removeFocusListener(MouseHandler.MouseHandler_instance); - MouseHandler.MouseHandler_currentButtonVolatile = 0; - if (this.mouseWheelHandler != null) { + class182.method3683(this.canvas); // L: 195 + WorldMapAreaData.method751(this.canvas); // L: 196 + if (this.mouseWheelHandler != null) { // L: 197 this.mouseWheelHandler.removeFrom(this.canvas); } - this.addCanvas(); - java.awt.Canvas var3 = this.canvas; - var3.setFocusTraversalKeysEnabled(false); - var3.addKeyListener(KeyHandler.KeyHandler_instance); - var3.addFocusListener(KeyHandler.KeyHandler_instance); - AbstractWorldMapData.method342(this.canvas); - if (this.mouseWheelHandler != null) { + this.addCanvas(); // L: 198 + java.awt.Canvas var1 = this.canvas; // L: 199 + var1.setFocusTraversalKeysEnabled(false); // L: 201 + var1.addKeyListener(KeyHandler.KeyHandler_instance); // L: 202 + var1.addFocusListener(KeyHandler.KeyHandler_instance); // L: 203 + GrandExchangeOfferAgeComparator.method242(this.canvas); // L: 205 + if (this.mouseWheelHandler != null) { // L: 206 this.mouseWheelHandler.addTo(this.canvas); } - this.method1029(); - } + this.method991(); // L: 207 + } // L: 208 - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-946150877" + garbageValue = "-922388983" ) @Export("startThread") protected final void startThread(int var1, int var2, int var3) { try { - if (gameShell != null) { - ++GameShell_redundantStartThreadCount; - if (GameShell_redundantStartThreadCount >= 3) { - this.error("alreadyloaded"); - return; + if (gameShell != null) { // L: 212 + ++GameShell_redundantStartThreadCount; // L: 213 + if (GameShell_redundantStartThreadCount >= 3) { // L: 214 + this.error("alreadyloaded"); // L: 215 + return; // L: 216 } - this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); - return; + this.getAppletContext().showDocument(this.getDocumentBase(), "_self"); // L: 218 + return; // L: 219 } - gameShell = this; - Varcs.canvasWidth = var1; - class52.canvasHeight = var2; - RunException.RunException_revision = var3; - RunException.RunException_applet = this; - if (GrandExchangeOfferAgeComparator.taskHandler == null) { - GrandExchangeOfferAgeComparator.taskHandler = new TaskHandler(); + gameShell = this; // L: 221 + FloorDecoration.canvasWidth = var1; // L: 222 + canvasHeight = var2; // L: 223 + ObjectDefinition.RunException_revision = var3; // L: 224 + RunException.RunException_applet = this; // L: 225 + if (taskHandler == null) { // L: 226 + taskHandler = new TaskHandler(); } - GrandExchangeOfferAgeComparator.taskHandler.newThreadTask(this, 1); - } catch (Exception var5) { - class197.RunException_sendStackTrace((String)null, var5); - this.error("crash"); + taskHandler.newThreadTask(this, 1); // L: 227 + } catch (Exception var5) { // L: 229 + Decimator.RunException_sendStackTrace((String)null, var5); // L: 230 + this.error("crash"); // L: 231 } - } + } // L: 233 - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "799710409" + garbageValue = "1659845190" ) @Export("addCanvas") final synchronized void addCanvas() { - Container var1 = this.container(); - if (this.canvas != null) { - this.canvas.removeFocusListener(this); - var1.remove(this.canvas); + Container var1 = this.container(); // L: 236 + if (this.canvas != null) { // L: 237 + this.canvas.removeFocusListener(this); // L: 238 + var1.remove(this.canvas); // L: 239 } - Varcs.canvasWidth = Math.max(var1.getWidth(), this.field462); - class52.canvasHeight = Math.max(var1.getHeight(), this.field479); + FloorDecoration.canvasWidth = Math.max(var1.getWidth(), this.field475); // L: 241 + canvasHeight = Math.max(var1.getHeight(), this.field476); // L: 242 Insets var2; - if (this.frame != null) { - var2 = this.frame.getInsets(); - Varcs.canvasWidth -= var2.left + var2.right; - class52.canvasHeight -= var2.bottom + var2.top; + if (this.frame != null) { // L: 243 + var2 = this.frame.getInsets(); // L: 244 + FloorDecoration.canvasWidth -= var2.left + var2.right; // L: 245 + canvasHeight -= var2.bottom + var2.top; // L: 246 } - this.canvas = new Canvas(this); - var1.setBackground(Color.BLACK); - var1.setLayout((LayoutManager)null); - var1.add(this.canvas); - this.canvas.setSize(Varcs.canvasWidth, class52.canvasHeight); - this.canvas.setVisible(true); - this.canvas.setBackground(Color.BLACK); - if (var1 == this.frame) { - var2 = this.frame.getInsets(); - this.canvas.setLocation(var2.left + this.canvasX, var2.top + this.canvasY); + this.canvas = new Canvas(this); // L: 248 + var1.setBackground(Color.BLACK); // L: 249 + var1.setLayout((LayoutManager)null); // L: 250 + var1.add(this.canvas); // L: 251 + this.canvas.setSize(FloorDecoration.canvasWidth, canvasHeight); // L: 252 + this.canvas.setVisible(true); // L: 253 + this.canvas.setBackground(Color.BLACK); // L: 254 + if (var1 == this.frame) { // L: 255 + var2 = this.frame.getInsets(); // L: 256 + this.canvas.setLocation(this.canvasX + var2.left, this.canvasY + var2.top); // L: 257 } else { - this.canvas.setLocation(this.canvasX, this.canvasY); + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 259 } - this.canvas.addFocusListener(this); - this.canvas.requestFocus(); - this.field482 = true; - if (ArchiveLoader.rasterProvider != null && Varcs.canvasWidth == ArchiveLoader.rasterProvider.width && class52.canvasHeight == ArchiveLoader.rasterProvider.height) { - ((RasterProvider)ArchiveLoader.rasterProvider).setComponent(this.canvas); - ArchiveLoader.rasterProvider.drawFull(0, 0); + this.canvas.addFocusListener(this); // L: 260 + this.canvas.requestFocus(); // L: 261 + this.field481 = true; // L: 262 + if (WorldMapSprite.rasterProvider != null && FloorDecoration.canvasWidth == WorldMapSprite.rasterProvider.width && canvasHeight == WorldMapSprite.rasterProvider.height) { // L: 263 + ((RasterProvider)WorldMapSprite.rasterProvider).setComponent(this.canvas); // L: 264 + WorldMapSprite.rasterProvider.drawFull(0, 0); // L: 265 } else { - ArchiveLoader.rasterProvider = new RasterProvider(Varcs.canvasWidth, class52.canvasHeight, this.canvas); + WorldMapSprite.rasterProvider = new RasterProvider(FloorDecoration.canvasWidth, canvasHeight, this.canvas); // L: 268 } - this.isCanvasInvalid = false; - this.field489 = MilliClock.currentTimeMillis(); - } + this.isCanvasInvalid = false; // L: 270 + this.field485 = PacketWriter.currentTimeMillis(); // L: 271 + } // L: 272 - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "424530917" + garbageValue = "395568671" ) @Export("checkHost") protected final boolean checkHost() { - String var1 = this.getDocumentBase().getHost().toLowerCase(); - if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { - if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { - if (var1.endsWith("127.0.0.1")) { + String var1 = this.getDocumentBase().getHost().toLowerCase(); // L: 275 + if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) { // L: 276 + if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { // L: 277 + if (var1.endsWith("127.0.0.1")) { // L: 278 return true; } else { while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { - var1 = var1.substring(0, var1.length() - 1); + var1 = var1.substring(0, var1.length() - 1); // L: 279 } - if (var1.endsWith("192.168.1.")) { + if (var1.endsWith("192.168.1.")) { // L: 280 return true; } else { - this.error("invalidhost"); - return false; + this.error("invalidhost"); // L: 281 + return false; // L: 282 } } } else { @@ -567,501 +552,462 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - @ObfuscatedName("e") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-311013157" + garbageValue = "-152433822" ) @Export("clientTick") void clientTick() { - long var1 = MilliClock.currentTimeMillis(); - long var3 = clientTickTimes[Clock.clientTickTimeIdx]; - clientTickTimes[Clock.clientTickTimeIdx] = var1; - Clock.clientTickTimeIdx = Clock.clientTickTimeIdx + 1 & 31; - if (var3 != 0L && var1 > var3) { + long var1 = PacketWriter.currentTimeMillis(); // L: 326 + long var3 = clientTickTimes[FontName.clientTickTimeIdx]; // L: 327 + clientTickTimes[FontName.clientTickTimeIdx] = var1; // L: 328 + FontName.clientTickTimeIdx = FontName.clientTickTimeIdx + 1 & 31; // L: 329 + if (var3 != 0L && var1 > var3) { // L: 330 } - synchronized(this) { - WorldMapArea.hasFocus = volatileFocus; + synchronized(this) { // L: 331 + hasFocus = volatileFocus; // L: 332 + } // L: 333 + + this.doCycle(); // L: 334 + } // L: 335 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1567053941" + ) + @Export("graphicsTick") + void graphicsTick() { + Container var1 = this.container(); // L: 338 + long var2 = PacketWriter.currentTimeMillis(); // L: 339 + long var4 = graphicsTickTimes[BoundaryObject.graphicsTickTimeIdx]; // L: 340 + graphicsTickTimes[BoundaryObject.graphicsTickTimeIdx] = var2; // L: 341 + BoundaryObject.graphicsTickTimeIdx = BoundaryObject.graphicsTickTimeIdx + 1 & 31; // L: 342 + if (var4 != 0L && var2 > var4) { // L: 343 + int var6 = (int)(var2 - var4); // L: 344 + fps = ((var6 >> 1) + 32000) / var6; // L: 345 } - this.doCycle(); - } + if (++field477 - 1 > 50) { // L: 347 + field477 -= 50; // L: 348 + this.field481 = true; // L: 349 + this.canvas.setSize(FloorDecoration.canvasWidth, canvasHeight); // L: 350 + this.canvas.setVisible(true); // L: 351 + if (var1 == this.frame) { // L: 352 + Insets var7 = this.frame.getInsets(); // L: 353 + this.canvas.setLocation(this.canvasX + var7.left, this.canvasY + var7.top); // L: 354 + } else { + this.canvas.setLocation(this.canvasX, this.canvasY); // L: 356 + } + } + + if (this.isCanvasInvalid) { // L: 358 + this.replaceCanvas(); + } + + this.method990(); // L: 359 + this.draw(this.field481); // L: 360 + if (this.field481) { // L: 361 + this.clearBackground(); + } + + this.field481 = false; // L: 362 + } // L: 363 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "428970843" + ) + final void method990() { + Bounds var1 = this.getFrameContentBounds(); // L: 366 + if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { // L: 367 + this.resizeCanvas(); // L: 368 + this.resizeCanvasNextFrame = false; // L: 369 + } + + } // L: 371 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-650969456" + ) + final void method991() { + this.resizeCanvasNextFrame = true; // L: 374 + } // L: 375 @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "553684525" - ) - @Export("graphicsTick") - void graphicsTick() { - Container var1 = this.container(); - long var2 = MilliClock.currentTimeMillis(); - long var4 = graphicsTickTimes[graphicsTickTimeIdx]; - graphicsTickTimes[graphicsTickTimeIdx] = var2; - graphicsTickTimeIdx = graphicsTickTimeIdx + 1 & 31; - if (var4 != 0L && var2 > var4) { - int var6 = (int)(var2 - var4); - fps = ((var6 >> 1) + 32000) / var6; - } - - if (++field486 - 1 > 50) { - field486 -= 50; - this.field482 = true; - this.canvas.setSize(Varcs.canvasWidth, class52.canvasHeight); - this.canvas.setVisible(true); - if (var1 == this.frame) { - Insets var7 = this.frame.getInsets(); - this.canvas.setLocation(var7.left + this.canvasX, var7.top + this.canvasY); - } else { - this.canvas.setLocation(this.canvasX, this.canvasY); - } - } - - if (this.isCanvasInvalid) { - this.replaceCanvas(); - } - - this.method1004(); - this.draw(this.field482); - if (this.field482) { - this.clearBackground(); - } - - this.field482 = false; - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "73839779" - ) - final void method1004() { - Bounds var1 = this.getFrameContentBounds(); - if (this.contentWidth != var1.highX || var1.highY != this.contentHeight || this.resizeCanvasNextFrame) { - this.resizeCanvas(); - this.resizeCanvasNextFrame = false; - } - - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2043772276" - ) - final void method1029() { - this.resizeCanvasNextFrame = true; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-109609137" + garbageValue = "-181155812" ) @Export("kill") final synchronized void kill() { - if (!isKilled) { - isKilled = true; + if (!isKilled) { // L: 378 + isKilled = true; // L: 379 try { - this.canvas.removeFocusListener(this); - } catch (Exception var5) { + this.canvas.removeFocusListener(this); // L: 381 + } catch (Exception var5) { // L: 383 } try { - this.kill0(); - } catch (Exception var4) { + this.kill0(); // L: 385 + } catch (Exception var4) { // L: 387 } - if (this.frame != null) { + if (this.frame != null) { // L: 388 try { - System.exit(0); - } catch (Throwable var3) { + System.exit(0); // L: 390 + } catch (Throwable var3) { // L: 392 } } - if (GrandExchangeOfferAgeComparator.taskHandler != null) { + if (taskHandler != null) { // L: 394 try { - GrandExchangeOfferAgeComparator.taskHandler.close(); - } catch (Exception var2) { + taskHandler.close(); // L: 396 + } catch (Exception var2) { // L: 398 } } - this.vmethod1570(); + this.vmethod1761(); // L: 400 } - } + } // L: 401 - @ObfuscatedName("ag") + @ObfuscatedName("ar") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "108465933" + garbageValue = "1974240025" ) @Export("setUp") protected abstract void setUp(); - @ObfuscatedName("ab") + @ObfuscatedName("at") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "202919973" + garbageValue = "-720509728" ) @Export("doCycle") protected abstract void doCycle(); - @ObfuscatedName("am") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(ZS)V", - garbageValue = "255" + descriptor = "(ZB)V", + garbageValue = "-63" ) @Export("draw") protected abstract void draw(boolean var1); - @ObfuscatedName("ak") + @ObfuscatedName("al") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1432958229" + garbageValue = "-645621446" ) @Export("kill0") protected abstract void kill0(); - @ObfuscatedName("ad") + @ObfuscatedName("ah") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;ZS)V", - garbageValue = "-6486" + descriptor = "(ILjava/lang/String;ZI)V", + garbageValue = "577795912" ) @Export("drawInitial") protected final void drawInitial(int var1, String var2, boolean var3) { try { - Graphics var4 = this.canvas.getGraphics(); - if (class204.fontHelvetica13 == null) { - class204.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); - loginScreenFontMetrics = this.canvas.getFontMetrics(class204.fontHelvetica13); + Graphics var4 = this.canvas.getGraphics(); // L: 468 + if (class278.fontHelvetica13 == null) { // L: 469 + class278.fontHelvetica13 = new java.awt.Font("Helvetica", 1, 13); // L: 470 + ApproximateRouteStrategy.loginScreenFontMetrics = this.canvas.getFontMetrics(class278.fontHelvetica13); // L: 471 } - if (var3) { - var4.setColor(Color.black); - var4.fillRect(0, 0, Varcs.canvasWidth, class52.canvasHeight); + if (var3) { // L: 473 + var4.setColor(Color.black); // L: 474 + var4.fillRect(0, 0, FloorDecoration.canvasWidth, canvasHeight); // L: 475 } - Color var5 = new Color(140, 17, 17); + Color var5 = new Color(140, 17, 17); // L: 477 try { - if (HealthBarUpdate.field1033 == null) { - HealthBarUpdate.field1033 = this.canvas.createImage(304, 34); + if (PacketBuffer.field3725 == null) { // L: 479 + PacketBuffer.field3725 = this.canvas.createImage(304, 34); } - Graphics var6 = HealthBarUpdate.field1033.getGraphics(); - var6.setColor(var5); - var6.drawRect(0, 0, 303, 33); - var6.fillRect(2, 2, var1 * 3, 30); - var6.setColor(Color.black); - var6.drawRect(1, 1, 301, 31); - var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); - var6.setFont(class204.fontHelvetica13); - var6.setColor(Color.white); - var6.drawString(var2, (304 - loginScreenFontMetrics.stringWidth(var2)) / 2, 22); - var4.drawImage(HealthBarUpdate.field1033, Varcs.canvasWidth / 2 - 152, class52.canvasHeight / 2 - 18, (ImageObserver)null); - } catch (Exception var9) { - int var7 = Varcs.canvasWidth / 2 - 152; - int var8 = class52.canvasHeight / 2 - 18; - var4.setColor(var5); - var4.drawRect(var7, var8, 303, 33); - var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); - var4.setColor(Color.black); - var4.drawRect(var7 + 1, var8 + 1, 301, 31); - var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); - var4.setFont(class204.fontHelvetica13); - var4.setColor(Color.white); - var4.drawString(var2, var7 + (304 - loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); + Graphics var6 = PacketBuffer.field3725.getGraphics(); // L: 480 + var6.setColor(var5); // L: 481 + var6.drawRect(0, 0, 303, 33); // L: 482 + var6.fillRect(2, 2, var1 * 3, 30); // L: 483 + var6.setColor(Color.black); // L: 484 + var6.drawRect(1, 1, 301, 31); // L: 485 + var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30); // L: 486 + var6.setFont(class278.fontHelvetica13); // L: 487 + var6.setColor(Color.white); // L: 488 + var6.drawString(var2, (304 - ApproximateRouteStrategy.loginScreenFontMetrics.stringWidth(var2)) / 2, 22); // L: 489 + var4.drawImage(PacketBuffer.field3725, FloorDecoration.canvasWidth / 2 - 152, canvasHeight / 2 - 18, (ImageObserver)null); // L: 490 + } catch (Exception var9) { // L: 492 + int var7 = FloorDecoration.canvasWidth / 2 - 152; // L: 493 + int var8 = canvasHeight / 2 - 18; // L: 494 + var4.setColor(var5); // L: 495 + var4.drawRect(var7, var8, 303, 33); // L: 496 + var4.fillRect(var7 + 2, var8 + 2, var1 * 3, 30); // L: 497 + var4.setColor(Color.black); // L: 498 + var4.drawRect(var7 + 1, var8 + 1, 301, 31); // L: 499 + var4.fillRect(var7 + var1 * 3 + 2, var8 + 2, 300 - var1 * 3, 30); // L: 500 + var4.setFont(class278.fontHelvetica13); // L: 501 + var4.setColor(Color.white); // L: 502 + var4.drawString(var2, var7 + (304 - ApproximateRouteStrategy.loginScreenFontMetrics.stringWidth(var2)) / 2, var8 + 22); // L: 503 } - } catch (Exception var10) { - this.canvas.repaint(); + } catch (Exception var10) { // L: 506 + this.canvas.repaint(); // L: 507 } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1038355483" - ) - protected final void method1017() { - HealthBarUpdate.field1033 = null; - class204.fontHelvetica13 = null; - loginScreenFontMetrics = null; - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)V", - garbageValue = "23979" - ) - @Export("error") - protected void error(String var1) { - if (!this.hasErrored) { - this.hasErrored = true; - System.out.println("error_game_" + var1); - - try { - this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); - } catch (Exception var3) { - } - - } - } - - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(I)Ljava/awt/Container;", - garbageValue = "1395544876" - ) - @Export("container") - Container container() { - return (Container)(this.frame != null ? this.frame : this); - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(S)Llv;", - garbageValue = "9055" - ) - @Export("getFrameContentBounds") - Bounds getFrameContentBounds() { - Container var1 = this.container(); - int var2 = Math.max(var1.getWidth(), this.field462); - int var3 = Math.max(var1.getHeight(), this.field479); - if (this.frame != null) { - Insets var4 = this.frame.getInsets(); - var2 -= var4.left + var4.right; - var3 -= var4.top + var4.bottom; - } - - return new Bounds(var2, var3); - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2133416306" - ) - @Export("hasFrame") - protected final boolean hasFrame() { - return this.frame != null; - } + } // L: 509 @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-453140820" + descriptor = "(B)V", + garbageValue = "15" ) - protected abstract void vmethod1570(); + protected final void method1002() { + PacketBuffer.field3725 = null; // L: 512 + class278.fontHelvetica13 = null; // L: 513 + ApproximateRouteStrategy.loginScreenFontMetrics = null; // L: 514 + } // L: 515 + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1560488333" + ) + @Export("error") + protected void error(String var1) { + if (!this.hasErrored) { // L: 518 + this.hasErrored = true; // L: 519 + System.out.println("error_game_" + var1); // L: 520 + + try { + this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self"); // L: 522 + } catch (Exception var3) { // L: 524 + } + + } + } // L: 525 + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)Ljava/awt/Container;", + garbageValue = "1926936525" + ) + @Export("container") + Container container() { + return (Container)(this.frame != null ? this.frame : this); // L: 528 + } + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(I)Llr;", + garbageValue = "-1116469540" + ) + @Export("getFrameContentBounds") + Bounds getFrameContentBounds() { + Container var1 = this.container(); // L: 533 + int var2 = Math.max(var1.getWidth(), this.field475); // L: 534 + int var3 = Math.max(var1.getHeight(), this.field476); // L: 535 + if (this.frame != null) { // L: 536 + Insets var4 = this.frame.getInsets(); // L: 537 + var2 -= var4.right + var4.left; // L: 538 + var3 -= var4.top + var4.bottom; // L: 539 + } + + return new Bounds(var2, var3); // L: 541 + } + + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "2" + ) + @Export("hasFrame") + protected final boolean hasFrame() { + return this.frame != null; // L: 545 + } + + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "28" + ) + protected abstract void vmethod1761(); + + public final void destroy() { + if (this == gameShell && !isKilled) { // L: 421 + stopTimeMs = PacketWriter.currentTimeMillis(); // L: 422 + class227.sleepExact(5000L); // L: 423 + this.kill(); // L: 424 + } + } // L: 425 public final synchronized void paint(Graphics var1) { - if (this == gameShell && !isKilled) { - this.field482 = true; - if (MilliClock.currentTimeMillis() - this.field489 > 1000L) { - Rectangle var2 = var1.getClipBounds(); - if (var2 == null || var2.width >= Varcs.canvasWidth && var2.height >= class52.canvasHeight) { - this.isCanvasInvalid = true; + if (this == gameShell && !isKilled) { // L: 432 + this.field481 = true; // L: 433 + if (PacketWriter.currentTimeMillis() - this.field485 > 1000L) { // L: 434 + Rectangle var2 = var1.getClipBounds(); // L: 435 + if (var2 == null || var2.width >= FloorDecoration.canvasWidth && var2.height >= canvasHeight) { + this.isCanvasInvalid = true; // L: 436 } } } - } + } // L: 438 - public final void destroy() { - if (this == gameShell && !isKilled) { - stopTimeMs = MilliClock.currentTimeMillis(); - SpriteMask.sleepExact(4999L); - SpriteMask.sleepExact(1L); - this.kill(); + public final void windowClosed(WindowEvent var1) { + } // L: 450 + + public final void start() { + if (this == gameShell && !isKilled) { // L: 411 + stopTimeMs = 0L; // L: 412 } - } + } // L: 413 + + public final void update(Graphics var1) { + this.paint(var1); // L: 428 + } // L: 429 public final void focusLost(FocusEvent var1) { - volatileFocus = false; - } + volatileFocus = false; // L: 446 + } // L: 447 + + public final void windowClosing(WindowEvent var1) { + this.destroy(); // L: 453 + } // L: 454 + + public final void windowDeactivated(WindowEvent var1) { + } // L: 456 + + public final void windowDeiconified(WindowEvent var1) { + } // L: 457 + + public final void windowIconified(WindowEvent var1) { + } // L: 458 + + public final void windowOpened(WindowEvent var1) { + } // L: 459 + + public final void focusGained(FocusEvent var1) { + volatileFocus = true; // L: 441 + this.field481 = true; // L: 442 + } // L: 443 public void run() { try { - if (TaskHandler.javaVendor != null) { - String var1 = TaskHandler.javaVendor.toLowerCase(); - if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { - String var2 = TaskHandler.javaVersion; - if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { - this.error("wrongjava"); - return; + if (TaskHandler.javaVendor != null) { // L: 287 + String var1 = TaskHandler.javaVendor.toLowerCase(); // L: 288 + if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) { // L: 289 + String var2 = TaskHandler.javaVersion; // L: 290 + if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.") || var2.equals("1.3") || var2.startsWith("1.3.") || var2.equals("1.4") || var2.startsWith("1.4.") || var2.equals("1.5") || var2.startsWith("1.5.") || var2.equals("1.6.0")) { // L: 291 + this.error("wrongjava"); // L: 292 + return; // L: 293 } - if (var2.startsWith("1.6.0_")) { + if (var2.startsWith("1.6.0_")) { // L: 295 int var3; - for (var3 = 6; var3 < var2.length() && class296.isDigit(var2.charAt(var3)); ++var3) { + for (var3 = 6; var3 < var2.length() && class1.isDigit(var2.charAt(var3)); ++var3) { // L: 296 297 } - String var4 = var2.substring(6, var3); - if (UserComparator7.isNumber(var4) && Tiles.parseInt(var4) < 10) { - this.error("wrongjava"); - return; + String var4 = var2.substring(6, var3); // L: 298 + if (World.isNumber(var4) && GrandExchangeOfferTotalQuantityComparator.parseInt(var4) < 10) { // L: 299 + this.error("wrongjava"); // L: 300 + return; // L: 301 } } - fiveOrOne = 5; + fiveOrOne = 5; // L: 304 } } - this.setFocusCycleRoot(true); - this.addCanvas(); - this.setUp(); + this.setFocusCycleRoot(true); // L: 307 + this.addCanvas(); // L: 308 + this.setUp(); // L: 309 + AbstractWorldMapIcon.clock = ModeWhere.method3761(); // L: 310 - Object var8; - try { - var8 = new NanoClock(); - } catch (Throwable var6) { - var8 = new MilliClock(); - } + while (stopTimeMs == 0L || PacketWriter.currentTimeMillis() < stopTimeMs) { // L: 311 + class58.gameCyclesToDo = AbstractWorldMapIcon.clock.wait(cycleDurationMillis, fiveOrOne); // L: 312 - FriendLoginUpdate.clock = (Clock)var8; - - while (stopTimeMs == 0L || MilliClock.currentTimeMillis() < stopTimeMs) { - gameCyclesToDo = FriendLoginUpdate.clock.wait(cycleDurationMillis, fiveOrOne); - - for (int var5 = 0; var5 < gameCyclesToDo; ++var5) { + for (int var5 = 0; var5 < class58.gameCyclesToDo; ++var5) { // L: 313 this.clientTick(); } - this.graphicsTick(); - this.post(this.canvas); + this.graphicsTick(); // L: 314 + this.post(this.canvas); // L: 315 } - } catch (Exception var7) { - class197.RunException_sendStackTrace((String)null, var7); - this.error("crash"); + } catch (Exception var6) { // L: 318 + Decimator.RunException_sendStackTrace((String)null, var6); // L: 319 + this.error("crash"); // L: 320 } - this.kill(); - } + this.kill(); // L: 322 + } // L: 323 - public final void start() { - if (this == gameShell && !isKilled) { - stopTimeMs = 0L; - } - } + public final void windowActivated(WindowEvent var1) { + } // L: 449 public final void stop() { - if (this == gameShell && !isKilled) { - stopTimeMs = MilliClock.currentTimeMillis() + 4000L; + if (this == gameShell && !isKilled) { // L: 416 + stopTimeMs = PacketWriter.currentTimeMillis() + 4000L; // L: 417 } - } - - public final void update(Graphics var1) { - this.paint(var1); - } - - public final void focusGained(FocusEvent var1) { - volatileFocus = true; - this.field482 = true; - } - - public final void windowClosing(WindowEvent var1) { - this.destroy(); - } - - public final void windowDeiconified(WindowEvent var1) { - } - - public final void windowIconified(WindowEvent var1) { - } - - public final void windowOpened(WindowEvent var1) { - } - - public final void windowDeactivated(WindowEvent var1) { - } - - public final void windowClosed(WindowEvent var1) { - } + } // L: 418 public abstract void init(); - public final void windowActivated(WindowEvent var1) { - } - - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmy;", - garbageValue = "968663760" + descriptor = "(IIB)I", + garbageValue = "1" ) - @Export("getPreferencesFile") - public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { - File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); - if (var3.exists()) { - try { - AccessFile var10 = new AccessFile(var3, "rw", 10000L); - return var10; - } catch (IOException var9) { - } + public static int method996(int var0, int var1) { + int var2; + for (var2 = 0; var1 > 0; --var1) { // L: 79 80 83 + var2 = var2 << 1 | var0 & 1; // L: 81 + var0 >>>= 1; // L: 82 } - String var4 = ""; - if (RouteStrategy.cacheGamebuild == 33) { - var4 = "_rc"; - } else if (RouteStrategy.cacheGamebuild == 34) { - var4 = "_wip"; - } - - File var5 = new File(ArchiveLoader.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); - AccessFile var6; - if (!var2 && var5.exists()) { - try { - var6 = new AccessFile(var5, "rw", 10000L); - return var6; - } catch (IOException var8) { - } - } - - try { - var6 = new AccessFile(var3, "rw", 10000L); - return var6; - } catch (IOException var7) { - throw new RuntimeException(); - } + return var2; // L: 85 } - @ObfuscatedName("j") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lic;III)Llz;", - garbageValue = "1598756055" + descriptor = "([BII)I", + garbageValue = "-1245222841" ) - @Export("SpriteBuffer_getSprite") - public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); - boolean var3; - if (var4 == null) { - var3 = false; - } else { - class3.SpriteBuffer_decode(var4); - var3 = true; + public static int method1108(byte[] var0, int var1) { + int var3 = -1; // L: 47 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 48 + var3 = var3 >>> 8 ^ Buffer.crc32Table[(var3 ^ var0[var4]) & 255]; // L: 49 } - if (!var3) { - return null; - } else { - Sprite var5 = new Sprite(); - var5.width = class335.SpriteBuffer_spriteWidth; - var5.height = UserComparator8.SpriteBuffer_spriteHeight; - var5.xOffset = class335.SpriteBuffer_xOffsets[0]; - var5.yOffset = NPC.SpriteBuffer_yOffsets[0]; - var5.subWidth = class335.SpriteBuffer_spriteWidths[0]; - var5.subHeight = class335.SpriteBuffer_spriteHeights[0]; - int var6 = var5.subWidth * var5.subHeight; - byte[] var7 = ItemDefinition.SpriteBuffer_pixels[0]; - var5.pixels = new int[var6]; - - for (int var8 = 0; var8 < var6; ++var8) { - var5.pixels[var8] = class335.SpriteBuffer_spritePalette[var7[var8] & 255]; - } - - GrandExchangeEvent.method158(); - return var5; - } + var3 = ~var3; // L: 51 + return var3; // L: 54 } + + @ObfuscatedName("kr") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "53" + ) + static void method1109() { + if (ModelData0.field1901 != null) { // L: 10904 + Client.field946 = Client.cycle; // L: 10905 + ModelData0.field1901.method4414(); // L: 10906 + + for (int var0 = 0; var0 < Client.players.length; ++var0) { // L: 10907 + if (Client.players[var0] != null) { // L: 10908 + ModelData0.field1901.method4423((Client.players[var0].x >> 7) + WorldMapManager.baseX, (Client.players[var0].y >> 7) + WorldMapLabel.baseY); // L: 10909 + } + } + } + + } // L: 10913 } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index e6713255e3..187d9386e7 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -1,744 +1,181 @@ -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("s") +@ObfuscatedName("f") @Implements("GrandExchangeEvent") public class GrandExchangeEvent { - @ObfuscatedName("bq") + @ObfuscatedName("dz") @ObfuscatedSignature( - descriptor = "[Llh;" + descriptor = "Liw;" ) - @Export("worldSelectArrows") - static IndexedSprite[] worldSelectArrows; - @ObfuscatedName("da") + @Export("archive11") + static Archive archive11; + @ObfuscatedName("hj") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "[Lls;" ) - @Export("archive8") - static Archive archive8; - @ObfuscatedName("m") + @Export("scrollBarSprites") + static IndexedSprite[] scrollBarSprites; + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "Lhq;" + ) + static Widget field79; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1238776823 + intValue = 152068117 ) @Export("world") public final int world; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - longValue = 2851107082298663307L + longValue = 3809481130081136381L ) @Export("age") public final long age; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ld;" + descriptor = "Lv;" ) @Export("grandExchangeOffer") public final GrandExchangeOffer grandExchangeOffer; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("offerName") String offerName; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("previousOfferName") String previousOfferName; @ObfuscatedSignature( - descriptor = "(Lkn;BI)V" + descriptor = "(Lkf;BI)V" ) GrandExchangeEvent(Buffer var1, byte var2, int var3) { - this.offerName = var1.readStringCp1252NullTerminated(); - this.previousOfferName = var1.readStringCp1252NullTerminated(); - this.world = var1.readUnsignedShort(); - this.age = var1.readLong(); - int var4 = var1.readInt(); - int var5 = var1.readInt(); - this.grandExchangeOffer = new GrandExchangeOffer(); - this.grandExchangeOffer.method172(2); - this.grandExchangeOffer.method173(var2); - this.grandExchangeOffer.unitPrice = var4; - this.grandExchangeOffer.totalQuantity = var5; - this.grandExchangeOffer.currentQuantity = 0; - this.grandExchangeOffer.currentPrice = 0; - this.grandExchangeOffer.id = var3; - } + this.offerName = var1.readStringCp1252NullTerminated(); // L: 111 + this.previousOfferName = var1.readStringCp1252NullTerminated(); // L: 112 + this.world = var1.readUnsignedShort(); // L: 113 + this.age = var1.readLong(); // L: 114 + int var4 = var1.readInt(); // L: 115 + int var5 = var1.readInt(); // L: 116 + this.grandExchangeOffer = new GrandExchangeOffer(); // L: 117 + this.grandExchangeOffer.method189(2); // L: 118 + this.grandExchangeOffer.method184(var2); // L: 119 + this.grandExchangeOffer.unitPrice = var4; // L: 120 + this.grandExchangeOffer.totalQuantity = var5; // L: 121 + this.grandExchangeOffer.currentQuantity = 0; // L: 122 + this.grandExchangeOffer.currentPrice = 0; // L: 123 + this.grandExchangeOffer.id = var3; // L: 124 + } // L: 125 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1910615045" + garbageValue = "-820260328" ) @Export("getOfferName") public String getOfferName() { - return this.offerName; + return this.offerName; // L: 128 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-966567999" + garbageValue = "2082763364" ) @Export("getPreviousOfferName") public String getPreviousOfferName() { - return this.previousOfferName; + return this.previousOfferName; // L: 132 } - @ObfuscatedName("o") + @ObfuscatedName("fz") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "144078284" + descriptor = "(Ljm;IIIB)V", + garbageValue = "6" ) - static final void method153(int var0, int var1, int var2, int var3) { - for (int var4 = var1; var4 <= var3 + var1; ++var4) { - for (int var5 = var0; var5 <= var0 + var2; ++var5) { - if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { - class171.field2036[0][var5][var4] = 127; - if (var0 == var5 && var5 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; - } - - if (var0 + var2 == var5 && var5 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; - } - - if (var4 == var1 && var4 > 0) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; - } - - if (var4 == var3 + var1 && var4 < 103) { - Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; - } + @Export("addSequenceSoundEffect") + static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { + if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) { // L: 3259 + if (var0.soundEffects != null && var1 < var0.soundEffects.length) { // L: 3260 + int var4 = var0.soundEffects[var1]; // L: 3261 + if (var4 != 0) { // L: 3262 + int var5 = var4 >> 8; // L: 3263 + int var6 = var4 >> 4 & 7; // L: 3264 + int var7 = var4 & 15; // L: 3265 + Client.soundEffectIds[Client.soundEffectCount] = var5; // L: 3266 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; // L: 3267 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; // L: 3268 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3269 + int var8 = (var2 - 64) / 128; // L: 3270 + int var9 = (var3 - 64) / 128; // L: 3271 + Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); // L: 3272 + ++Client.soundEffectCount; // L: 3273 } } } + } // L: 3274 - } - - @ObfuscatedName("p") + @ObfuscatedName("fm") @ObfuscatedSignature( - descriptor = "(Lbn;I)V", - garbageValue = "-1052517513" + descriptor = "(Lhq;III)V", + garbageValue = "-570952041" ) - @Export("doCycleTitle") - static void doCycleTitle(GameShell var0) { - if (Login.worldSelectOpen) { - Client.method1522(var0); - } else { - if ((MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { - NetSocket.clientPreferences.titleMusicDisabled = !NetSocket.clientPreferences.titleMusicDisabled; - SpriteMask.savePreferences(); - if (!NetSocket.clientPreferences.titleMusicDisabled) { - WorldMapSection1.method656(UserComparator7.archive6, "scape main", "", 255, false); - } else { - class89.method2161(); + @Export("checkIfMinimapClicked") + static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { + if (Client.minimapState == 0 || Client.minimapState == 3) { // L: 3365 + if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { // L: 3366 + SpriteMask var3 = var0.getSpriteMask(true); // L: 3367 + if (var3 == null) { // L: 3368 + return; + } + + int var4 = MouseHandler.MouseHandler_lastPressedX - var1; // L: 3369 + int var5 = MouseHandler.MouseHandler_lastPressedY - var2; // L: 3370 + if (var3.contains(var4, var5)) { // L: 3371 + var4 -= var3.width / 2; // L: 3372 + var5 -= var3.height / 2; // L: 3373 + int var6 = Client.camAngleY & 2047; // L: 3374 + int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 3375 + int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 3376 + int var9 = var4 * var8 + var5 * var7 >> 11; // L: 3377 + int var10 = var8 * var5 - var4 * var7 >> 11; // L: 3378 + int var11 = var9 + WorldMapLabelSize.localPlayer.x >> 7; // L: 3379 + int var12 = WorldMapLabelSize.localPlayer.y - var10 >> 7; // L: 3380 + PacketBufferNode var13 = Client.getPacketBufferNode(ClientPacket.field2317, Client.packetWriter.isaacCipher); // L: 3382 + var13.packetBuffer.writeByte(18); // L: 3383 + var13.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); // L: 3384 + var13.packetBuffer.method5654(var11 + WorldMapManager.baseX); // L: 3385 + var13.packetBuffer.writeShort(var12 + WorldMapLabel.baseY); // L: 3386 + var13.packetBuffer.writeByte(var4); // L: 3387 + var13.packetBuffer.writeByte(var5); // L: 3388 + var13.packetBuffer.writeShort(Client.camAngleY); // L: 3389 + var13.packetBuffer.writeByte(57); // L: 3390 + var13.packetBuffer.writeByte(0); // L: 3391 + var13.packetBuffer.writeByte(0); // L: 3392 + var13.packetBuffer.writeByte(89); // L: 3393 + var13.packetBuffer.writeShort(WorldMapLabelSize.localPlayer.x); // L: 3394 + var13.packetBuffer.writeShort(WorldMapLabelSize.localPlayer.y); // L: 3395 + var13.packetBuffer.writeByte(63); // L: 3396 + Client.packetWriter.addNode(var13); // L: 3397 + Client.destinationX = var11; // L: 3398 + Client.destinationY = var12; // L: 3399 } } - if (Client.gameState != 5) { - if (Login.field1204 == -1L) { - Login.field1204 = MilliClock.currentTimeMillis() + 1000L; - } - - long var1 = MilliClock.currentTimeMillis(); - boolean var3; - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - while (true) { - if (Client.archiveLoadersDone >= Client.archiveLoaders.size()) { - var3 = true; - break; - } - - ArchiveLoader var4 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); - if (!var4.isLoaded()) { - var3 = false; - break; - } - - ++Client.archiveLoadersDone; - } - } else { - var3 = true; - } - - if (var3 && -1L == Login.field1211) { - Login.field1211 = var1; - if (Login.field1211 > Login.field1204) { - Login.field1204 = Login.field1211; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - int var16; - if (UserComparator9.clientLanguage == Language.Language_EN) { - if (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { - var16 = Login.xPadding + 5; - short var5 = 463; - byte var6 = 100; - byte var7 = 35; - if (MouseHandler.MouseHandler_lastPressedX >= var16 && MouseHandler.MouseHandler_lastPressedX <= var6 + var16 && MouseHandler.MouseHandler_lastPressedY >= var5 && MouseHandler.MouseHandler_lastPressedY <= var5 + var7) { - WorldMapRegion.method591(); - return; - } - } - - if (VertexNormal.World_request != null) { - WorldMapRegion.method591(); - } - } - - var16 = MouseHandler.MouseHandler_lastButton; - int var22 = MouseHandler.MouseHandler_lastPressedX; - int var23 = MouseHandler.MouseHandler_lastPressedY; - if (var16 == 0) { - var22 = MouseHandler.MouseHandler_x; - var23 = MouseHandler.MouseHandler_y; - } - - if (!ArchiveLoader.mouseCam && var16 == 4) { - var16 = 1; - } - - short var26; - int var27; - if (Login.loginIndex == 0) { - boolean var28 = false; - - while (WorldMapManager.isKeyDown()) { - if (SecureRandomCallable.field546 == 84) { - var28 = true; - } - } - - var27 = Login.loginBoxCenter - 80; - var26 = 291; - if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { - WorldMapSectionType.openURL(HealthBarDefinition.method4669("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); - } - - var27 = Login.loginBoxCenter + 80; - if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20 || var28) { - if ((Client.worldProperties & 33554432) != 0) { - Login.Login_response0 = ""; - Login.Login_response1 = "This is a Beta world."; - Login.Login_response2 = "Your normal account will not be affected."; - Login.Login_response3 = ""; - Login.loginIndex = 1; - class22.method225(); - } else if ((Client.worldProperties & 4) != 0) { - if ((Client.worldProperties & 1024) != 0) { - Login.Login_response1 = "This is a High Risk PvP world."; - Login.Login_response2 = "Players can attack each other almost everywhere"; - Login.Login_response3 = "and the Protect Item prayer won't work."; - } else { - Login.Login_response1 = "This is a PvP world."; - Login.Login_response2 = "Players can attack each other"; - Login.Login_response3 = "almost everywhere."; - } - - Login.Login_response0 = "Warning!"; - Login.loginIndex = 1; - class22.method225(); - } else if ((Client.worldProperties & 1024) != 0) { - Login.Login_response1 = "This is a High Risk world."; - Login.Login_response2 = "The Protect Item prayer will"; - Login.Login_response3 = "not work on this world."; - Login.Login_response0 = "Warning!"; - Login.loginIndex = 1; - class22.method225(); - } else { - WorldMapRectangle.Login_promptCredentials(false); - } - } - } else { - short var8; - int var24; - if (Login.loginIndex == 1) { - while (true) { - if (!WorldMapManager.isKeyDown()) { - var24 = Login.loginBoxCenter - 80; - var8 = 321; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - WorldMapRectangle.Login_promptCredentials(false); - } - - var24 = Login.loginBoxCenter + 80; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - Login.loginIndex = 0; - } - break; - } - - if (SecureRandomCallable.field546 == 84) { - WorldMapRectangle.Login_promptCredentials(false); - } else if (SecureRandomCallable.field546 == 13) { - Login.loginIndex = 0; - } - } - } else { - short var25; - if (Login.loginIndex == 2) { - var25 = 201; - var24 = var25 + 52; - if (var16 == 1 && var23 >= var24 - 12 && var23 < var24 + 2) { - Login.currentLoginField = 0; - } - - var24 += 15; - if (var16 == 1 && var23 >= var24 - 12 && var23 < var24 + 2) { - Login.currentLoginField = 1; - } - - var24 += 15; - var25 = 361; - if (ItemContainer.field567 != null) { - var27 = ItemContainer.field567.highX / 2; - if (var16 == 1 && var22 >= ItemContainer.field567.lowX - var27 && var22 <= var27 + ItemContainer.field567.lowX && var23 >= var25 - 15 && var23 < var25) { - switch(Login.field1213) { - case 1: - MusicPatchPcmStream.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - Login.loginIndex = 5; - return; - case 2: - WorldMapSectionType.openURL("https://support.runescape.com/hc/en-gb", true, false); - } - } - } - - var27 = Login.loginBoxCenter - 80; - var26 = 321; - if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - MusicPatchPcmStream.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - MusicPatchPcmStream.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - MusicPatchPcmStream.setLoginResponseString("", "Connecting to server...", ""); - SequenceDefinition.method4973(false); - ClientPreferences.updateGameState(20); - return; - } - - var27 = Login.loginBoxX + 180 + 80; - if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - WorldMapSprite.field264 = 0; - ClanMate.otp = ""; - Login.field1223 = true; - } - - var27 = Login.loginBoxCenter + -117; - var26 = 277; - Login.field1209 = var22 >= var27 && var22 < var27 + ScriptEvent.field606 && var23 >= var26 && var23 < var26 + Skeleton.field1826; - if (var16 == 1 && Login.field1209) { - Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; - if (!Client.Login_isUsernameRemembered && NetSocket.clientPreferences.rememberedUsername != null) { - NetSocket.clientPreferences.rememberedUsername = null; - SpriteMask.savePreferences(); - } - } - - var27 = Login.loginBoxCenter + 24; - var26 = 277; - Login.field1231 = var22 >= var27 && var22 < var27 + ScriptEvent.field606 && var23 >= var26 && var23 < var26 + Skeleton.field1826; - if (var16 == 1 && Login.field1231) { - NetSocket.clientPreferences.hideUsername = !NetSocket.clientPreferences.hideUsername; - if (!NetSocket.clientPreferences.hideUsername) { - Login.Login_username = ""; - NetSocket.clientPreferences.rememberedUsername = null; - class22.method225(); - } - - SpriteMask.savePreferences(); - } - - while (true) { - Transferable var11; - int var12; - do { - while (true) { - label875: - do { - while (true) { - while (WorldMapManager.isKeyDown()) { - if (SecureRandomCallable.field546 != 13) { - if (Login.currentLoginField != 0) { - continue label875; - } - - NetFileRequest.method4304(class58.field442); - if (SecureRandomCallable.field546 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (SecureRandomCallable.field546 == 84 || SecureRandomCallable.field546 == 80) { - Login.currentLoginField = 1; - } - - if (ModeWhere.method3810(class58.field442) && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + class58.field442; - } - } else { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - WorldMapSprite.field264 = 0; - ClanMate.otp = ""; - Login.field1223 = true; - } - } - - return; - } - } while(Login.currentLoginField != 1); - - if (SecureRandomCallable.field546 == 85 && Login.Login_password.length() > 0) { - Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); - } else if (SecureRandomCallable.field546 == 84 || SecureRandomCallable.field546 == 80) { - Login.currentLoginField = 0; - if (SecureRandomCallable.field546 == 84) { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - MusicPatchPcmStream.setLoginResponseString("", "Please enter your username/email address.", ""); - return; - } - - if (Login.Login_password.length() == 0) { - MusicPatchPcmStream.setLoginResponseString("", "Please enter your password.", ""); - return; - } - - MusicPatchPcmStream.setLoginResponseString("", "Connecting to server...", ""); - SequenceDefinition.method4973(false); - ClientPreferences.updateGameState(20); - return; - } - } - - if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && SecureRandomCallable.field546 == 67) { - Clipboard var10 = Toolkit.getDefaultToolkit().getSystemClipboard(); - var11 = var10.getContents(WorldMapSectionType.client); - var12 = 20 - Login.Login_password.length(); - break; - } - - if (ViewportMouse.method3071(class58.field442) && ModeWhere.method3810(class58.field442) && Login.Login_password.length() < 20) { - Login.Login_password = Login.Login_password + class58.field442; - } - } - } while(var12 <= 0); - - try { - String var13 = (String)var11.getTransferData(DataFlavor.stringFlavor); - int var14 = Math.min(var12, var13.length()); - - for (int var15 = 0; var15 < var14; ++var15) { - if (!ViewportMouse.method3071(var13.charAt(var15)) || !ModeWhere.method3810(var13.charAt(var15))) { - Login.loginIndex = 3; - return; - } - } - - Login.Login_password = Login.Login_password + var13.substring(0, var14); - } catch (UnsupportedFlavorException var20) { - } catch (IOException var21) { - } - } - } else if (Login.loginIndex == 3) { - var24 = Login.loginBoxX + 180; - var8 = 276; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - WorldMapRectangle.Login_promptCredentials(false); - } - - var24 = Login.loginBoxX + 180; - var8 = 326; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - MusicPatchPcmStream.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - Login.loginIndex = 5; - return; - } - } else { - int var17; - if (Login.loginIndex == 4) { - var24 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - ClanMate.otp.trim(); - if (ClanMate.otp.length() != 6) { - MusicPatchPcmStream.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - WorldMapSprite.field264 = Integer.parseInt(ClanMate.otp); - ClanMate.otp = ""; - SequenceDefinition.method4973(true); - MusicPatchPcmStream.setLoginResponseString("", "Connecting to server...", ""); - ClientPreferences.updateGameState(20); - return; - } - - if (var16 == 1 && var22 >= Login.loginBoxX + 180 - 9 && var22 <= Login.loginBoxX + 180 + 130 && var23 >= 263 && var23 <= 296) { - Login.field1223 = !Login.field1223; - } - - if (var16 == 1 && var22 >= Login.loginBoxX + 180 - 34 && var22 <= Login.loginBoxX + 34 + 180 && var23 >= 351 && var23 <= 363) { - WorldMapSectionType.openURL(HealthBarDefinition.method4669("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); - } - - var24 = Login.loginBoxX + 180 + 80; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - WorldMapSprite.field264 = 0; - ClanMate.otp = ""; - } - - while (WorldMapManager.isKeyDown()) { - boolean var9 = false; - - for (var17 = 0; var17 < "1234567890".length(); ++var17) { - if (class58.field442 == "1234567890".charAt(var17)) { - var9 = true; - break; - } - } - - if (SecureRandomCallable.field546 == 13) { - Login.loginIndex = 0; - Login.Login_username = ""; - Login.Login_password = ""; - WorldMapSprite.field264 = 0; - ClanMate.otp = ""; - } else { - if (SecureRandomCallable.field546 == 85 && ClanMate.otp.length() > 0) { - ClanMate.otp = ClanMate.otp.substring(0, ClanMate.otp.length() - 1); - } - - if (SecureRandomCallable.field546 == 84) { - ClanMate.otp.trim(); - if (ClanMate.otp.length() != 6) { - MusicPatchPcmStream.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); - return; - } - - WorldMapSprite.field264 = Integer.parseInt(ClanMate.otp); - ClanMate.otp = ""; - SequenceDefinition.method4973(true); - MusicPatchPcmStream.setLoginResponseString("", "Connecting to server...", ""); - ClientPreferences.updateGameState(20); - return; - } - - if (var9 && ClanMate.otp.length() < 6) { - ClanMate.otp = ClanMate.otp + class58.field442; - } - } - } - } else if (Login.loginIndex == 5) { - var24 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - class89.method2159(); - return; - } - - var24 = Login.loginBoxX + 180 + 80; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - WorldMapRectangle.Login_promptCredentials(true); - } - - var26 = 361; - if (GrandExchangeOffer.field87 != null) { - var17 = GrandExchangeOffer.field87.highX / 2; - if (var16 == 1 && var22 >= GrandExchangeOffer.field87.lowX - var17 && var22 <= var17 + GrandExchangeOffer.field87.lowX && var23 >= var26 - 15 && var23 < var26) { - WorldMapSectionType.openURL(HealthBarDefinition.method4669("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); - } - } - - while (WorldMapManager.isKeyDown()) { - boolean var29 = false; - - for (int var18 = 0; var18 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var18) { - if (class58.field442 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var18)) { - var29 = true; - break; - } - } - - if (SecureRandomCallable.field546 == 13) { - WorldMapRectangle.Login_promptCredentials(true); - } else { - if (SecureRandomCallable.field546 == 85 && Login.Login_username.length() > 0) { - Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); - } - - if (SecureRandomCallable.field546 == 84) { - class89.method2159(); - return; - } - - if (var29 && Login.Login_username.length() < 320) { - Login.Login_username = Login.Login_username + class58.field442; - } - } - } - } else if (Login.loginIndex != 6) { - if (Login.loginIndex == 7) { - var24 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - WorldMapSectionType.openURL(HealthBarDefinition.method4669("secure", true) + "m=dob/set_dob.ws", true, false); - MusicPatchPcmStream.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var24 = Login.loginBoxX + 180 + 80; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - WorldMapRectangle.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 8) { - var24 = Login.loginBoxX + 180 - 80; - var8 = 321; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - WorldMapSectionType.openURL("https://www.jagex.com/terms/privacy", true, false); - MusicPatchPcmStream.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var24 = Login.loginBoxX + 180 + 80; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - WorldMapRectangle.Login_promptCredentials(true); - } - } else if (Login.loginIndex == 12) { - String var19 = ""; - switch(Login.field1212) { - case 0: - var19 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; - break; - case 1: - var19 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; - break; - default: - WorldMapRectangle.Login_promptCredentials(false); - } - - var27 = Login.loginBoxX + 180; - var26 = 276; - if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { - WorldMapSectionType.openURL(var19, true, false); - MusicPatchPcmStream.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); - Login.loginIndex = 6; - return; - } - - var27 = Login.loginBoxX + 180; - var26 = 326; - if (var16 == 1 && var22 >= var27 - 75 && var22 <= var27 + 75 && var23 >= var26 - 20 && var23 <= var26 + 20) { - WorldMapRectangle.Login_promptCredentials(false); - } - } else if (Login.loginIndex == 24) { - var24 = Login.loginBoxX + 180; - var8 = 301; - if (var16 == 1 && var22 >= var24 - 75 && var22 <= var24 + 75 && var23 >= var8 - 20 && var23 <= var8 + 20) { - WorldMapRectangle.Login_promptCredentials(false); - } - } - } else { - while (true) { - do { - if (!WorldMapManager.isKeyDown()) { - var25 = 321; - if (var16 == 1 && var23 >= var25 - 20 && var23 <= var25 + 20) { - WorldMapRectangle.Login_promptCredentials(true); - } - - return; - } - } while(SecureRandomCallable.field546 != 84 && SecureRandomCallable.field546 != 13); - - WorldMapRectangle.Login_promptCredentials(true); - } - } - } - } - } - - } - } } - } + } // L: 3402 - @ObfuscatedName("p") + @ObfuscatedName("fn") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-55" + descriptor = "(B)V", + garbageValue = "33" ) - @Export("Messages_getHistorySize") - static int Messages_getHistorySize(int var0) { - ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); - return var1 == null ? 0 : var1.size(); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1823027767" - ) - static void method158() { - class335.SpriteBuffer_xOffsets = null; - NPC.SpriteBuffer_yOffsets = null; - class335.SpriteBuffer_spriteWidths = null; - class335.SpriteBuffer_spriteHeights = null; - class335.SpriteBuffer_spritePalette = null; - ItemDefinition.SpriteBuffer_pixels = null; - } - - @ObfuscatedName("hx") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1963470031" - ) - static final void method155(int var0) { - if (var0 >= 0) { - int var1 = Client.menuArguments1[var0]; - int var2 = Client.menuArguments2[var0]; - int var3 = Client.menuOpcodes[var0]; - int var4 = Client.menuIdentifiers[var0]; - String var5 = Client.menuActions[var0]; - String var6 = Client.menuTargets[var0]; - WorldMapSection0.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); - } - } - - @ObfuscatedName("jp") - @ObfuscatedSignature( - descriptor = "(Lhd;I)Lhd;", - garbageValue = "-1293330124" - ) - static Widget method157(Widget var0) { - Widget var1 = FriendSystem.method1994(var0); - if (var1 == null) { - var1 = var0.parent; - } - - return var1; - } + static void method160() { + PacketBufferNode var0 = Client.getPacketBufferNode(ClientPacket.field2341, Client.packetWriter.isaacCipher); // L: 3880 + var0.packetBuffer.writeByte(class39.getWindowedMode()); // L: 3881 + var0.packetBuffer.writeShort(FloorDecoration.canvasWidth); // L: 3882 + var0.packetBuffer.writeShort(GameShell.canvasHeight); // L: 3883 + Client.packetWriter.addNode(var0); // L: 3884 + } // L: 3885 } diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java index 233d4c8095..0db0564de4 100644 --- a/runescape-client/src/main/java/GrandExchangeEvents.java +++ b/runescape-client/src/main/java/GrandExchangeEvents.java @@ -1,98 +1,426 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("r") +@ObfuscatedName("c") @Implements("GrandExchangeEvents") public class GrandExchangeEvents { - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("GrandExchangeEvents_ageComparator") public static Comparator GrandExchangeEvents_ageComparator; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("GrandExchangeEvents_priceComparator") public static Comparator GrandExchangeEvents_priceComparator; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("GrandExchangeEvents_nameComparator") public static Comparator GrandExchangeEvents_nameComparator; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("GrandExchangeEvents_quantityComparator") public static Comparator GrandExchangeEvents_quantityComparator; - @ObfuscatedName("m") + @ObfuscatedName("ga") + @Export("regionMapArchiveIds") + static int[] regionMapArchiveIds; + @ObfuscatedName("z") @Export("events") public final List events; static { - GrandExchangeEvents_ageComparator = new GrandExchangeOfferAgeComparator(); + GrandExchangeEvents_ageComparator = new GrandExchangeOfferAgeComparator(); // L: 11 new GrandExchangeOfferWorldComparator(); - GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); - GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); + GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); // L: 41 + GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); // L: 54 GrandExchangeEvents_quantityComparator = new GrandExchangeOfferTotalQuantityComparator(); - } + } // L: 67 @ObfuscatedSignature( - descriptor = "(Lkn;Z)V", + descriptor = "(Lkf;Z)V", garbageValue = "1" ) public GrandExchangeEvents(Buffer var1, boolean var2) { - int var3 = var1.readUnsignedShort(); - boolean var4 = var1.readUnsignedByte() == 1; + int var3 = var1.readUnsignedShort(); // L: 82 + boolean var4 = var1.readUnsignedByte() == 1; // L: 83 byte var5; - if (var4) { + if (var4) { // L: 85 var5 = 1; } else { - var5 = 0; + var5 = 0; // L: 86 } - int var6 = var1.readUnsignedShort(); - this.events = new ArrayList(var6); + int var6 = var1.readUnsignedShort(); // L: 87 + this.events = new ArrayList(var6); // L: 88 - for (int var7 = 0; var7 < var6; ++var7) { - this.events.add(new GrandExchangeEvent(var1, var5, var3)); + for (int var7 = 0; var7 < var6; ++var7) { // L: 89 + this.events.add(new GrandExchangeEvent(var1, var5, var3)); // L: 90 } - } + } // L: 92 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;ZI)V", - garbageValue = "372755845" + descriptor = "(Ljava/util/Comparator;ZS)V", + garbageValue = "6265" ) @Export("sort") public void sort(Comparator var1, boolean var2) { - if (var2) { - Collections.sort(this.events, var1); + if (var2) { // L: 95 + Collections.sort(this.events, var1); // L: 96 } else { - Collections.sort(this.events, Collections.reverseOrder(var1)); + Collections.sort(this.events, Collections.reverseOrder(var1)); // L: 99 + } + + } // L: 101 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "355141932" + ) + public static void method150(int var0) { + if (class206.musicPlayerStatus != 0) { // L: 44 + Tiles.musicTrackVolume = var0; + } else { + class206.midiPcmStream.setPcmStreamVolume(var0); // L: 45 } } - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "819758583" + descriptor = "(I)V", + garbageValue = "176488379" ) - public static boolean method148(char var0) { - if ((var0 <= 0 || var0 >= 128) && (var0 < 160 || var0 > 255)) { - if (var0 != 0) { - char[] var1 = class297.cp1252AsciiExtension; + public static void method143() { + VarpDefinition.VarpDefinition_cached.clear(); // L: 46 + } // L: 47 + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "395740968" + ) + static int method144(int var0, Script var1, boolean var2) { + String var3; + int var9; + if (var0 == ScriptOpcodes.APPEND_NUM) { // L: 2575 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2576 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2577 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3 + var9; // L: 2578 + return 1; // L: 2579 + } else { + String var4; + if (var0 == ScriptOpcodes.APPEND) { // L: 2581 + Varps.Interpreter_stringStackSize -= 2; // L: 2582 + var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 2583 + var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 2584 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3 + var4; // L: 2585 + return 1; // L: 2586 + } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { // L: 2588 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2589 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2590 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3 + ModeWhere.intToString(var9, true); // L: 2591 + return 1; // L: 2592 + } else if (var0 == ScriptOpcodes.LOWERCASE) { // L: 2594 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2595 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.toLowerCase(); // L: 2596 + return 1; // L: 2597 + } else { + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { // L: 2599 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2600 + long var13 = 86400000L * (11745L + (long)var10); // L: 2601 + Interpreter.Interpreter_calendar.setTime(new Date(var13)); // L: 2602 + var6 = Interpreter.Interpreter_calendar.get(5); // L: 2603 + int var17 = Interpreter.Interpreter_calendar.get(2); // L: 2604 + int var8 = Interpreter.Interpreter_calendar.get(1); // L: 2605 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var17] + "-" + var8; // L: 2606 + return 1; // L: 2607 + } else if (var0 != ScriptOpcodes.TEXT_GENDER) { // L: 2609 + if (var0 == ScriptOpcodes.TOSTRING) { // L: 2617 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2618 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Integer.toString(var10); // L: 2619 + return 1; // L: 2620 + } else if (var0 == ScriptOpcodes.COMPARE) { // L: 2622 + Varps.Interpreter_stringStackSize -= 2; // L: 2623 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketWriter.method2360(GrandExchangeOffer.compareStrings(Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1], class58.clientLanguage)); // L: 2624 + return 1; // L: 2625 + } else { + int var5; + byte[] var11; + Font var12; + if (var0 == ScriptOpcodes.PARAHEIGHT) { // L: 2627 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2628 + Interpreter.Interpreter_intStackSize -= 2; // L: 2629 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2630 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2631 + var11 = TilePaint.archive13.takeFile(var5, 0); // L: 2632 + var12 = new Font(var11); // L: 2633 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineCount(var3, var9); // L: 2634 + return 1; // L: 2635 + } else if (var0 == ScriptOpcodes.PARAWIDTH) { // L: 2637 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2638 + Interpreter.Interpreter_intStackSize -= 2; // L: 2639 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2640 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2641 + var11 = TilePaint.archive13.takeFile(var5, 0); // L: 2642 + var12 = new Font(var11); // L: 2643 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12.lineWidth(var3, var9); // L: 2644 + return 1; // L: 2645 + } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { // L: 2647 + Varps.Interpreter_stringStackSize -= 2; // L: 2648 + var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 2649 + var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 2650 + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 2651 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4; // L: 2652 + } + + return 1; // L: 2653 + } else if (var0 == ScriptOpcodes.ESCAPE) { // L: 2655 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2656 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); // L: 2657 + return 1; // L: 2658 + } else if (var0 == ScriptOpcodes.APPEND_CHAR) { // L: 2660 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2661 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2662 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3 + (char)var9; // L: 2663 + return 1; // L: 2664 + } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { // L: 2666 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2667 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HealthBarDefinition.isCharPrintable((char)var10) ? 1 : 0; // L: 2668 + return 1; // L: 2669 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { // L: 2671 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2672 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class204.isAlphaNumeric((char)var10) ? 1 : 0; // L: 2673 + return 1; // L: 2674 + } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { // L: 2676 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2677 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MilliClock.isCharAlphabetic((char)var10) ? 1 : 0; // L: 2678 + return 1; // L: 2679 + } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { // L: 2681 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2682 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class1.isDigit((char)var10) ? 1 : 0; // L: 2683 + return 1; // L: 2684 + } else if (var0 == ScriptOpcodes.STRING_LENGTH) { // L: 2686 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2687 + if (var3 != null) { // L: 2688 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2689 + } + + return 1; // L: 2690 + } else if (var0 == ScriptOpcodes.SUBSTRING) { // L: 2692 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2693 + Interpreter.Interpreter_intStackSize -= 2; // L: 2694 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2695 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2696 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.substring(var9, var5); // L: 2697 + return 1; // L: 2698 + } else if (var0 == ScriptOpcodes.REMOVETAGS) { // L: 2700 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2701 + StringBuilder var15 = new StringBuilder(var3.length()); // L: 2702 + boolean var16 = false; // L: 2703 + + for (var6 = 0; var6 < var3.length(); ++var6) { // L: 2704 + char var7 = var3.charAt(var6); // L: 2705 + if (var7 == '<') { // L: 2706 + var16 = true; + } else if (var7 == '>') { // L: 2707 + var16 = false; + } else if (!var16) { // L: 2708 + var15.append(var7); + } + } + + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var15.toString(); // L: 2710 + return 1; // L: 2711 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { // L: 2713 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2714 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2715 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var9); // L: 2716 + return 1; // L: 2717 + } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { // L: 2719 + Varps.Interpreter_stringStackSize -= 2; // L: 2720 + var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 2721 + var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 2722 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2723 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.indexOf(var4, var5); // L: 2724 + return 1; // L: 2725 + } else if (var0 == ScriptOpcodes.UPPERCASE) { // L: 2727 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2728 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.toUpperCase(); // L: 2729 + return 1; // L: 2730 + } else { + return 2; // L: 2732 + } + } + } else { + Varps.Interpreter_stringStackSize -= 2; // L: 2610 + var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 2611 + var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 2612 + if (WorldMapLabelSize.localPlayer.appearance != null && WorldMapLabelSize.localPlayer.appearance.isFemale) { // L: 2613 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4; + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3; // L: 2614 + } + + return 1; // L: 2615 + } + } + } + } + + @ObfuscatedName("im") + @ObfuscatedSignature( + descriptor = "(Ljx;IIII)V", + garbageValue = "1036487158" + ) + @Export("addNpcToMenu") + static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) { + if (Client.menuOptionsCount < 400) { // L: 8457 + if (var0.transforms != null) { // L: 8458 + var0 = var0.transform(); + } + + if (var0 != null) { // L: 8459 + if (var0.isInteractable) { // L: 8460 + if (!var0.isFollower || Client.followerIndex == var1) { // L: 8461 + String var4 = var0.name; // L: 8462 + int var7; + int var8; + if (var0.combatLevel != 0) { // L: 8463 + var7 = var0.combatLevel; // L: 8466 + var8 = WorldMapLabelSize.localPlayer.combatLevel; // L: 8467 + int var9 = var8 - var7; // L: 8469 + String var6; + if (var9 < -9) { // L: 8470 + var6 = WorldMapAreaData.colorStartTag(16711680); // L: 8471 + } else if (var9 < -6) { // L: 8474 + var6 = WorldMapAreaData.colorStartTag(16723968); // L: 8475 + } else if (var9 < -3) { // L: 8478 + var6 = WorldMapAreaData.colorStartTag(16740352); // L: 8479 + } else if (var9 < 0) { // L: 8482 + var6 = WorldMapAreaData.colorStartTag(16756736); // L: 8483 + } else if (var9 > 9) { // L: 8486 + var6 = WorldMapAreaData.colorStartTag(65280); // L: 8487 + } else if (var9 > 6) { // L: 8490 + var6 = WorldMapAreaData.colorStartTag(4259584); // L: 8491 + } else if (var9 > 3) { // L: 8494 + var6 = WorldMapAreaData.colorStartTag(8453888); // L: 8495 + } else if (var9 > 0) { // L: 8498 + var6 = WorldMapAreaData.colorStartTag(12648192); // L: 8499 + } else { + var6 = WorldMapAreaData.colorStartTag(16776960); // L: 8502 + } + + var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")"; // L: 8504 + } + + if (var0.isFollower && Client.followerOpsLowPriority) { // L: 8506 + StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 8507 + } + + if (Client.isItemSelected == 1) { // L: 8510 + StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16776960) + var4, 7, var1, var2, var3); // L: 8511 + } else if (Client.isSpellSelected) { // L: 8514 + if ((UserComparator8.selectedSpellFlags & 2) == 2) { // L: 8515 + StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16776960) + var4, 8, var1, var2, var3); // L: 8516 + } + } else { + int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0; // L: 8521 + String[] var11 = var0.actions; // L: 8522 + if (var11 != null) { // L: 8523 + for (var7 = 4; var7 >= 0; --var7) { // L: 8524 + if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) { // L: 8525 + var8 = 0; // L: 8526 + if (var7 == 0) { // L: 8527 + var8 = var10 + 9; + } + + if (var7 == 1) { // L: 8528 + var8 = var10 + 10; + } + + if (var7 == 2) { // L: 8529 + var8 = var10 + 11; + } + + if (var7 == 3) { // L: 8530 + var8 = var10 + 12; + } + + if (var7 == 4) { // L: 8531 + var8 = var10 + 13; + } + + StructDefinition.insertMenuItemNoShift(var11[var7], WorldMapAreaData.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 8532 + } + } + } + + if (var11 != null) { // L: 8537 + for (var7 = 4; var7 >= 0; --var7) { // L: 8538 + if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) { // L: 8539 + short var12 = 0; // L: 8540 + if (AttackOption.AttackOption_hidden != Client.npcAttackOption) { // L: 8541 + if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > WorldMapLabelSize.localPlayer.combatLevel) { // L: 8542 + var12 = 2000; // L: 8543 + } + + var8 = 0; // L: 8545 + if (var7 == 0) { // L: 8546 + var8 = var12 + 9; + } + + if (var7 == 1) { // L: 8547 + var8 = var12 + 10; + } + + if (var7 == 2) { // L: 8548 + var8 = var12 + 11; + } + + if (var7 == 3) { // L: 8549 + var8 = var12 + 12; + } + + if (var7 == 4) { // L: 8550 + var8 = var12 + 13; + } + + StructDefinition.insertMenuItemNoShift(var11[var7], WorldMapAreaData.colorStartTag(16776960) + var4, var8, var1, var2, var3); // L: 8551 + } + } + } + } + + if (!var0.isFollower || !Client.followerOpsLowPriority) { // L: 8556 + StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(16776960) + var4, 1003, var1, var2, var3); // L: 8557 + } + } - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; } } } - - return false; - } else { - return true; } - } + } // L: 8561 + + @ObfuscatedName("ir") + @ObfuscatedSignature( + descriptor = "(ZI)V", + garbageValue = "-775294286" + ) + @Export("setTapToDrop") + static void setTapToDrop(boolean var0) { + Client.tapToDrop = var0; // L: 9631 + } // L: 9632 } diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index cf6fa0f997..b78561c662 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -3,52 +3,45 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("d") +@ObfuscatedName("v") @Implements("GrandExchangeOffer") public class GrandExchangeOffer { - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Llv;" + @ObfuscatedName("be") + @ObfuscatedGetter( + intValue = -235857651 ) - static Bounds field87; - @ObfuscatedName("db") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive4") - static Archive archive4; - @ObfuscatedName("m") + static int field99; + @ObfuscatedName("z") @Export("state") byte state; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1112039617 + intValue = 1886313297 ) @Export("id") public int id; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 416176327 + intValue = -1193190523 ) @Export("unitPrice") public int unitPrice; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -981210321 + intValue = 1489525001 ) @Export("totalQuantity") public int totalQuantity; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1341718687 + intValue = -683135485 ) @Export("currentQuantity") public int currentQuantity; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1366605879 + intValue = 2067595945 ) @Export("currentPrice") public int currentPrice; @@ -57,299 +50,208 @@ public class GrandExchangeOffer { } @ObfuscatedSignature( - descriptor = "(Lkn;Z)V", + descriptor = "(Lkf;Z)V", garbageValue = "0" ) public GrandExchangeOffer(Buffer var1, boolean var2) { this.state = var1.readByte(); - this.id = var1.readUnsignedShort(); + this.id = var1.readUnsignedShort(); // L: 17 this.unitPrice = var1.readInt(); this.totalQuantity = var1.readInt(); this.currentQuantity = var1.readInt(); - this.currentPrice = var1.readInt(); - } + this.currentPrice = var1.readInt(); // L: 21 + } // L: 22 - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "271165601" + garbageValue = "562486348" ) @Export("status") public int status() { - return this.state & 7; + return this.state & 7; // L: 50 } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2130764898" + garbageValue = "1427821401" ) @Export("type") public int type() { - return (this.state & 8) == 8 ? 1 : 0; + return (this.state & 8) == 8 ? 1 : 0; // L: 54 } - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-308953741" + garbageValue = "1947498588" ) - void method172(int var1) { + void method189(int var1) { this.state &= -8; this.state = (byte)(this.state | var1 & 7); } - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" + descriptor = "(II)V", + garbageValue = "1892738676" ) - void method173(int var1) { + void method184(int var1) { this.state &= -9; if (var1 == 1) { this.state = (byte)(this.state | 8); } - } + } // L: 65 - @ObfuscatedName("q") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([Lch;II[I[II)V", - garbageValue = "-1520869912" + descriptor = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgn;I)I", + garbageValue = "-780286568" ) - @Export("sortWorlds") - static void sortWorlds(World[] var0, int var1, int var2, int[] var3, int[] var4) { - if (var1 < var2) { - int var5 = var1 - 1; - int var6 = var2 + 1; - int var7 = (var2 + var1) / 2; - World var8 = var0[var7]; - var0[var7] = var0[var1]; - var0[var1] = var8; + @Export("compareStrings") + public static int compareStrings(CharSequence var0, CharSequence var1, Language var2) { + int var3 = var0.length(); // L: 11 + int var4 = var1.length(); // L: 12 + int var5 = 0; // L: 13 + int var6 = 0; // L: 14 + byte var7 = 0; // L: 15 + char var8 = 0; // L: 16 - while (var5 < var6) { - boolean var9 = true; + while (var5 - var7 < var3 || var6 - var8 < var4) { // L: 18 + if (var5 - var7 >= var3) { // L: 19 + return -1; + } - int var10; - int var11; - int var12; - do { - --var6; + if (var6 - var8 >= var4) { // L: 20 + return 1; + } - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var6].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var6].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } + char var9; + if (var7 != 0) { // L: 23 + var9 = (char)var7; // L: 24 + boolean var14 = false; // L: 25 + } else { + var9 = var0.charAt(var5++); // L: 27 + } - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var6].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var6].id; - var12 = var8.id; - } + char var10; + if (var8 != 0) { // L: 28 + var10 = var8; // L: 29 + boolean var15 = false; // L: 30 + } else { + var10 = var1.charAt(var6++); // L: 32 + } - if (var12 != var11) { - if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) { - var9 = false; - } - break; - } + byte var11; + if (var9 == 198) { // L: 35 + var11 = 69; // L: 36 + } else if (var9 == 230) { // L: 39 + var11 = 101; // L: 40 + } else if (var9 == 223) { // L: 43 + var11 = 115; // L: 44 + } else if (var9 == 338) { // L: 47 + var11 = 69; // L: 48 + } else if (var9 == 339) { // L: 51 + var11 = 101; // L: 52 + } else { + var11 = 0; // L: 55 + } - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - var9 = true; - - do { - ++var5; - - for (var10 = 0; var10 < 4; ++var10) { - if (var3[var10] == 2) { - var11 = var0[var5].index; - var12 = var8.index; - } else if (var3[var10] == 1) { - var11 = var0[var5].population; - var12 = var8.population; - if (var11 == -1 && var4[var10] == 1) { - var11 = 2001; - } - - if (var12 == -1 && var4[var10] == 1) { - var12 = 2001; - } - } else if (var3[var10] == 3) { - var11 = var0[var5].isMembersOnly() ? 1 : 0; - var12 = var8.isMembersOnly() ? 1 : 0; - } else { - var11 = var0[var5].id; - var12 = var8.id; - } - - if (var12 != var11) { - if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) { - var9 = false; - } - break; - } - - if (var10 == 3) { - var9 = false; - } - } - } while(var9); - - if (var5 < var6) { - World var13 = var0[var5]; - var0[var5] = var0[var6]; - var0[var6] = var13; + var7 = var11; // L: 57 + var8 = LoginScreenAnimation.method1879(var10); // L: 58 + var9 = TileItem.standardizeChar(var9, var2); // L: 59 + var10 = TileItem.standardizeChar(var10, var2); // L: 60 + if (var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) { // L: 61 + var9 = Character.toLowerCase(var9); // L: 62 + var10 = Character.toLowerCase(var10); // L: 63 + if (var10 != var9) { // L: 64 + return class58.lowercaseChar(var9, var2) - class58.lowercaseChar(var10, var2); } } - - sortWorlds(var0, var1, var6, var3, var4); - sortWorlds(var0, var6 + 1, var2, var3, var4); } - } + int var16 = Math.min(var3, var4); // L: 67 - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "-2096234716" - ) - static int method194(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { - var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { - var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemQuantity; + char var12; + int var17; + for (var17 = 0; var17 < var16; ++var17) { // L: 68 + if (var2 == Language.Language_FR) { // L: 69 + var5 = var3 - 1 - var17; // L: 70 + var6 = var4 - 1 - var17; // L: 71 } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + var6 = var17; // L: 73 + var5 = var17; } - return 1; - } else if (var0 == ScriptOpcodes.IF_HASSUB) { - int var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); - if (var4 != null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + char var18 = var0.charAt(var5); // L: 74 + var12 = var1.charAt(var6); // L: 75 + if (var12 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var12)) { // L: 76 + var18 = Character.toLowerCase(var18); // L: 77 + var12 = Character.toLowerCase(var12); // L: 78 + if (var18 != var12) { + return class58.lowercaseChar(var18, var2) - class58.lowercaseChar(var12, var2); // L: 79 + } } + } - return 1; - } else if (var0 == ScriptOpcodes.IF_GETTOP) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.rootInterface; - return 1; + var17 = var3 - var4; // L: 82 + if (var17 != 0) { // L: 83 + return var17; } else { - return 2; - } - } - - @ObfuscatedName("al") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1566307415" - ) - static int method176(int var0) { - return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); - } - - @ObfuscatedName("hp") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1931279198" - ) - @Export("Widget_runOnTargetLeave") - static void Widget_runOnTargetLeave() { - if (Client.isSpellSelected) { - Widget var0 = WorldMapLabelSize.getWidgetChild(ItemContainer.selectedSpellWidget, Client.selectedSpellChildIndex); - if (var0 != null && var0.onTargetLeave != null) { - ScriptEvent var1 = new ScriptEvent(); - var1.widget = var0; - var1.args = var0.onTargetLeave; - InterfaceParent.runScriptEvent(var1); + for (int var19 = 0; var19 < var16; ++var19) { // L: 84 + var12 = var0.charAt(var19); // L: 85 + char var13 = var1.charAt(var19); // L: 86 + if (var13 != var12) { // L: 87 + return class58.lowercaseChar(var12, var2) - class58.lowercaseChar(var13, var2); + } } - Client.isSpellSelected = false; - class234.invalidateWidget(var0); + return 0; // L: 89 } } - @ObfuscatedName("jm") + @ObfuscatedName("ew") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "2119897094" + descriptor = "(I)Z", + garbageValue = "-1774568305" ) - static void method189(int var0, int var1) { - SecureRandomCallable.method1205(class169.tempMenuAction, var0, var1); - class169.tempMenuAction = null; - } - - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "(IIIILlz;Lhh;B)V", - garbageValue = "105" - ) - @Export("drawSpriteOnMinimap") - static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { - if (var4 != null) { - int var6 = Client.camAngleY & 2047; - int var7 = var3 * var3 + var2 * var2; - if (var7 <= 6400) { - int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var10 = var9 * var2 + var3 * var8 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - if (var7 > 2500) { - var4.method6408(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); - } else { - var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); + static boolean method207() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1427 + while (Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1428 + ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoadersDone); // L: 1429 + if (!var0.isLoaded()) { + return false; // L: 1430 } + ++Client.archiveLoadersDone; // L: 1431 } + + return true; // L: 1433 + } else { + return true; // L: 1432 } } - @ObfuscatedName("kp") + @ObfuscatedName("gx") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1908400826" + garbageValue = "695036800" ) - @Export("Clan_leaveChat") - static final void Clan_leaveChat() { - PacketBufferNode var0 = UserComparator4.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); - var0.packetBuffer.writeByte(0); - Client.packetWriter.addNode(var0); - } + static void method206() { + if (Client.renderSelf) { // L: 4248 + VarpDefinition.addPlayerToScene(WorldMapLabelSize.localPlayer, false); // L: 4249 + } - @ObfuscatedName("kj") + } // L: 4251 + + @ObfuscatedName("hm") @ObfuscatedSignature( - descriptor = "(IIIZB)V", - garbageValue = "43" + descriptor = "(B)I", + garbageValue = "-67" ) - public static void method191(int var0, int var1, int var2, boolean var3) { - PacketBufferNode var4 = UserComparator4.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); - var4.packetBuffer.method5753(var1); - var4.packetBuffer.writeInt(var3 ? Client.field836 * 1500794883 * -1503339861 : 0); - var4.packetBuffer.method5898(var0); - var4.packetBuffer.writeIntME(var2); - Client.packetWriter.addNode(var4); + static final int method209() { + return Client.menuOptionsCount - 1; // L: 8254 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index c49c186a3f..2866c02d8f 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -1,100 +1,272 @@ +import java.awt.Component; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("t") +@ObfuscatedName("u") @Implements("GrandExchangeOfferAgeComparator") final class GrandExchangeOfferAgeComparator implements Comparator { - @ObfuscatedName("nf") - @ObfuscatedGetter( - intValue = 41408299 - ) - @Export("widgetDragDuration") - static int widgetDragDuration; - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lic;" ) - @Export("taskHandler") - protected static TaskHandler taskHandler; - @ObfuscatedName("o") - @Export("clearLoginScreen") - static boolean clearLoginScreen; - @ObfuscatedName("w") - @Export("Tiles_saturation") - static int[] Tiles_saturation; + @Export("SequenceDefinition_skeletonsArchive") + public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ls;Ls;I)I", - garbageValue = "-2089427647" + descriptor = "(Lf;Lf;B)I", + garbageValue = "0" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); - } - - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return var1.age < var2.age ? -1 : (var2.age == var1.age ? 0 : 1); // L: 13 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 21 } - @ObfuscatedName("gg") + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 17 + } + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "1928902850" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1389394211" ) - static final void method224(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var8 = var6 - 334; - if (var8 < 0) { - var8 = 0; - } else if (var8 > 100) { - var8 = 100; + static void method242(Component var0) { + var0.addMouseListener(MouseHandler.MouseHandler_instance); // L: 37 + var0.addMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 38 + var0.addFocusListener(MouseHandler.MouseHandler_instance); // L: 39 + } // L: 40 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lky;I)V", + garbageValue = "1274576828" + ) + static final void method234(PacketBuffer var0) { + for (int var1 = 0; var1 < Players.Players_pendingUpdateCount; ++var1) { // L: 443 + int var2 = Players.Players_pendingUpdateIndices[var1]; // L: 444 + Player var3 = Client.players[var2]; // L: 445 + int var4 = var0.readUnsignedByte(); // L: 446 + if ((var4 & 128) != 0) { // L: 447 + var4 += var0.readUnsignedByte() << 8; + } + + byte var5 = -1; // L: 449 + if ((var4 & 2048) != 0) { // L: 450 + var3.field997 = var0.readByte(); // L: 451 + var3.field1016 = var0.method5730(); // L: 452 + var3.field1015 = var0.readByte(); // L: 453 + var3.field1017 = var0.readByte(); // L: 454 + var3.field1026 = var0.method5657() + Client.cycle; // L: 455 + var3.field1019 = var0.method5655() + Client.cycle; // L: 456 + var3.field1027 = var0.method5656(); // L: 457 + if (var3.field660) { // L: 458 + var3.field997 += var3.tileX; // L: 459 + var3.field1016 += var3.tileY; // L: 460 + var3.field1015 += var3.tileX; // L: 461 + var3.field1017 += var3.tileY; // L: 462 + var3.pathLength = 0; // L: 463 + } else { + var3.field997 += var3.pathX[0]; // L: 466 + var3.field1016 += var3.pathY[0]; // L: 467 + var3.field1015 += var3.pathX[0]; // L: 468 + var3.field1017 += var3.pathY[0]; // L: 469 + var3.pathLength = 1; // L: 470 + } + + var3.field973 = 0; // L: 472 + } + + int var6; + int var7; + if ((var4 & 4) != 0) { // L: 474 + var6 = var0.method5656(); // L: 475 + if (var6 == 65535) { // L: 476 + var6 = -1; + } + + var7 = var0.readUnsignedByte(); // L: 477 + GrandExchangeOfferNameComparator.performPlayerAnimation(var3, var6, var7); // L: 478 + } + + if ((var4 & 4096) != 0) { // L: 480 + var5 = var0.method5649(); // L: 481 + } + + int var9; + int var10; + int var13; + if ((var4 & 64) != 0) { // L: 483 + var6 = var0.method5656(); // L: 484 + PlayerType var14 = (PlayerType)TextureProvider.findEnumerated(ApproximateRouteStrategy.PlayerType_values(), var0.method5639()); // L: 485 + boolean var8 = var0.method5612() == 1; // L: 486 + var9 = var0.method5639(); // L: 487 + var10 = var0.offset; // L: 488 + if (var3.username != null && var3.appearance != null) { // L: 489 + boolean var11 = false; // L: 490 + if (var14.isUser && class60.friendSystem.isIgnored(var3.username)) { // L: 491 492 + var11 = true; + } + + if (!var11 && Client.field790 == 0 && !var3.isHidden) { // L: 494 + Players.field1287.offset = 0; // L: 495 + var0.method5697(Players.field1287.array, 0, var9); // L: 496 + Players.field1287.offset = 0; // L: 497 + String var12 = AbstractFont.escapeBrackets(Huffman.method4049(ScriptEvent.method1235(Players.field1287))); // L: 498 + var3.overheadText = var12.trim(); // L: 499 + var3.overheadTextColor = var6 >> 8; // L: 500 + var3.overheadTextEffect = var6 & 255; // L: 501 + var3.overheadTextCyclesRemaining = 150; // L: 502 + var3.isAutoChatting = var8; // L: 503 + var3.field986 = var3 != WorldMapLabelSize.localPlayer && var14.isUser && "" != Client.field913 && var12.toLowerCase().indexOf(Client.field913) == -1; // L: 504 + if (var14.isPrivileged) { // L: 506 + var13 = var8 ? 91 : 1; + } else { + var13 = var8 ? 90 : 2; // L: 507 + } + + if (var14.modIcon != -1) { // L: 508 + WorldMapRectangle.addGameMessage(var13, WorldMapScaleHandler.method824(var14.modIcon) + var3.username.getName(), var12); + } else { + WorldMapRectangle.addGameMessage(var13, var3.username.getName(), var12); // L: 509 + } + } + } + + var0.offset = var10 + var9; // L: 512 + } + + if ((var4 & 512) != 0) { // L: 514 + Players.field1284[var2] = var0.readByte(); // L: 515 + } + + if ((var4 & 16) != 0) { // L: 517 + var6 = var0.method5612(); // L: 518 + int var16; + int var17; + int var19; + if (var6 > 0) { // L: 519 + for (var7 = 0; var7 < var6; ++var7) { // L: 520 + var9 = -1; // L: 522 + var10 = -1; // L: 523 + var19 = -1; // L: 524 + var17 = var0.readUShortSmart(); // L: 525 + if (var17 == 32767) { // L: 526 + var17 = var0.readUShortSmart(); // L: 527 + var10 = var0.readUShortSmart(); // L: 528 + var9 = var0.readUShortSmart(); // L: 529 + var19 = var0.readUShortSmart(); // L: 530 + } else if (var17 != 32766) { // L: 532 + var10 = var0.readUShortSmart(); // L: 533 + } else { + var17 = -1; // L: 535 + } + + var16 = var0.readUShortSmart(); // L: 536 + var3.addHitSplat(var17, var10, var9, var19, Client.cycle, var16); // L: 537 + } + } + + var7 = var0.method5646(); // L: 540 + if (var7 > 0) { // L: 541 + for (var17 = 0; var17 < var7; ++var17) { // L: 542 + var9 = var0.readUShortSmart(); // L: 543 + var10 = var0.readUShortSmart(); // L: 544 + if (var10 != 32767) { // L: 545 + var19 = var0.readUShortSmart(); // L: 546 + var16 = var0.readUnsignedByte(); // L: 547 + var13 = var10 > 0 ? var0.method5646() : var16; // L: 548 + var3.addHealthBar(var9, Client.cycle, var10, var19, var16, var13); // L: 549 + } else { + var3.removeHealthBar(var9); // L: 551 + } + } + } + } + + if ((var4 & 1024) != 0) { // L: 555 + var3.spotAnimation = var0.readUnsignedShort(); // L: 556 + var6 = var0.method5667(); // L: 557 + var3.field1003 = var6 >> 16; // L: 558 + var3.field1013 = (var6 & 65535) + Client.cycle; // L: 559 + var3.spotAnimationFrame = 0; // L: 560 + var3.spotAnimationFrameCycle = 0; // L: 561 + if (var3.field1013 > Client.cycle) { // L: 562 + var3.spotAnimationFrame = -1; + } + + if (var3.spotAnimation == 65535) { // L: 563 + var3.spotAnimation = -1; + } + } + + if ((var4 & 32) != 0) { // L: 565 + var3.overheadText = var0.readStringCp1252NullTerminated(); // L: 566 + if (var3.overheadText.charAt(0) == '~') { // L: 567 + var3.overheadText = var3.overheadText.substring(1); // L: 568 + WorldMapRectangle.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 569 + } else if (var3 == WorldMapLabelSize.localPlayer) { // L: 571 + WorldMapRectangle.addGameMessage(2, var3.username.getName(), var3.overheadText); // L: 572 + } + + var3.isAutoChatting = false; // L: 574 + var3.overheadTextColor = 0; // L: 575 + var3.overheadTextEffect = 0; // L: 576 + var3.overheadTextCyclesRemaining = 150; // L: 577 + } + + if ((var4 & 1) != 0) { // L: 579 + var6 = var0.method5639(); // L: 580 + byte[] var20 = new byte[var6]; // L: 581 + Buffer var15 = new Buffer(var20); // L: 582 + var0.method5749(var20, 0, var6); // L: 583 + Players.field1277[var2] = var15; // L: 584 + var3.read(var15); // L: 585 + } + + if ((var4 & 8) != 0) { // L: 587 + var3.targetIndex = var0.method5657(); // L: 588 + if (var3.targetIndex == 65535) { // L: 589 + var3.targetIndex = -1; + } + } + + if ((var4 & 2) != 0) { // L: 591 + var3.field1000 = var0.method5655(); // L: 592 + if (var3.pathLength == 0) { // L: 593 + var3.orientation = var3.field1000; // L: 594 + var3.field1000 = -1; // L: 595 + } + } + + if ((var4 & 256) != 0) { // L: 598 + for (var6 = 0; var6 < 3; ++var6) { // L: 599 + var3.actions[var6] = var0.readStringCp1252NullTerminated(); + } + } + + if (var3.field660) { // L: 601 + if (var5 == 127) { // L: 602 + var3.resetPath(var3.tileX, var3.tileY); + } else { + byte var18; + if (var5 != -1) { // L: 605 + var18 = var5; + } else { + var18 = Players.field1284[var2]; // L: 606 + } + + var3.method1286(var3.tileX, var3.tileY, var18); // L: 607 + } + } } - int var9 = (Client.zoomWidth - Client.zoomHeight) * var8 / 100 + Client.zoomHeight; - int var7 = var5 * var9 / 256; - var8 = 2048 - var3 & 2047; - var9 = 2048 - var4 & 2047; - int var10 = 0; - int var11 = 0; - int var12 = var7; - int var13; - int var14; - int var15; - if (var8 != 0) { - var13 = Rasterizer3D.Rasterizer3D_sine[var8]; - var14 = Rasterizer3D.Rasterizer3D_cosine[var8]; - var15 = var11 * var14 - var13 * var7 >> 16; - var12 = var13 * var11 + var7 * var14 >> 16; - var11 = var15; - } - - if (var9 != 0) { - var13 = Rasterizer3D.Rasterizer3D_sine[var9]; - var14 = Rasterizer3D.Rasterizer3D_cosine[var9]; - var15 = var10 * var14 + var12 * var13 >> 16; - var12 = var14 * var12 - var13 * var10 >> 16; - var10 = var15; - } - - MouseHandler.cameraX = var0 - var10; - WorldMapSection3.cameraY = var1 - var11; - ObjectSound.cameraZ = var2 - var12; - TilePaint.cameraPitch = var3; - Canvas.cameraYaw = var4; - if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (class225.oculusOrbFocalPointX >> 7 != class60.localPlayer.x >> 7 || HealthBarDefinition.oculusOrbFocalPointY >> 7 != class60.localPlayer.y >> 7)) { - var13 = class60.localPlayer.plane; - var14 = (class225.oculusOrbFocalPointX >> 7) + class182.baseX; - var15 = (HealthBarDefinition.oculusOrbFocalPointY >> 7) + SecureRandomFuture.baseY; - GrandExchangeOffer.method191(var14, var15, var13, true); - } - - } + } // L: 613 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java index af56203e05..366b1b1d64 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java @@ -1,84 +1,894 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("l") +@ObfuscatedName("r") @Implements("GrandExchangeOfferNameComparator") final class GrandExchangeOfferNameComparator implements Comparator { - @ObfuscatedName("fv") + @ObfuscatedName("na") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "[Lhq;" ) - @Export("fontBold12") - static Font fontBold12; - @ObfuscatedName("gt") + static Widget[] field115; + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Llr;" ) - @Export("compass") - static Sprite compass; + static Bounds field112; + @ObfuscatedName("aj") + @ObfuscatedGetter( + intValue = -1454055259 + ) + static int field114; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ls;Ls;I)I", - garbageValue = "1584423872" + descriptor = "(Lf;Lf;I)I", + garbageValue = "-1190870183" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.getOfferName().compareTo(var2.getOfferName()); + return var1.getOfferName().compareTo(var2.getOfferName()); // L: 56 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 60 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 64 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)[Ljc;", - garbageValue = "491674021" + descriptor = "(II)Ljp;", + garbageValue = "-615080564" ) - static HorizontalAlignment[] method207() { - return new HorizontalAlignment[]{HorizontalAlignment.field3492, HorizontalAlignment.HorizontalAlignment_centered, HorizontalAlignment.field3488}; + @Export("getEnum") + public static EnumDefinition getEnum(int var0) { + EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); // L: 29 + if (var1 != null) { // L: 30 + return var1; + } else { + byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); // L: 31 + var1 = new EnumDefinition(); // L: 32 + if (var2 != null) { // L: 33 + var1.decode(new Buffer(var2)); + } + + EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); // L: 34 + return var1; // L: 35 + } } - @ObfuscatedName("e") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-678921308" + descriptor = "(ILcy;ZI)I", + garbageValue = "1335089944" ) - static void method213() { - Login.loginIndex = 24; - MusicPatchPcmStream.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); + static int method231(int var0, Script var1, boolean var2) { + Widget var5; + if (var0 == ScriptOpcodes.IF_GETINVOBJECT) { // L: 1259 + var5 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1260 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemId; // L: 1261 + return 1; // L: 1262 + } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { // L: 1264 + var5 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1265 + if (var5.itemId != -1) { // L: 1266 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1267 + } + + return 1; // L: 1268 + } else if (var0 == ScriptOpcodes.IF_HASSUB) { // L: 1270 + int var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1271 + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3); // L: 1272 + if (var4 != null) { // L: 1273 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1274 + } + + return 1; // L: 1275 + } else if (var0 == ScriptOpcodes.IF_GETTOP) { // L: 1277 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rootInterface; // L: 1278 + return 1; // L: 1279 + } else { + return 2; // L: 1281 + } } - @ObfuscatedName("kt") + @ObfuscatedName("fu") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "-350266063" + descriptor = "(Lbf;IIB)V", + garbageValue = "2" ) - static void method214(Buffer var0, int var1) { - byte[] var2 = var0.array; - if (Client.randomDatData == null) { - Client.randomDatData = new byte[24]; + @Export("performPlayerAnimation") + static void performPlayerAnimation(Player var0, int var1, int var2) { + if (var0.sequence == var1 && var1 != -1) { // L: 3839 + int var3 = WorldMapRegion.SequenceDefinition_get(var1).field3535; // L: 3840 + if (var3 == 1) { // L: 3841 + var0.sequenceFrame = 0; // L: 3842 + var0.sequenceFrameCycle = 0; // L: 3843 + var0.sequenceDelay = var2; // L: 3844 + var0.field1009 = 0; // L: 3845 + } + + if (var3 == 2) { // L: 3847 + var0.field1009 = 0; // L: 3848 + } + } else if (var1 == -1 || var0.sequence == -1 || WorldMapRegion.SequenceDefinition_get(var1).field3537 >= WorldMapRegion.SequenceDefinition_get(var0.sequence).field3537) { // L: 3851 + var0.sequence = var1; // L: 3852 + var0.sequenceFrame = 0; // L: 3853 + var0.sequenceFrameCycle = 0; // L: 3854 + var0.sequenceDelay = var2; // L: 3855 + var0.field1009 = 0; // L: 3856 + var0.field973 = var0.pathLength; // L: 3857 } - class310.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); - DevicePcmPlayerProvider.method914(var0, var1); - } + } // L: 3859 - @ObfuscatedName("kv") + @ObfuscatedName("gc") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2098531910" + descriptor = "(Lcg;IIIIII)V", + garbageValue = "930508889" ) - static void method206() { - Client.packetWriter.addNode(UserComparator4.getPacketBufferNode(ClientPacket.field2339, Client.packetWriter.isaacCipher)); - Client.oculusOrbState = 0; + @Export("drawActor2d") + static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { + if (var0 != null && var0.isVisible()) { // L: 4429 + if (var0 instanceof NPC) { // L: 4430 + NPCDefinition var6 = ((NPC)var0).definition; // L: 4431 + if (var6.transforms != null) { // L: 4432 + var6 = var6.transform(); + } + + if (var6 == null) { // L: 4433 + return; + } + } + + int var75 = Players.Players_count; // L: 4435 + int[] var7 = Players.Players_indices; // L: 4436 + byte var8 = 0; // L: 4437 + if (var1 < var75 && var0.playerCycle == Client.cycle && PrivateChatMode.method6022((Player)var0)) { // L: 4438 + Player var9 = (Player)var0; // L: 4439 + if (var1 < var75) { // L: 4440 + Coord.method4086(var0, var0.defaultHeight + 15); // L: 4441 + AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); // L: 4442 + byte var11 = 9; // L: 4443 + var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0); // L: 4444 + var8 = 18; // L: 4445 + } + } + + int var76 = -2; // L: 4448 + int var15; + int var22; + int var23; + if (!var0.healthBars.method4945()) { // L: 4449 + Coord.method4086(var0, var0.defaultHeight + 15); // L: 4450 + + for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) { // L: 4451 + HealthBarUpdate var79 = var87.get(Client.cycle); // L: 4452 + if (var79 == null) { // L: 4453 + if (var87.isEmpty()) { // L: 4511 + var87.remove(); + } + } else { + HealthBarDefinition var80 = var87.definition; // L: 4454 + Sprite var13 = var80.getBackSprite(); // L: 4455 + Sprite var81 = var80.getFrontSprite(); // L: 4456 + int var82 = 0; // L: 4458 + if (var13 != null && var81 != null) { // L: 4459 + if (var80.widthPadding * 2 < var81.subWidth) { // L: 4460 + var82 = var80.widthPadding; + } + + var15 = var81.subWidth - var82 * 2; // L: 4461 + } else { + var15 = var80.width; // L: 4463 + } + + int var17 = 255; // L: 4464 + boolean var83 = true; // L: 4465 + int var84 = Client.cycle - var79.cycle; // L: 4466 + int var85 = var15 * var79.health2 / var80.width; // L: 4467 + int var86; + int var93; + if (var79.cycleOffset > var84) { // L: 4468 + var86 = var80.field3310 == 0 ? 0 : var80.field3310 * (var84 / var80.field3310); // L: 4469 + var22 = var15 * var79.health / var80.width; // L: 4470 + var93 = var86 * (var85 - var22) / var79.cycleOffset + var22; // L: 4471 + } else { + var93 = var85; // L: 4474 + var86 = var79.cycleOffset + var80.int5 - var84; // L: 4475 + if (var80.int3 >= 0) { // L: 4476 + var17 = (var86 << 8) / (var80.int5 - var80.int3); + } + } + + if (var79.health2 > 0 && var93 < 1) { // L: 4478 + var93 = 1; + } + + if (var13 != null && var81 != null) { // L: 4479 + if (var93 == var15) { // L: 4480 + var93 += var82 * 2; + } else { + var93 += var82; // L: 4481 + } + + var86 = var13.subHeight; // L: 4482 + var76 += var86; // L: 4483 + var22 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4484 + var23 = var3 + Client.viewportTempY - var76; // L: 4485 + var22 -= var82; // L: 4486 + if (var17 >= 0 && var17 < 255) { // L: 4487 + var13.drawTransAt(var22, var23, var17); // L: 4488 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var86 + var23); // L: 4489 + var81.drawTransAt(var22, var23, var17); // L: 4490 + } else { + var13.drawTransBgAt(var22, var23); // L: 4493 + Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var23 + var86); // L: 4494 + var81.drawTransBgAt(var22, var23); // L: 4495 + } + + Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); // L: 4497 + var76 += 2; // L: 4498 + } else { + var76 += 5; // L: 4501 + if (Client.viewportTempX > -1) { // L: 4502 + var86 = var2 + Client.viewportTempX - (var15 >> 1); // L: 4503 + var22 = var3 + Client.viewportTempY - var76; // L: 4504 + Rasterizer2D.Rasterizer2D_fillRectangle(var86, var22, var93, 5, 65280); // L: 4505 + Rasterizer2D.Rasterizer2D_fillRectangle(var86 + var93, var22, var15 - var93, 5, 16711680); // L: 4506 + } + + var76 += 2; // L: 4508 + } + } + } + } + + if (var76 == -2) { // L: 4514 + var76 += 7; + } + + var76 += var8; // L: 4515 + if (var1 < var75) { // L: 4516 + Player var88 = (Player)var0; // L: 4517 + if (var88.isHidden) { // L: 4518 + return; + } + + if (var88.headIconPk != -1 || var88.headIconPrayer != -1) { // L: 4519 + Coord.method4086(var0, var0.defaultHeight + 15); // L: 4520 + if (Client.viewportTempX > -1) { // L: 4521 + if (var88.headIconPk != -1) { // L: 4522 + var76 += 25; // L: 4523 + class279.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4524 + } + + if (var88.headIconPrayer != -1) { // L: 4526 + var76 += 25; // L: 4527 + Client.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4528 + } + } + } + + if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { // L: 4532 + Coord.method4086(var0, var0.defaultHeight + 15); // L: 4533 + if (Client.viewportTempX > -1) { // L: 4534 + var76 += Varcs.headIconHintSprites[1].subHeight; // L: 4535 + Varcs.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76); // L: 4536 + } + } + } else { + NPCDefinition var89 = ((NPC)var0).definition; // L: 4541 + if (var89.transforms != null) { // L: 4542 + var89 = var89.transform(); + } + + if (var89.headIconPrayer >= 0 && var89.headIconPrayer < Client.headIconPrayerSprites.length) { // L: 4543 + Coord.method4086(var0, var0.defaultHeight + 15); // L: 4544 + if (Client.viewportTempX > -1) { // L: 4545 + Client.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); // L: 4546 + } + } + + if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { // L: 4549 + Coord.method4086(var0, var0.defaultHeight + 15); // L: 4550 + if (Client.viewportTempX > -1) { // L: 4551 + Varcs.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); + } + } + } + + if (var0.overheadText != null && (var1 >= var75 || !var0.field986 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { // L: 4554 4555 + Coord.method4086(var0, var0.defaultHeight); // L: 4556 + if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { // L: 4557 + Client.overheadTextXOffsets[Client.overheadTextCount] = class4.fontBold12.stringWidth(var0.overheadText) / 2; // L: 4558 + Client.overheadTextAscents[Client.overheadTextCount] = class4.fontBold12.ascent; // L: 4559 + Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; // L: 4560 + Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; // L: 4561 + Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; // L: 4562 + Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; // L: 4563 + Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; // L: 4564 + Client.overheadText[Client.overheadTextCount] = var0.overheadText; // L: 4565 + ++Client.overheadTextCount; // L: 4566 + } + } + + for (int var77 = 0; var77 < 4; ++var77) { // L: 4570 + int var90 = var0.hitSplatCycles[var77]; // L: 4571 + int var12 = var0.hitSplatTypes[var77]; // L: 4572 + HitSplatDefinition var91 = null; // L: 4573 + int var14 = 0; // L: 4574 + if (var12 >= 0) { // L: 4575 + if (var90 <= Client.cycle) { // L: 4576 + continue; + } + + var91 = MusicPatchNode.method3929(var0.hitSplatTypes[var77]); // L: 4577 + var14 = var91.field3356; // L: 4578 + if (var91 != null && var91.transforms != null) { // L: 4579 + var91 = var91.transform(); // L: 4580 + if (var91 == null) { // L: 4581 + var0.hitSplatCycles[var77] = -1; // L: 4582 + continue; // L: 4583 + } + } + } else if (var90 < 0) { // L: 4587 + continue; + } + + var15 = var0.hitSplatTypes2[var77]; // L: 4588 + HitSplatDefinition var16 = null; // L: 4589 + if (var15 >= 0) { // L: 4590 + var16 = MusicPatchNode.method3929(var15); // L: 4591 + if (var16 != null && var16.transforms != null) { // L: 4592 + var16 = var16.transform(); + } + } + + if (var90 - var14 <= Client.cycle) { // L: 4594 + if (var91 == null) { // L: 4595 + var0.hitSplatCycles[var77] = -1; // L: 4596 + } else { + Coord.method4086(var0, var0.defaultHeight / 2); // L: 4599 + if (Client.viewportTempX > -1) { // L: 4600 + if (var77 == 1) { // L: 4602 + Client.viewportTempY -= 20; // L: 4603 + } + + if (var77 == 2) { // L: 4605 + Client.viewportTempX -= 15; // L: 4606 + Client.viewportTempY -= 10; // L: 4607 + } + + if (var77 == 3) { // L: 4609 + Client.viewportTempX += 15; // L: 4610 + Client.viewportTempY -= 10; // L: 4611 + } + + Sprite var18 = null; // L: 4613 + Sprite var19 = null; // L: 4614 + Sprite var20 = null; // L: 4615 + Sprite var21 = null; // L: 4616 + var22 = 0; // L: 4617 + var23 = 0; // L: 4618 + int var24 = 0; // L: 4619 + int var25 = 0; // L: 4620 + int var26 = 0; // L: 4621 + int var27 = 0; // L: 4622 + int var28 = 0; // L: 4623 + int var29 = 0; // L: 4624 + Sprite var30 = null; // L: 4625 + Sprite var31 = null; // L: 4626 + Sprite var32 = null; // L: 4627 + Sprite var33 = null; // L: 4628 + int var34 = 0; // L: 4629 + int var35 = 0; // L: 4630 + int var36 = 0; // L: 4631 + int var37 = 0; // L: 4632 + int var38 = 0; // L: 4633 + int var39 = 0; // L: 4634 + int var40 = 0; // L: 4635 + int var41 = 0; // L: 4636 + int var42 = 0; // L: 4637 + var18 = var91.method4668(); // L: 4638 + int var43; + if (var18 != null) { // L: 4639 + var22 = var18.subWidth; // L: 4640 + var43 = var18.subHeight; // L: 4641 + if (var43 > var42) { // L: 4642 + var42 = var43; + } + + var26 = var18.xOffset; // L: 4643 + } + + var19 = var91.method4681(); // L: 4645 + if (var19 != null) { // L: 4646 + var23 = var19.subWidth; // L: 4647 + var43 = var19.subHeight; // L: 4648 + if (var43 > var42) { // L: 4649 + var42 = var43; + } + + var27 = var19.xOffset; // L: 4650 + } + + var20 = var91.method4670(); // L: 4652 + if (var20 != null) { // L: 4653 + var24 = var20.subWidth; // L: 4654 + var43 = var20.subHeight; // L: 4655 + if (var43 > var42) { // L: 4656 + var42 = var43; + } + + var28 = var20.xOffset; // L: 4657 + } + + var21 = var91.method4678(); // L: 4659 + if (var21 != null) { // L: 4660 + var25 = var21.subWidth; // L: 4661 + var43 = var21.subHeight; // L: 4662 + if (var43 > var42) { // L: 4663 + var42 = var43; + } + + var29 = var21.xOffset; // L: 4664 + } + + if (var16 != null) { // L: 4666 + var30 = var16.method4668(); // L: 4667 + if (var30 != null) { // L: 4668 + var34 = var30.subWidth; // L: 4669 + var43 = var30.subHeight; // L: 4670 + if (var43 > var42) { // L: 4671 + var42 = var43; + } + + var38 = var30.xOffset; // L: 4672 + } + + var31 = var16.method4681(); // L: 4674 + if (var31 != null) { // L: 4675 + var35 = var31.subWidth; // L: 4676 + var43 = var31.subHeight; // L: 4677 + if (var43 > var42) { // L: 4678 + var42 = var43; + } + + var39 = var31.xOffset; // L: 4679 + } + + var32 = var16.method4670(); // L: 4681 + if (var32 != null) { // L: 4682 + var36 = var32.subWidth; // L: 4683 + var43 = var32.subHeight; // L: 4684 + if (var43 > var42) { // L: 4685 + var42 = var43; + } + + var40 = var32.xOffset; // L: 4686 + } + + var33 = var16.method4678(); // L: 4688 + if (var33 != null) { // L: 4689 + var37 = var33.subWidth; // L: 4690 + var43 = var33.subHeight; // L: 4691 + if (var43 > var42) { // L: 4692 + var42 = var43; + } + + var41 = var33.xOffset; // L: 4693 + } + } + + Font var78 = var91.getFont(); // L: 4698 + if (var78 == null) { // L: 4699 + var78 = DynamicObject.fontPlain11; + } + + Font var44; + if (var16 != null) { // L: 4700 + var44 = var16.getFont(); // L: 4701 + if (var44 == null) { // L: 4702 + var44 = DynamicObject.fontPlain11; + } + } else { + var44 = DynamicObject.fontPlain11; // L: 4704 + } + + String var45 = null; // L: 4705 + String var46 = null; // L: 4706 + boolean var47 = false; // L: 4707 + int var48 = 0; // L: 4708 + var45 = var91.getString(var0.hitSplatValues[var77]); // L: 4709 + int var92 = var78.stringWidth(var45); // L: 4710 + if (var16 != null) { // L: 4711 + var46 = var16.getString(var0.hitSplatValues2[var77]); // L: 4712 + var48 = var44.stringWidth(var46); // L: 4713 + } + + int var49 = 0; // L: 4715 + int var50 = 0; // L: 4716 + if (var23 > 0) { // L: 4717 + if (var20 == null && var21 == null) { // L: 4718 + var49 = 1; // L: 4719 + } else { + var49 = var92 / var23 + 1; + } + } + + if (var16 != null && var35 > 0) { // L: 4721 4722 + if (var32 == null && var33 == null) { // L: 4723 + var50 = 1; // L: 4724 + } else { + var50 = var48 / var35 + 1; + } + } + + int var51 = 0; // L: 4727 + int var52 = var51; // L: 4728 + if (var22 > 0) { // L: 4729 + var51 += var22; + } + + var51 += 2; // L: 4730 + int var53 = var51; // L: 4731 + if (var24 > 0) { // L: 4732 + var51 += var24; + } + + int var54 = var51; // L: 4733 + int var55 = var51; // L: 4734 + int var56; + if (var23 > 0) { // L: 4735 + var56 = var49 * var23; // L: 4736 + var51 += var56; // L: 4737 + var55 += (var56 - var92) / 2; // L: 4738 + } else { + var51 += var92; // L: 4741 + } + + var56 = var51; // L: 4743 + if (var25 > 0) { // L: 4744 + var51 += var25; + } + + int var57 = 0; // L: 4745 + int var58 = 0; // L: 4746 + int var59 = 0; // L: 4747 + int var60 = 0; // L: 4748 + int var61 = 0; // L: 4749 + int var62; + if (var16 != null) { // L: 4750 + var51 += 2; // L: 4751 + var57 = var51; // L: 4752 + if (var34 > 0) { + var51 += var34; // L: 4753 + } + + var51 += 2; // L: 4754 + var58 = var51; // L: 4755 + if (var36 > 0) { // L: 4756 + var51 += var36; + } + + var59 = var51; // L: 4757 + var61 = var51; // L: 4758 + if (var35 > 0) { // L: 4759 + var62 = var35 * var50; // L: 4760 + var51 += var62; // L: 4761 + var61 += (var62 - var48) / 2; // L: 4762 + } else { + var51 += var48; // L: 4765 + } + + var60 = var51; // L: 4767 + if (var37 > 0) { // L: 4768 + var51 += var37; + } + } + + var62 = var0.hitSplatCycles[var77] - Client.cycle; // L: 4770 + int var63 = var91.field3368 - var62 * var91.field3368 / var91.field3356; // L: 4771 + int var64 = var62 * var91.field3362 / var91.field3356 + -var91.field3362; // L: 4772 + int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); // L: 4773 + int var66 = var3 + Client.viewportTempY - 12 + var64; // L: 4774 + int var67 = var66; // L: 4775 + int var68 = var66 + var42; // L: 4776 + int var69 = var66 + var91.field3366 + 15; // L: 4777 + int var70 = var69 - var78.maxAscent; // L: 4778 + int var71 = var69 + var78.maxDescent; // L: 4779 + if (var70 < var66) { // L: 4780 + var67 = var70; + } + + if (var71 > var68) { // L: 4781 + var68 = var71; + } + + int var72 = 0; // L: 4782 + int var73; + int var74; + if (var16 != null) { // L: 4783 + var72 = var66 + var16.field3366 + 15; // L: 4784 + var73 = var72 - var44.maxAscent; // L: 4785 + var74 = var72 + var44.maxDescent; // L: 4786 + if (var73 < var67) { // L: 4787 + ; + } + + if (var74 > var68) { // L: 4788 + ; + } + } + + var73 = 255; // L: 4790 + if (var91.field3355 >= 0) { // L: 4791 + var73 = (var62 << 8) / (var91.field3356 - var91.field3355); + } + + if (var73 >= 0 && var73 < 255) { // L: 4792 + if (var18 != null) { // L: 4793 + var18.drawTransAt(var65 + var52 - var26, var66, var73); + } + + if (var20 != null) { // L: 4794 + var20.drawTransAt(var53 + var65 - var28, var66, var73); + } + + if (var19 != null) { // L: 4795 + for (var74 = 0; var74 < var49; ++var74) { // L: 4796 + var19.drawTransAt(var23 * var74 + (var65 + var54 - var27), var66, var73); // L: 4797 + } + } + + if (var21 != null) { // L: 4800 + var21.drawTransAt(var65 + var56 - var29, var66, var73); + } + + var78.drawAlpha(var45, var65 + var55, var69, var91.textColor, 0, var73); // L: 4801 + if (var16 != null) { // L: 4802 + if (var30 != null) { // L: 4803 + var30.drawTransAt(var65 + var57 - var38, var66, var73); + } + + if (var32 != null) { // L: 4804 + var32.drawTransAt(var65 + var58 - var40, var66, var73); + } + + if (var31 != null) { // L: 4805 + for (var74 = 0; var74 < var50; ++var74) { // L: 4806 + var31.drawTransAt(var35 * var74 + (var65 + var59 - var39), var66, var73); // L: 4807 + } + } + + if (var33 != null) { // L: 4810 + var33.drawTransAt(var60 + var65 - var41, var66, var73); + } + + var44.drawAlpha(var46, var65 + var61, var72, var16.textColor, 0, var73); // L: 4811 + } + } else { + if (var18 != null) { // L: 4815 + var18.drawTransBgAt(var52 + var65 - var26, var66); + } + + if (var20 != null) { // L: 4816 + var20.drawTransBgAt(var65 + var53 - var28, var66); + } + + if (var19 != null) { // L: 4817 + for (var74 = 0; var74 < var49; ++var74) { // L: 4818 + var19.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); // L: 4819 + } + } + + if (var21 != null) { // L: 4822 + var21.drawTransBgAt(var56 + var65 - var29, var66); + } + + var78.draw(var45, var55 + var65, var69, var91.textColor | -16777216, 0); // L: 4823 + if (var16 != null) { // L: 4824 + if (var30 != null) { // L: 4825 + var30.drawTransBgAt(var65 + var57 - var38, var66); + } + + if (var32 != null) { // L: 4826 + var32.drawTransBgAt(var58 + var65 - var40, var66); + } + + if (var31 != null) { // L: 4827 + for (var74 = 0; var74 < var50; ++var74) { // L: 4828 + var31.drawTransBgAt(var74 * var35 + (var59 + var65 - var39), var66); // L: 4829 + } + } + + if (var33 != null) { // L: 4832 + var33.drawTransBgAt(var60 + var65 - var41, var66); + } + + var44.draw(var46, var61 + var65, var72, var16.textColor | -16777216, 0); // L: 4833 + } + } + } + } + } + } + + } + } // L: 4838 + + @ObfuscatedName("ih") + @ObfuscatedSignature( + descriptor = "(Lhq;II)I", + garbageValue = "1175033265" + ) + static final int method230(Widget var0, int var1) { + if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) { // L: 9351 + try { + int[] var2 = var0.cs1Instructions[var1]; // L: 9353 + int var3 = 0; // L: 9354 + int var4 = 0; // L: 9355 + byte var5 = 0; // L: 9356 + + while (true) { + int var6 = var2[var4++]; // L: 9358 + int var7 = 0; // L: 9359 + byte var8 = 0; // L: 9360 + if (var6 == 0) { // L: 9361 + return var3; + } + + if (var6 == 1) { // L: 9362 + var7 = Client.currentLevels[var2[var4++]]; + } + + if (var6 == 2) { // L: 9363 + var7 = Client.levels[var2[var4++]]; + } + + if (var6 == 3) { // L: 9364 + var7 = Client.experience[var2[var4++]]; + } + + int var9; + Widget var10; + int var11; + int var12; + if (var6 == 4) { // L: 9365 + var9 = var2[var4++] << 16; // L: 9366 + var9 += var2[var4++]; // L: 9367 + var10 = TileItem.getWidget(var9); // L: 9368 + var11 = var2[var4++]; // L: 9369 + if (var11 != -1 && (!GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 9370 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 9371 + if (var11 + 1 == var10.itemIds[var12]) { // L: 9372 + var7 += var10.itemQuantities[var12]; + } + } + } + } + + if (var6 == 5) { // L: 9376 + var7 = Varps.Varps_main[var2[var4++]]; + } + + if (var6 == 6) { // L: 9377 + var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1]; + } + + if (var6 == 7) { // L: 9378 + var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875; + } + + if (var6 == 8) { // L: 9379 + var7 = WorldMapLabelSize.localPlayer.combatLevel; + } + + if (var6 == 9) { // L: 9380 + for (var9 = 0; var9 < 25; ++var9) { // L: 9381 + if (Skills.Skills_enabled[var9]) { // L: 9382 + var7 += Client.levels[var9]; + } + } + } + + if (var6 == 10) { // L: 9385 + var9 = var2[var4++] << 16; // L: 9386 + var9 += var2[var4++]; // L: 9387 + var10 = TileItem.getWidget(var9); // L: 9388 + var11 = var2[var4++]; // L: 9389 + if (var11 != -1 && (!GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var11).isMembersOnly || Client.isMembersWorld)) { // L: 9390 + for (var12 = 0; var12 < var10.itemIds.length; ++var12) { // L: 9391 + if (var11 + 1 == var10.itemIds[var12]) { // L: 9392 + var7 = 999999999; // L: 9393 + break; // L: 9394 + } + } + } + } + + if (var6 == 11) { // L: 9399 + var7 = Client.runEnergy; + } + + if (var6 == 12) { // L: 9400 + var7 = Client.weight; + } + + if (var6 == 13) { // L: 9401 + var9 = Varps.Varps_main[var2[var4++]]; // L: 9402 + int var13 = var2[var4++]; // L: 9403 + var7 = (var9 & 1 << var13) != 0 ? 1 : 0; // L: 9404 + } + + if (var6 == 14) { // L: 9406 + var9 = var2[var4++]; // L: 9407 + var7 = WorldMapSection1.getVarbit(var9); // L: 9408 + } + + if (var6 == 15) { // L: 9410 + var8 = 1; + } + + if (var6 == 16) { // L: 9411 + var8 = 2; + } + + if (var6 == 17) { // L: 9412 + var8 = 3; + } + + if (var6 == 18) { // L: 9413 + var7 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; + } + + if (var6 == 19) { // L: 9414 + var7 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; + } + + if (var6 == 20) { // L: 9415 + var7 = var2[var4++]; + } + + if (var8 == 0) { // L: 9416 + if (var5 == 0) { // L: 9417 + var3 += var7; + } + + if (var5 == 1) { // L: 9418 + var3 -= var7; + } + + if (var5 == 2 && var7 != 0) { // L: 9419 + var3 /= var7; + } + + if (var5 == 3) { // L: 9420 + var3 *= var7; + } + + var5 = 0; // L: 9421 + } else { + var5 = var8; // L: 9423 + } + } + } catch (Exception var14) { // L: 9426 + return -1; // L: 9427 + } + } else { + return -2; + } } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index 5107a4a6b9..1c26d04077 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -1,143 +1,310 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bj") +@ObfuscatedName("bt") @Implements("GrandExchangeOfferOwnWorldComparator") public class GrandExchangeOfferOwnWorldComparator implements Comparator { - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1758275927 - ) - static int field666; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("filterWorlds") boolean filterWorlds; GrandExchangeOfferOwnWorldComparator() { - } + } // L: 10950 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ls;Ls;I)I", - garbageValue = "646157510" + descriptor = "(Lf;Lf;I)I", + garbageValue = "960814637" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - if (var2.world == var1.world) { + if (var2.world == var1.world) { // L: 10953 return 0; } else { - if (this.filterWorlds) { - if (Client.worldId == var1.world) { + if (this.filterWorlds) { // L: 10954 + if (Client.worldId == var1.world) { // L: 10955 return -1; } - if (var2.world == Client.worldId) { + if (var2.world == Client.worldId) { // L: 10956 return 1; } } - return var1.world < var2.world ? -1 : 1; + return var1.world < var2.world ? -1 : 1; // L: 10958 } } - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); - } - public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 10966 } - @ObfuscatedName("p") + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 10962 + } + + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "987190791" + descriptor = "(II)I", + garbageValue = "1772140785" ) - static int method1342(int var0, Script var1, boolean var2) { - int var3 = -1; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var4 = WorldMapSprite.getWidget(var3); + @Export("Messages_getLastChatID") + static int Messages_getLastChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 68 + if (var1 == null) { // L: 69 + return -1; } else { - var4 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - } - - if (var0 == ScriptOpcodes.CC_SETPOSITION) { - UrlRequester.Interpreter_intStackSize -= 4; - var4.rawX = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4.rawY = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var4.xAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - var4.yAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; - class234.invalidateWidget(var4); - WorldMapSectionType.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { - UrlRequester.Interpreter_intStackSize -= 4; - var4.rawWidth = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4.rawHeight = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var4.widthAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - var4.heightAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; - class234.invalidateWidget(var4); - WorldMapSectionType.client.alignWidget(var4); - if (var3 != -1 && var4.type == 0) { - WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { - boolean var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (var5 != var4.isHidden) { - var4.isHidden = var5; - class234.invalidateWidget(var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { - var4.noClickThrough = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { - var4.noScrollThrough = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else { - return 2; + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; // L: 70 71 } } - @ObfuscatedName("fq") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljm;IIII)V", - garbageValue = "1251688899" + descriptor = "(IIB)I", + garbageValue = "27" ) - @Export("addSequenceSoundEffect") - static void addSequenceSoundEffect(SequenceDefinition var0, int var1, int var2, int var3) { - if (Client.soundEffectCount < 50 && Client.areaSoundEffectVolume != 0) { - if (var0.soundEffects != null && var1 < var0.soundEffects.length) { - int var4 = var0.soundEffects[var1]; - if (var4 != 0) { - int var5 = var4 >> 8; - int var6 = var4 >> 4 & 7; - int var7 = var4 & 15; - Client.soundEffectIds[Client.soundEffectCount] = var5; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0; - Client.soundEffects[Client.soundEffectCount] = null; - int var8 = (var2 - 64) / 128; - int var9 = (var3 - 64) / 128; - Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16); - ++Client.soundEffectCount; + static final int method1334(int var0, int var1) { + int var2 = var1 * 57 + var0; // L: 856 + var2 ^= var2 << 13; // L: 857 + int var3 = (var2 * var2 * 15731 + 789221) * var2 + 1376312589 & Integer.MAX_VALUE; // L: 858 + return var3 >> 19 & 255; // L: 859 + } + + @ObfuscatedName("fh") + @ObfuscatedSignature( + descriptor = "(IIIIS)V", + garbageValue = "18134" + ) + @Export("drawEntities") + static final void drawEntities(int var0, int var1, int var2, int var3) { + ++Client.viewportDrawCount; // L: 3990 + if (WorldMapLabelSize.localPlayer.x >> 7 == Client.destinationX && WorldMapLabelSize.localPlayer.y >> 7 == Client.destinationY) { // L: 3992 + Client.destinationX = 0; // L: 3993 + } + + GrandExchangeOffer.method206(); // L: 3996 + Tiles.method1177(); // L: 3997 + CollisionMap.addNpcsToScene(true); // L: 3998 + int var4 = Players.Players_count; // L: 4000 + int[] var5 = Players.Players_indices; // L: 4001 + + int var6; + for (var6 = 0; var6 < var4; ++var6) { // L: 4002 + if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) { // L: 4003 + VarpDefinition.addPlayerToScene(Client.players[var5[var6]], true); // L: 4004 + } + } + + CollisionMap.addNpcsToScene(false); // L: 4007 + Login.method2160(); // L: 4008 + + for (GraphicsObject var21 = (GraphicsObject)Client.graphicsObjects.last(); var21 != null; var21 = (GraphicsObject)Client.graphicsObjects.previous()) { // L: 4010 4011 4018 + if (var21.plane == Huffman.Client_plane && !var21.isFinished) { // L: 4012 + if (Client.cycle >= var21.cycleStart) { // L: 4013 + var21.advance(Client.field737); // L: 4014 + if (var21.isFinished) { // L: 4015 + var21.remove(); + } else { + ScriptEvent.scene.drawEntity(var21.plane, var21.x, var21.y, var21.height, 60, var21, 0, -1L, false); // L: 4016 + } + } + } else { + var21.remove(); + } + } + + class231.setViewportShape(var0, var1, var2, var3, true); // L: 4021 + var0 = Client.viewportOffsetX; // L: 4022 + var1 = Client.viewportOffsetY; // L: 4023 + var2 = Client.viewportWidth; // L: 4024 + var3 = Client.viewportHeight; // L: 4025 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4026 + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); // L: 4027 + int var7; + int var8; + int var9; + int var11; + int var12; + int var13; + int var14; + int var22; + if (!Client.isCameraLocked) { // L: 4028 + var4 = Client.camAngleX; // L: 4029 + if (Client.field762 / 256 > var4) { // L: 4030 + var4 = Client.field762 / 256; + } + + if (Client.field922[4] && Client.field740[4] + 128 > var4) { // L: 4031 + var4 = Client.field740[4] + 128; + } + + var22 = Client.camAngleY & 2047; // L: 4032 + var6 = GrandExchangeOfferWorldComparator.oculusOrbFocalPointX; // L: 4033 + var7 = class7.field40; // L: 4034 + var8 = MouseHandler.oculusOrbFocalPointY; // L: 4035 + var9 = var4 * 3 + 600; // L: 4038 + var12 = var3 - 334; // L: 4044 + if (var12 < 0) { // L: 4045 + var12 = 0; + } else if (var12 > 100) { // L: 4046 + var12 = 100; + } + + var13 = (Client.zoomWidth - Client.zoomHeight) * var12 / 100 + Client.zoomHeight; // L: 4047 + var11 = var9 * var13 / 256; // L: 4048 + var12 = 2048 - var4 & 2047; // L: 4051 + var13 = 2048 - var22 & 2047; // L: 4052 + var14 = 0; // L: 4053 + int var15 = 0; // L: 4054 + int var16 = var11; // L: 4055 + int var17; + int var18; + int var19; + if (var12 != 0) { // L: 4056 + var17 = Rasterizer3D.Rasterizer3D_sine[var12]; // L: 4057 + var18 = Rasterizer3D.Rasterizer3D_cosine[var12]; // L: 4058 + var19 = var18 * var15 - var11 * var17 >> 16; // L: 4059 + var16 = var11 * var18 + var15 * var17 >> 16; // L: 4060 + var15 = var19; // L: 4061 + } + + if (var13 != 0) { // L: 4063 + var17 = Rasterizer3D.Rasterizer3D_sine[var13]; // L: 4064 + var18 = Rasterizer3D.Rasterizer3D_cosine[var13]; // L: 4065 + var19 = var14 * var18 + var17 * var16 >> 16; // L: 4066 + var16 = var16 * var18 - var17 * var14 >> 16; // L: 4067 + var14 = var19; // L: 4068 + } + + VertexNormal.cameraX = var6 - var14; // L: 4070 + FaceNormal.cameraY = var7 - var15; // L: 4071 + AbstractWorldMapData.cameraZ = var8 - var16; // L: 4072 + PacketBuffer.cameraPitch = var4; // L: 4073 + ServerPacket.cameraYaw = var22; // L: 4074 + if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (GrandExchangeOfferWorldComparator.oculusOrbFocalPointX >> 7 != WorldMapLabelSize.localPlayer.x >> 7 || MouseHandler.oculusOrbFocalPointY >> 7 != WorldMapLabelSize.localPlayer.y >> 7)) { // L: 4075 4076 + var17 = WorldMapLabelSize.localPlayer.plane; // L: 4077 + var18 = (GrandExchangeOfferWorldComparator.oculusOrbFocalPointX >> 7) + WorldMapManager.baseX; // L: 4078 + var19 = (MouseHandler.oculusOrbFocalPointY >> 7) + WorldMapLabel.baseY; // L: 4079 + PacketBufferNode var20 = Client.getPacketBufferNode(ClientPacket.field2327, Client.packetWriter.isaacCipher); // L: 4082 + var20.packetBuffer.writeShort(var19); // L: 4083 + var20.packetBuffer.method5662(Client.field758); // L: 4084 + var20.packetBuffer.writeShort(var18); // L: 4085 + var20.packetBuffer.method5644(var17); // L: 4086 + Client.packetWriter.addNode(var20); // L: 4087 + } + } + + if (!Client.isCameraLocked) { // L: 4094 + var4 = class9.method111(); + } else { + var4 = class22.method244(); // L: 4095 + } + + var22 = VertexNormal.cameraX; // L: 4096 + var6 = FaceNormal.cameraY; // L: 4097 + var7 = AbstractWorldMapData.cameraZ; // L: 4098 + var8 = PacketBuffer.cameraPitch; // L: 4099 + var9 = ServerPacket.cameraYaw; // L: 4100 + + int var10; + for (var10 = 0; var10 < 5; ++var10) { // L: 4101 + if (Client.field922[var10]) { // L: 4102 + var11 = (int)(Math.random() * (double)(Client.field678[var10] * 2 + 1) - (double)Client.field678[var10] + Math.sin((double)Client.field926[var10] * ((double)Client.field925[var10] / 100.0D)) * (double)Client.field740[var10]); // L: 4103 + if (var10 == 0) { // L: 4104 + VertexNormal.cameraX += var11; + } + + if (var10 == 1) { // L: 4105 + FaceNormal.cameraY += var11; + } + + if (var10 == 2) { // L: 4106 + AbstractWorldMapData.cameraZ += var11; + } + + if (var10 == 3) { // L: 4107 + ServerPacket.cameraYaw = var11 + ServerPacket.cameraYaw & 2047; + } + + if (var10 == 4) { // L: 4108 + PacketBuffer.cameraPitch += var11; // L: 4109 + if (PacketBuffer.cameraPitch < 128) { // L: 4110 + PacketBuffer.cameraPitch = 128; + } + + if (PacketBuffer.cameraPitch > 383) { // L: 4111 + PacketBuffer.cameraPitch = 383; + } } } } - } + + var10 = MouseHandler.MouseHandler_x; // L: 4115 + var11 = MouseHandler.MouseHandler_y; // L: 4116 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 4117 + var10 = MouseHandler.MouseHandler_lastPressedX; // L: 4118 + var11 = MouseHandler.MouseHandler_lastPressedY; // L: 4119 + } + + if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { // L: 4121 + class299.method5393(var10 - var0, var11 - var1); // L: 4122 + } else { + class92.method2142(); // L: 4125 + } + + RouteStrategy.playPcmPlayers(); // L: 4127 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4128 + RouteStrategy.playPcmPlayers(); // L: 4129 + var12 = Rasterizer3D.Rasterizer3D_zoom; // L: 4130 + Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; // L: 4131 + ScriptEvent.scene.draw(VertexNormal.cameraX, FaceNormal.cameraY, AbstractWorldMapData.cameraZ, PacketBuffer.cameraPitch, ServerPacket.cameraYaw, var4); // L: 4132 + Rasterizer3D.Rasterizer3D_zoom = var12; // L: 4133 + RouteStrategy.playPcmPlayers(); // L: 4134 + ScriptEvent.scene.clearTempGameObjects(); // L: 4135 + WorldMapID.method616(var0, var1, var2, var3); // L: 4136 + if (Client.hintArrowType == 2) { // L: 4138 + class89.worldToScreen((Client.hintArrowX - WorldMapManager.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - WorldMapLabel.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); // L: 4139 + if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { // L: 4140 + Varcs.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); + } + } + + ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field737); // L: 4142 + Client.field790 = 0; // L: 4145 + var13 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; // L: 4146 + var14 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; // L: 4147 + if (var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) { // L: 4148 + Client.field790 = 1; + } + + if (var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) { // L: 4149 + Client.field790 = 1; + } + + if (Client.field790 == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) { // L: 4150 + Client.field790 = 0; + } + + VertexNormal.cameraX = var22; // L: 4153 + FaceNormal.cameraY = var6; // L: 4154 + AbstractWorldMapData.cameraZ = var7; // L: 4155 + PacketBuffer.cameraPitch = var8; // L: 4156 + ServerPacket.cameraYaw = var9; // L: 4157 + if (Client.isLoading) { // L: 4158 + byte var23 = 0; // L: 4161 + var14 = var23 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; // L: 4162 + if (var14 == 0) { // L: 4166 + Client.isLoading = false; + } + } + + if (Client.isLoading) { // L: 4168 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); // L: 4169 + Actor.drawLoadingMessage("Loading - please wait.", false); // L: 4170 + } + + } // L: 4172 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java index 7bf9968c6e..56a400197b 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java @@ -1,91 +1,211 @@ -import java.applet.Applet; -import java.net.URL; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import netscape.javascript.JSObject; -@ObfuscatedName("v") +@ObfuscatedName("y") @Implements("GrandExchangeOfferTotalQuantityComparator") final class GrandExchangeOfferTotalQuantityComparator implements Comparator { - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ls;Ls;I)I", - garbageValue = "-1370720727" + descriptor = "[Lls;" + ) + @Export("runesSprite") + static IndexedSprite[] runesSprite; + @ObfuscatedName("g") + public static short[] field83; + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lf;Lf;I)I", + garbageValue = "1171850991" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); - } - - public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1); // L: 69 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 77 } - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", - garbageValue = "-68" - ) - static boolean method165(String var0, int var1, String var2) { - if (var1 == 0) { - try { - if (!class60.field450.startsWith("win")) { - throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var14 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + public int compare(Object var1, Object var2) { + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 73 + } - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var14.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "666077913" + ) + static int method172(int var0, int var1) { + if (var0 == -2) { // L: 15 + return 12345678; + } else if (var0 == -1) { // L: 16 + if (var1 < 0) { + var1 = 0; // L: 18 + } else if (var1 > 127) { // L: 20 + var1 = 127; // L: 21 + } + + var1 = 127 - var1; // L: 23 + return var1; // L: 24 + } else { + var1 = (var0 & 127) * var1 / 128; // L: 26 + if (var1 < 2) { // L: 27 + var1 = 2; + } else if (var1 > 126) { // L: 28 + var1 = 126; + } + + return (var0 & 65408) + var1; // L: 29 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IB)Ljq;", + garbageValue = "5" + ) + @Export("ItemDefinition_get") + public static ItemDefinition ItemDefinition_get(int var0) { + ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); // L: 92 + if (var1 != null) { // L: 93 + return var1; + } else { + byte[] var2 = class231.ItemDefinition_archive.takeFile(10, var0); // L: 94 + var1 = new ItemDefinition(); // L: 95 + var1.id = var0; // L: 96 + if (var2 != null) { // L: 97 + var1.decode(new Buffer(var2)); + } + + var1.post(); // L: 98 + if (var1.noteTemplate != -1) { // L: 99 + var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + } + + if (var1.notedId != -1) { // L: 100 + var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); + } + + if (var1.placeholderTemplate != -1) { // L: 101 + var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); + } + + if (!ItemDefinition.ItemDefinition_inMembersWorld && var1.isMembersOnly) { // L: 102 + var1.name = "Members object"; // L: 103 + var1.isTradable = false; // L: 104 + var1.groundActions = null; // L: 105 + var1.inventoryActions = null; // L: 106 + var1.shiftClickIndex = -1; // L: 107 + var1.team = 0; // L: 108 + if (var1.params != null) { // L: 109 + boolean var3 = false; // L: 110 + + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 111 + ParamDefinition var5 = PlayerAppearance.getParamDefinition((int)var4.key); // L: 112 + if (var5.autoDisable) { // L: 113 + var4.remove(); + } else { + var3 = true; // L: 114 } } - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; + if (!var3) { // L: 116 + var1.params = null; + } } - } catch (Throwable var8) { - return false; - } - } else if (var1 == 1) { - try { - Applet var7 = class60.applet; - Object[] var5 = new Object[]{(new URL(class60.applet.getCodeBase(), var0)).toString()}; - Object var13 = JSObject.getWindow(var7).call(var2, var5); - return var13 != null; - } catch (Throwable var9) { - return false; - } - } else if (var1 == 2) { - try { - class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_blank"); - return true; - } catch (Exception var10) { - return false; - } - } else if (var1 == 3) { - try { - Applet var3 = class60.applet; - JSObject.getWindow(var3).call("loggedout", (Object[])null); - } catch (Throwable var12) { } - try { - class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_top"); - return true; - } catch (Exception var11) { - return false; - } - } else { - throw new IllegalArgumentException(); + ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); // L: 119 + return var1; // L: 120 } } + + @ObfuscatedName("k") + @Export("base37DecodeLong") + public static String base37DecodeLong(long var0) { + if (var0 > 0L && var0 < 6582952005840035281L) { // L: 34 + if (var0 % 37L == 0L) { // L: 35 + return null; + } else { + int var2 = 0; // L: 36 + + for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 37 38 40 + ++var2; // L: 39 + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 42 43 + long var6 = var0; // L: 44 + var0 /= 37L; // L: 45 + var8 = class298.base37Table[(int)(var6 - var0 * 37L)]; // L: 46 + if (var8 == '_') { // L: 47 + int var9 = var5.length() - 1; // L: 48 + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 49 + var8 = 160; // L: 50 + } + } + + var5.reverse(); // L: 54 + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 55 + return var5.toString(); + } + } else { + return null; + } + } + + @ObfuscatedName("k") + public static boolean method173(long var0) { + boolean var2 = 0L != var0; // L: 52 + if (var2) { // L: 53 + boolean var3 = (int)(var0 >>> 16 & 1L) == 1; // L: 56 + var2 = !var3; // L: 58 + } + + return var2; // L: 60 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "2133866985" + ) + @Export("Widget_unpackTargetMask") + public static int Widget_unpackTargetMask(int var0) { + return var0 >> 11 & 63; // L: 17 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/CharSequence;I)I", + garbageValue = "1811677104" + ) + @Export("parseInt") + public static int parseInt(CharSequence var0) { + return UserComparator7.parseIntCustomRadix(var0, 10, true); // L: 67 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2132548468" + ) + static void method169() { + Login.loginIndex = 24; // L: 1745 + UrlRequester.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1746 + } // L: 1747 + + @ObfuscatedName("ho") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-2070536842" + ) + static void method164() { + WorldMapSprite.method493(DevicePcmPlayerProvider.menuWidth / 2 + ChatChannel.menuX, Client.menuY); // L: 7205 + } // L: 7206 } diff --git a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java index e6e6451651..e14a813afe 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java @@ -1,117 +1,69 @@ -import java.net.MalformedURLException; -import java.net.URL; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("e") +@ObfuscatedName("j") @Implements("GrandExchangeOfferUnitPriceComparator") final class GrandExchangeOfferUnitPriceComparator implements Comparator { - @ObfuscatedName("m") + @ObfuscatedName("di") @ObfuscatedSignature( - descriptor = "(Ls;Ls;B)I", - garbageValue = "0" + descriptor = "Liw;" + ) + @Export("archive4") + static Archive archive4; + @ObfuscatedName("mr") + @ObfuscatedGetter( + intValue = 401783773 + ) + @Export("selectedItemSlot") + static int selectedItemSlot; + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lf;Lf;I)I", + garbageValue = "1888921269" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); + return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1); // L: 43 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 47 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 51 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lic;Lic;B)V", - garbageValue = "15" + descriptor = "(Lmu;B)I", + garbageValue = "1" ) - public static void method195(AbstractArchive var0, AbstractArchive var1) { - KitDefinition.KitDefinition_archive = var0; - KitDefinition.KitDefinition_modelsArchive = var1; - KitDefinition.KitDefinition_fileCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)Z", - garbageValue = "-1062830390" - ) - static boolean method204(String var0) { - if (var0 == null) { - return false; + public static final int method211(LoginType var0) { + if (var0 == null) { // L: 16 + return 12; // L: 17 } else { - try { - new URL(var0); - return true; - } catch (MalformedURLException var2) { - return false; + switch(var0.field4063) { // L: 19 + case 7: + return 20; // L: 23 + default: + return 12; // L: 21 } } } - @ObfuscatedName("ar") + @ObfuscatedName("km") @ObfuscatedSignature( - descriptor = "(Ljg;S)Z", - garbageValue = "255" + descriptor = "(Lhq;I)Z", + garbageValue = "798311981" ) - static boolean method202(ObjectDefinition var0) { - if (var0.transforms != null) { - int[] var1 = var0.transforms; - - for (int var2 = 0; var2 < var1.length; ++var2) { - int var3 = var1[var2]; - ObjectDefinition var4 = Canvas.getObjectDefinition(var3); - if (var4.mapIconId != -1) { - return true; - } - } - } else if (var0.mapIconId != -1) { - return true; - } - - return false; - } - - @ObfuscatedName("ix") - @ObfuscatedSignature( - descriptor = "([Lhd;IIIZB)V", - garbageValue = "0" - ) - @Export("resizeInterface") - static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { - for (int var5 = 0; var5 < var0.length; ++var5) { - Widget var6 = var0[var5]; - if (var6 != null && var6.parentId == var1) { - UserComparator3.alignWidgetSize(var6, var2, var3, var4); - WorldMapLabel.alignWidgetPosition(var6, var2, var3); - if (var6.scrollX > var6.scrollWidth - var6.width) { - var6.scrollX = var6.scrollWidth - var6.width; - } - - if (var6.scrollX < 0) { - var6.scrollX = 0; - } - - if (var6.scrollY > var6.scrollHeight - var6.height) { - var6.scrollY = var6.scrollHeight - var6.height; - } - - if (var6.scrollY < 0) { - var6.scrollY = 0; - } - - if (var6.type == 0) { - WorldMapIcon_0.revalidateWidgetScroll(var0, var6, var4); - } - } - } - + @Export("isComponentHidden") + static boolean isComponentHidden(Widget var0) { + return var0.isHidden; // L: 10732 } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index 93709483ec..9c2c941942 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -1,170 +1,766 @@ import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("k") +@ObfuscatedName("q") @Implements("GrandExchangeOfferWorldComparator") final class GrandExchangeOfferWorldComparator implements Comparator { - @ObfuscatedName("bf") + @ObfuscatedName("hn") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "[Lls;" ) - static StudioGame field54; + @Export("modIconSprites") + static IndexedSprite[] modIconSprites; + @ObfuscatedName("im") + @ObfuscatedGetter( + intValue = -1435460859 + ) + @Export("oculusOrbFocalPointX") + static int oculusOrbFocalPointX; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ls;Ls;B)I", - garbageValue = "-1" + descriptor = "(Lf;Lf;I)I", + garbageValue = "-1922470" ) @Export("compare_bridged") int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { - return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); - } - - public boolean equals(Object var1) { - return super.equals(var1); + return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1); // L: 28 } public int compare(Object var1, Object var2) { - return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); + return this.compare_bridged((GrandExchangeEvent)var1, (GrandExchangeEvent)var2); // L: 32 } - @ObfuscatedName("u") + public boolean equals(Object var1) { + return super.equals(var1); // L: 36 + } + + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1613064985" + descriptor = "(IIIIIILec;Lft;B)V", + garbageValue = "-56" ) - static int method137(int var0, Script var1, boolean var2) { - boolean var3 = true; - Widget var4; - if (var0 >= 2000) { - var0 -= 1000; - var4 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - var3 = false; - } else { - var4 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - } - - int var11; - if (var0 == ScriptOpcodes.CC_SETOP) { - var11 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - var4.setAction(var11, Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]); - return 1; - } else { - --WorldMapEvent.Interpreter_stringStackSize; - return 1; + static final void method137(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { + if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { // L: 236 237 238 + if (var0 < Tiles.Tiles_minPlane) { // L: 241 + Tiles.Tiles_minPlane = var0; } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { - UrlRequester.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var4.parent = WorldMapLabelSize.getWidgetChild(var11, var6); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { - var4.dataText = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 1309) { - --UrlRequester.Interpreter_intStackSize; - return 1; + + ObjectDefinition var8 = MidiPcmStream.getObjectDefinition(var3); // L: 242 + int var9; + int var10; + if (var4 != 1 && var4 != 3) { // L: 245 + var9 = var8.sizeX; // L: 250 + var10 = var8.sizeY; // L: 251 } else { - int var7; - byte[] var9; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - UrlRequester.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]}; - PendingSpawn.Widget_setKey(var4, var5, var9, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { - UrlRequester.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - WorldMapRectangle.Widget_setKeyRate(var4, var11, var6, var7); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - WorldMapRectangle.Widget_setKeyRate(var4, var5, var6, var7); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { - --UrlRequester.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - FontName.Widget_setKeyIgnoreHeld(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - FontName.Widget_setKeyIgnoreHeld(var4, var5); - return 1; + var9 = var8.sizeY; // L: 246 + var10 = var8.sizeX; // L: 247 + } + + int var11; + int var12; + if (var9 + var1 <= 104) { // L: 257 + var11 = (var9 >> 1) + var1; // L: 258 + var12 = (var9 + 1 >> 1) + var1; // L: 259 + } else { + var11 = var1; // L: 262 + var12 = var1 + 1; // L: 263 + } + + int var13; + int var14; + if (var10 + var2 <= 104) { // L: 265 + var13 = (var10 >> 1) + var2; // L: 266 + var14 = var2 + (var10 + 1 >> 1); // L: 267 + } else { + var13 = var2; // L: 270 + var14 = var2 + 1; // L: 271 + } + + int[][] var15 = Tiles.Tiles_heights[var0]; // L: 273 + int var16 = var15[var11][var13] + var15[var12][var13] + var15[var11][var14] + var15[var12][var14] >> 2; // L: 274 + int var17 = (var1 << 7) + (var9 << 6); // L: 275 + int var18 = (var2 << 7) + (var10 << 6); // L: 276 + long var19 = class227.calculateTag(var1, var2, 2, var8.int1 == 0, var3); // L: 277 + int var21 = var5 + (var4 << 6); // L: 278 + if (var8.int3 == 1) { // L: 279 + var21 += 256; + } + + if (var8.hasSound()) { // L: 280 + class280.method5093(var0, var1, var2, var8, var4); + } + + Object var29; + if (var5 == 22) { // L: 281 + if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { // L: 282 + if (var8.animationId == -1 && var8.transforms == null) { // L: 284 + var29 = var8.getEntity(22, var4, var15, var17, var16, var18); } else { - return 2; + var29 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 285 } - } else { - byte[] var8 = null; - var9 = null; - if (var3) { - UrlRequester.Interpreter_intStackSize -= 10; - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + UrlRequester.Interpreter_intStackSize] >= 0; var7 += 2) { + var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var29, var19, var21); // L: 286 + if (var8.interactType == 1 && var7 != null) { // L: 287 + var7.setBlockedByFloorDec(var1, var2); + } + + } + } else { + int var28; + if (var5 != 10 && var5 != 11) { // L: 290 + int[] var10000; + if (var5 >= 12) { // L: 311 + if (var8.animationId == -1 && var8.transforms == null) { // L: 313 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 314 } - if (var7 > 0) { - var8 = new byte[var7 / 2]; - var9 = new byte[var7 / 2]; + var6.method3263(var0, var1, var2, var16, 1, 1, (Entity)var29, 0, var19, var21); // L: 315 + if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 316 + var10000 = class204.field2421[var0][var1]; + var10000[var2] |= 2340; + } - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + UrlRequester.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + UrlRequester.Interpreter_intStackSize + 1]; + if (var8.interactType != 0 && var7 != null) { // L: 317 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } else if (var5 == 0) { // L: 320 + if (var8.animationId == -1 && var8.transforms == null) { // L: 322 + var29 = var8.getEntity(0, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 323 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)null, Tiles.field524[var4], 0, var19, var21); // L: 324 + if (var4 == 0) { // L: 325 + if (var8.clipped) { // L: 326 + class22.field122[var0][var1][var2] = 50; // L: 327 + class22.field122[var0][var1][var2 + 1] = 50; // L: 328 + } + + if (var8.modelClipped) { // L: 330 + var10000 = class204.field2421[var0][var1]; + var10000[var2] |= 585; + } + } else if (var4 == 1) { // L: 332 + if (var8.clipped) { // L: 333 + class22.field122[var0][var1][var2 + 1] = 50; // L: 334 + class22.field122[var0][var1 + 1][var2 + 1] = 50; // L: 335 + } + + if (var8.modelClipped) { // L: 337 + var10000 = class204.field2421[var0][var1]; + var10000[1 + var2] |= 1170; + } + } else if (var4 == 2) { // L: 339 + if (var8.clipped) { // L: 340 + class22.field122[var0][var1 + 1][var2] = 50; // L: 341 + class22.field122[var0][var1 + 1][var2 + 1] = 50; // L: 342 + } + + if (var8.modelClipped) { // L: 344 + var10000 = class204.field2421[var0][var1 + 1]; + var10000[var2] |= 585; + } + } else if (var4 == 3) { // L: 346 + if (var8.clipped) { // L: 347 + class22.field122[var0][var1][var2] = 50; // L: 348 + class22.field122[var0][var1 + 1][var2] = 50; // L: 349 + } + + if (var8.modelClipped) { // L: 351 + var10000 = class204.field2421[var0][var1]; + var10000[var2] |= 1170; } } + + if (var8.interactType != 0 && var7 != null) { // L: 353 + var7.method3630(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 354 + var6.method3204(var0, var1, var2, var8.int2); + } + + } else if (var5 == 1) { // L: 357 + if (var8.animationId == -1 && var8.transforms == null) { // L: 359 + var29 = var8.getEntity(1, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 360 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)null, Tiles.field525[var4], 0, var19, var21); // L: 361 + if (var8.clipped) { // L: 362 + if (var4 == 0) { + class22.field122[var0][var1][var2 + 1] = 50; // L: 363 + } else if (var4 == 1) { // L: 364 + class22.field122[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 365 + class22.field122[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 366 + class22.field122[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 368 + var7.method3630(var1, var2, var5, var4, var8.boolean1); + } + } else { - UrlRequester.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]}; + int var22; + if (var5 == 2) { // L: 371 + var22 = var4 + 1 & 3; // L: 372 + Object var24; + Object var30; + if (var8.animationId == -1 && var8.transforms == null) { // L: 375 + var30 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 376 + var24 = var8.getEntity(2, var22, var15, var17, var16, var18); // L: 377 + } else { + var30 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 380 + var24 = new DynamicObject(var3, 2, var22, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 381 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var30, (Entity)var24, Tiles.field524[var4], Tiles.field524[var22], var19, var21); // L: 383 + if (var8.modelClipped) { // L: 384 + if (var4 == 0) { // L: 385 + var10000 = class204.field2421[var0][var1]; // L: 386 + var10000[var2] |= 585; + var10000 = class204.field2421[var0][var1]; // L: 387 + var10000[var2 + 1] |= 1170; + } else if (var4 == 1) { // L: 389 + var10000 = class204.field2421[var0][var1]; // L: 390 + var10000[1 + var2] |= 1170; + var10000 = class204.field2421[var0][var1 + 1]; // L: 391 + var10000[var2] |= 585; + } else if (var4 == 2) { // L: 393 + var10000 = class204.field2421[var0][var1 + 1]; // L: 394 + var10000[var2] |= 585; + var10000 = class204.field2421[var0][var1]; // L: 395 + var10000[var2] |= 1170; + } else if (var4 == 3) { // L: 397 + var10000 = class204.field2421[var0][var1]; // L: 398 + var10000[var2] |= 1170; + var10000 = class204.field2421[var0][var1]; // L: 399 + var10000[var2] |= 585; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 402 + var7.method3630(var1, var2, var5, var4, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 403 + var6.method3204(var0, var1, var2, var8.int2); + } + + } else if (var5 == 3) { // L: 406 + if (var8.animationId == -1 && var8.transforms == null) { // L: 408 + var29 = var8.getEntity(3, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 409 + } + + var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)null, Tiles.field525[var4], 0, var19, var21); // L: 410 + if (var8.clipped) { // L: 411 + if (var4 == 0) { // L: 412 + class22.field122[var0][var1][var2 + 1] = 50; + } else if (var4 == 1) { // L: 413 + class22.field122[var0][var1 + 1][var2 + 1] = 50; + } else if (var4 == 2) { // L: 414 + class22.field122[var0][var1 + 1][var2] = 50; + } else if (var4 == 3) { // L: 415 + class22.field122[var0][var1][var2] = 50; + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 417 + var7.method3630(var1, var2, var5, var4, var8.boolean1); + } + + } else if (var5 == 9) { // L: 420 + if (var8.animationId == -1 && var8.transforms == null) { // L: 422 + var29 = var8.getEntity(var5, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 423 + } + + var6.method3263(var0, var1, var2, var16, 1, 1, (Entity)var29, 0, var19, var21); // L: 424 + if (var8.interactType != 0 && var7 != null) { // L: 425 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + if (var8.int2 != 16) { // L: 426 + var6.method3204(var0, var1, var2, var8.int2); + } + + } else if (var5 == 4) { // L: 429 + if (var8.animationId == -1 && var8.transforms == null) { // L: 431 + var29 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 432 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var29, (Entity)null, Tiles.field524[var4], 0, 0, 0, var19, var21); // L: 433 + } else { + long var23; + Object var25; + if (var5 == 5) { // L: 436 + var22 = 16; // L: 437 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 438 + if (0L != var23) { // L: 439 + var22 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var23)).int2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 441 + var25 = var8.getEntity(4, var4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 442 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)null, Tiles.field524[var4], 0, var22 * Tiles.field517[var4], var22 * Tiles.field527[var4], var19, var21); // L: 443 + } else if (var5 == 6) { // L: 446 + var22 = 8; // L: 447 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 448 + if (var23 != 0L) { // L: 449 + var22 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var23)).int2 / 2; + } + + if (var8.animationId == -1 && var8.transforms == null) { // L: 451 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 452 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)null, 256, var4, var22 * Tiles.field534[var4], var22 * Tiles.field529[var4], var19, var21); // L: 453 + } else if (var5 == 7) { // L: 456 + var28 = var4 + 2 & 3; // L: 458 + if (var8.animationId == -1 && var8.transforms == null) { // L: 459 + var29 = var8.getEntity(4, var28 + 4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 4, var28 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 460 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var29, (Entity)null, 256, var28, 0, 0, var19, var21); // L: 461 + } else if (var5 == 8) { // L: 464 + var22 = 8; // L: 465 + var23 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 466 + if (var23 != 0L) { // L: 467 + var22 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var23)).int2 / 2; + } + + int var27 = var4 + 2 & 3; // L: 470 + Object var26; + if (var8.animationId == -1 && var8.transforms == null) { // L: 471 + var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 472 + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 473 + } else { + var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 476 + var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 477 + } + + var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)var26, 256, var4, var22 * Tiles.field534[var4], var22 * Tiles.field529[var4], var19, var21); // L: 479 + } + } + } + } else { + if (var8.animationId == -1 && var8.transforms == null) { // L: 292 + var29 = var8.getEntity(10, var4, var15, var17, var16, var18); + } else { + var29 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); // L: 293 } - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - PendingSpawn.Widget_setKey(var4, var7, var8, var9); - return 1; + if (var29 != null && var6.method3263(var0, var1, var2, var16, var9, var10, (Entity)var29, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 294 295 + var28 = 15; // L: 296 + if (var29 instanceof Model) { // L: 297 + var28 = ((Model)var29).method3016() / 4; // L: 298 + if (var28 > 30) { // L: 299 + var28 = 30; + } + } + + for (int var31 = 0; var31 <= var9; ++var31) { // L: 301 + for (int var32 = 0; var32 <= var10; ++var32) { // L: 302 + if (var28 > class22.field122[var0][var31 + var1][var32 + var2]) { // L: 303 + class22.field122[var0][var31 + var1][var32 + var2] = (byte)var28; + } + } + } + } + + if (var8.interactType != 0 && var7 != null) { // L: 308 + var7.addGameObject(var1, var2, var9, var10, var8.boolean1); + } + + } + } + } + } // L: 288 309 318 355 369 404 418 427 434 444 454 462 480 482 + + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(ILcy;ZB)I", + garbageValue = "-107" + ) + static int method141(int var0, Script var1, boolean var2) { + String var7; + if (var0 == ScriptOpcodes.MES) { // L: 1306 + var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1307 + WorldMapRectangle.addGameMessage(0, "", var7); // L: 1308 + return 1; // L: 1309 + } else if (var0 == ScriptOpcodes.ANIM) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1312 + GrandExchangeOfferNameComparator.performPlayerAnimation(WorldMapLabelSize.localPlayer, Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1313 + return 1; // L: 1314 + } else if (var0 == ScriptOpcodes.IF_CLOSE) { + if (!Interpreter.field1132) { // L: 1317 + Interpreter.field1131 = true; // L: 1318 + } + + return 1; // L: 1320 + } else { + int var15; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1323 + var15 = 0; // L: 1324 + if (World.isNumber(var7)) { // L: 1325 + var15 = GrandExchangeOfferTotalQuantityComparator.parseInt(var7); + } + + PacketBufferNode var13 = Client.getPacketBufferNode(ClientPacket.field2332, Client.packetWriter.isaacCipher); // L: 1327 + var13.packetBuffer.writeInt(var15); // L: 1328 + Client.packetWriter.addNode(var13); // L: 1329 + return 1; // L: 1330 + } else { + PacketBufferNode var11; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1333 + var11 = Client.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); // L: 1335 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1336 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1337 + Client.packetWriter.addNode(var11); // L: 1338 + return 1; // L: 1339 + } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1342 + var11 = Client.getPacketBufferNode(ClientPacket.field2339, Client.packetWriter.isaacCipher); // L: 1344 + var11.packetBuffer.writeByte(var7.length() + 1); // L: 1345 + var11.packetBuffer.writeStringCp1252NullTerminated(var7); // L: 1346 + Client.packetWriter.addNode(var11); // L: 1347 + return 1; // L: 1348 + } else { + String var4; + int var10; + if (var0 == ScriptOpcodes.OPPLAYER) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1351 + var4 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1352 + Archive.method4383(var10, var4); // L: 1353 + return 1; // L: 1354 + } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 3; // L: 1357 + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1358 + var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1359 + int var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1360 + Widget var14 = TileItem.getWidget(var9); // L: 1361 + class13.clickWidget(var14, var10, var15); // L: 1362 + return 1; // L: 1363 + } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1366 + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1367 + var15 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1368 + Widget var12 = var2 ? Canvas.field438 : class3.field12; // L: 1369 + class13.clickWidget(var12, var10, var15); // L: 1370 + return 1; // L: 1371 + } else if (var0 == ScriptOpcodes.MOUSECAM) { + ScriptEvent.mouseCam = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1374 + return 1; // L: 1375 + } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tile.clientPreferences.roofsHidden ? 1 : 0; // L: 1378 + return 1; // L: 1379 + } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + Tile.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1382 + WorldMapData_1.savePreferences(); // L: 1383 + return 1; // L: 1384 + } else if (var0 == ScriptOpcodes.OPENURL) { + var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 1387 + boolean var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1388 + class280.openURL(var7, var8, false); // L: 1389 + return 1; // L: 1390 + } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1393 + var11 = Client.getPacketBufferNode(ClientPacket.field2338, Client.packetWriter.isaacCipher); // L: 1395 + var11.packetBuffer.writeShort(var10); // L: 1396 + Client.packetWriter.addNode(var11); // L: 1397 + return 1; // L: 1398 + } else if (var0 == ScriptOpcodes.BUG_REPORT) { + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1401 + Varps.Interpreter_stringStackSize -= 2; // L: 1402 + var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 1403 + String var5 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 1404 + if (var4.length() > 500) { // L: 1405 + return 1; + } else if (var5.length() > 500) { // L: 1406 + return 1; + } else { + PacketBufferNode var6 = Client.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); // L: 1407 + var6.packetBuffer.writeShort(1 + Decimator.stringCp1252NullTerminatedByteSize(var4) + Decimator.stringCp1252NullTerminatedByteSize(var5)); // L: 1408 + var6.packetBuffer.writeStringCp1252NullTerminated(var5); // L: 1409 + var6.packetBuffer.method5645(var10); // L: 1410 + var6.packetBuffer.writeStringCp1252NullTerminated(var4); // L: 1411 + Client.packetWriter.addNode(var6); // L: 1412 + return 1; // L: 1413 + } + } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1416 + return 1; // L: 1417 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1420 + return 1; // L: 1421 + } else if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1424 + return 1; // L: 1425 + } else if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1428 + Client.drawPlayerNames |= 1; + } else { + Client.drawPlayerNames &= -2; // L: 1429 + } + + return 1; // L: 1430 + } else if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1433 + Client.drawPlayerNames |= 2; + } else { + Client.drawPlayerNames &= -3; // L: 1434 + } + + return 1; // L: 1435 + } else if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1438 + Client.drawPlayerNames |= 4; + } else { + Client.drawPlayerNames &= -5; // L: 1439 + } + + return 1; // L: 1440 + } else if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1) { // L: 1443 + Client.drawPlayerNames |= 8; + } else { + Client.drawPlayerNames &= -9; // L: 1444 + } + + return 1; // L: 1445 + } else if (var0 == 3124) { + Client.drawPlayerNames = 0; // L: 1448 + return 1; // L: 1449 + } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1452 + return 1; // L: 1453 + } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1456 + return 1; // L: 1457 + } else if (var0 == ScriptOpcodes.SETTAPTODROP) { + GrandExchangeEvents.setTapToDrop(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1); // L: 1460 + return 1; // L: 1461 + } else if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClanChat.getTapToDrop() ? 1 : 0; // L: 1464 + return 1; // L: 1465 + } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1468 + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1469 + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1470 + return 1; // L: 1471 + } else if (var0 == 3130) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1474 + return 1; // L: 1475 + } else if (var0 == 3131) { + --Interpreter.Interpreter_intStackSize; // L: 1478 + return 1; // L: 1479 + } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorDecoration.canvasWidth; // L: 1482 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GameShell.canvasHeight; // L: 1483 + return 1; // L: 1484 + } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --Interpreter.Interpreter_intStackSize; // L: 1487 + return 1; // L: 1488 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; // L: 1491 + } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1494 + return 1; // L: 1495 + } else if (var0 == 3136) { + Client.field865 = 3; // L: 1498 + Client.field840 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1499 + return 1; // L: 1500 + } else if (var0 == 3137) { + Client.field865 = 2; // L: 1503 + Client.field840 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1504 + return 1; // L: 1505 + } else if (var0 == 3138) { + Client.field865 = 0; // L: 1508 + return 1; // L: 1509 + } else if (var0 == 3139) { + Client.field865 = 1; // L: 1512 + return 1; // L: 1513 + } else if (var0 == 3140) { + Client.field865 = 3; // L: 1516 + Client.field840 = var2 ? Canvas.field438.id * 1163691799 * 1189552295 : class3.field12.id * 1163691799 * 1189552295; // L: 1517 + return 1; // L: 1518 } else { - throw new RuntimeException(); + boolean var3; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1521 + Tile.clientPreferences.hideUsername = var3; // L: 1522 + WorldMapData_1.savePreferences(); // L: 1523 + return 1; // L: 1524 + } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tile.clientPreferences.hideUsername ? 1 : 0; // L: 1527 + return 1; // L: 1528 + } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1531 + Client.Login_isUsernameRemembered = var3; // L: 1532 + if (!var3) { // L: 1533 + Tile.clientPreferences.rememberedUsername = ""; // L: 1534 + WorldMapData_1.savePreferences(); // L: 1535 + } + + return 1; // L: 1537 + } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; // L: 1540 + return 1; // L: 1541 + } else if (var0 == 3145) { + return 1; // L: 1544 + } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 1547 + if (var3 == Tile.clientPreferences.titleMusicDisabled) { // L: 1548 + Tile.clientPreferences.titleMusicDisabled = !var3; // L: 1549 + WorldMapData_1.savePreferences(); // L: 1550 + } + + return 1; // L: 1552 + } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tile.clientPreferences.titleMusicDisabled ? 0 : 1; // L: 1555 + return 1; // L: 1556 + } else if (var0 == 3148) { + return 1; // L: 1559 + } else if (var0 == 3149) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1562 + return 1; // L: 1563 + } else if (var0 == 3150) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1566 + return 1; // L: 1567 + } else if (var0 == 3151) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1570 + return 1; // L: 1571 + } else if (var0 == 3152) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1574 + return 1; // L: 1575 + } else if (var0 == 3153) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; // L: 1578 + return 1; // L: 1579 + } else if (var0 == 3154) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapData_1.method785(); // L: 1582 + return 1; // L: 1583 + } else if (var0 == 3155) { + --Varps.Interpreter_stringStackSize; // L: 1586 + return 1; // L: 1587 + } else if (var0 == 3156) { + return 1; // L: 1590 + } else if (var0 == 3157) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1593 + return 1; // L: 1594 + } else if (var0 == 3158) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1597 + return 1; // L: 1598 + } else if (var0 == 3159) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1601 + return 1; // L: 1602 + } else if (var0 == 3160) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1605 + return 1; // L: 1606 + } else if (var0 == 3161) { + --Interpreter.Interpreter_intStackSize; // L: 1609 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1610 + return 1; // L: 1611 + } else if (var0 == 3162) { + --Interpreter.Interpreter_intStackSize; // L: 1614 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1615 + return 1; // L: 1616 + } else if (var0 == 3163) { + --Varps.Interpreter_stringStackSize; // L: 1619 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1620 + return 1; // L: 1621 + } else if (var0 == 3164) { + --Interpreter.Interpreter_intStackSize; // L: 1624 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1625 + return 1; // L: 1626 + } else if (var0 == 3165) { + --Interpreter.Interpreter_intStackSize; // L: 1629 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1630 + return 1; // L: 1631 + } else if (var0 == 3166) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1634 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1635 + return 1; // L: 1636 + } else if (var0 == 3167) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1639 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1640 + return 1; // L: 1641 + } else if (var0 == 3168) { + Interpreter.Interpreter_intStackSize -= 2; // L: 1644 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1645 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1646 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1647 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1648 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1649 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1650 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1651 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1652 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 1653 + return 1; // L: 1654 + } else if (var0 == 3169) { + return 1; // L: 1657 + } else if (var0 == 3170) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1660 + return 1; // L: 1661 + } else if (var0 == 3171) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1664 + return 1; // L: 1665 + } else if (var0 == 3172) { + --Interpreter.Interpreter_intStackSize; // L: 1668 + return 1; // L: 1669 + } else if (var0 == 3173) { + --Interpreter.Interpreter_intStackSize; // L: 1672 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1673 + return 1; // L: 1674 + } else if (var0 == 3174) { + --Interpreter.Interpreter_intStackSize; // L: 1677 + return 1; // L: 1678 + } else if (var0 == 3175) { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1681 + return 1; // L: 1682 + } else if (var0 == 3176) { + return 1; // L: 1685 + } else if (var0 == 3177) { + return 1; // L: 1688 + } else if (var0 == 3178) { + --Varps.Interpreter_stringStackSize; // L: 1691 + return 1; // L: 1692 + } else if (var0 == 3179) { + return 1; // L: 1695 + } else if (var0 == 3180) { + --Varps.Interpreter_stringStackSize; // L: 1698 + return 1; // L: 1699 + } else { + return 2; // L: 1701 + } } } } diff --git a/runescape-client/src/main/java/GraphicsDefaults.java b/runescape-client/src/main/java/GraphicsDefaults.java index c40cfeb59c..3a2d8ecc4d 100644 --- a/runescape-client/src/main/java/GraphicsDefaults.java +++ b/runescape-client/src/main/java/GraphicsDefaults.java @@ -4,114 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lq") +@ObfuscatedName("lb") @Implements("GraphicsDefaults") public class GraphicsDefaults { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1290598403 + intValue = -1162804389 ) @Export("compass") public int compass; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 569826969 + intValue = -1318347759 ) - public int field3825; - @ObfuscatedName("q") + public int field3831; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2129341785 + intValue = 2062877841 ) @Export("mapScenes") public int mapScenes; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -971970549 + intValue = -2100530677 ) @Export("headIconsPk") public int headIconsPk; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 495160215 + intValue = -1982500985 ) - public int field3828; - @ObfuscatedName("g") + public int field3839; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 600923109 + intValue = 1352009329 ) - public int field3829; - @ObfuscatedName("n") + public int field3835; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1832791717 + intValue = 893846923 ) - public int field3830; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 1676542437 - ) - public int field3831; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 25471689 - ) - public int field3834; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -1227004577 - ) - public int field3824; + public int field3838; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -575308385 + intValue = -27380687 ) - public int field3832; + public int field3837; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 255609423 + ) + public int field3836; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1251414459 + ) + public int field3834; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 733929835 + ) + public int field3840; public GraphicsDefaults() { - this.compass = -1; - this.field3825 = -1; - this.mapScenes = -1; - this.headIconsPk = -1; - this.field3828 = -1; - this.field3829 = -1; - this.field3830 = -1; - this.field3831 = -1; - this.field3834 = -1; - this.field3824 = -1; - this.field3832 = -1; + this.compass = -1; // L: 7 + this.field3831 = -1; // L: 8 + this.mapScenes = -1; // L: 9 + this.headIconsPk = -1; // L: 10 + this.field3839 = -1; // L: 11 + this.field3835 = -1; // L: 12 + this.field3838 = -1; // L: 13 + this.field3837 = -1; // L: 14 + this.field3836 = -1; // L: 15 + this.field3834 = -1; // L: 16 + this.field3840 = -1; // L: 17 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lic;B)V", - garbageValue = "0" + descriptor = "(Lic;I)V", + garbageValue = "-2057643179" ) @Export("decode") public void decode(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3822.group); - Buffer var3 = new Buffer(var2); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3828.group); // L: 20 + Buffer var3 = new Buffer(var2); // L: 21 while (true) { - int var4 = var3.readUnsignedByte(); - if (var4 == 0) { - return; + int var4 = var3.readUnsignedByte(); // L: 23 + if (var4 == 0) { // L: 24 + return; // L: 51 } - switch(var4) { + switch(var4) { // L: 25 case 1: - var3.readMedium(); + var3.readMedium(); // L: 28 break; case 2: - this.compass = var3.method5843(); - this.field3825 = var3.method5843(); - this.mapScenes = var3.method5843(); - this.headIconsPk = var3.method5843(); - this.field3828 = var3.method5843(); - this.field3829 = var3.method5843(); - this.field3830 = var3.method5843(); - this.field3831 = var3.method5843(); - this.field3834 = var3.method5843(); - this.field3824 = var3.method5843(); - this.field3832 = var3.method5843(); + this.compass = var3.method5634(); // L: 36 + this.field3831 = var3.method5634(); // L: 37 + this.mapScenes = var3.method5634(); // L: 38 + this.headIconsPk = var3.method5634(); // L: 39 + this.field3839 = var3.method5634(); // L: 40 + this.field3835 = var3.method5634(); // L: 41 + this.field3838 = var3.method5634(); // L: 42 + this.field3837 = var3.method5634(); // L: 43 + this.field3836 = var3.method5634(); // L: 44 + this.field3834 = var3.method5634(); // L: 45 + this.field3840 = var3.method5634(); // L: 46 } } } diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 2151a36653..fb98f29134 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -1,138 +1,209 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cj") +@ObfuscatedName("cm") @Implements("GraphicsObject") public final class GraphicsObject extends Entity { - @ObfuscatedName("si") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 4282492011964986707L - ) - static long field1139; - @ObfuscatedName("dz") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive10") - static Archive archive10; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 555151267 - ) - @Export("id") - int id; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 953571075 - ) - @Export("cycleStart") - int cycleStart; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 35157473 - ) - @Export("plane") - int plane; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1616692737 - ) - @Export("x") - int x; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -2135993151 - ) - @Export("y") - int y; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -1585173771 + intValue = -1326465881 ) @Export("height") int height; - @ObfuscatedName("n") + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1027327973 + ) + @Export("id") + int id; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1536729399 + ) + @Export("cycleStart") + int cycleStart; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1152665819 + ) + @Export("plane") + int plane; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1500063053 + ) + @Export("x") + int x; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -1460229241 + ) + @Export("y") + int y; + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Ljm;" ) @Export("sequenceDefinition") SequenceDefinition sequenceDefinition; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1643713967 + intValue = 1933421917 ) @Export("frame") int frame; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1415873335 + intValue = 1610487487 ) @Export("frameCycle") int frameCycle; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("isFinished") boolean isFinished; GraphicsObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - this.frame = 0; - this.frameCycle = 0; - this.isFinished = false; - this.id = var1; - this.plane = var2; - this.x = var3; - this.y = var4; - this.height = var5; - this.cycleStart = var7 + var6; - int var8 = class4.SpotAnimationDefinition_get(this.id).sequence; - if (var8 != -1) { - this.isFinished = false; - this.sequenceDefinition = NetSocket.SequenceDefinition_get(var8); + this.frame = 0; // L: 16 + this.frameCycle = 0; // L: 17 + this.isFinished = false; // L: 18 + this.id = var1; // L: 21 + this.plane = var2; // L: 22 + this.x = var3; // L: 23 + this.y = var4; // L: 24 + this.height = var5; // L: 25 + this.cycleStart = var7 + var6; // L: 26 + int var8 = Tiles.SpotAnimationDefinition_get(this.id).sequence; // L: 27 + if (var8 != -1) { // L: 28 + this.isFinished = false; // L: 29 + this.sequenceDefinition = WorldMapRegion.SequenceDefinition_get(var8); // L: 30 } else { - this.isFinished = true; + this.isFinished = true; // L: 32 } - } + } // L: 33 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1084299452" + garbageValue = "-1653124671" ) @Export("advance") final void advance(int var1) { - if (!this.isFinished) { - this.frameCycle += var1; + if (!this.isFinished) { // L: 36 + this.frameCycle += var1; // L: 37 - while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { - this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; - ++this.frame; - if (this.frame >= this.sequenceDefinition.frameIds.length) { - this.isFinished = true; + while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) { // L: 38 + this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 39 + ++this.frame; // L: 40 + if (this.frame >= this.sequenceDefinition.frameIds.length) { // L: 41 + this.isFinished = true; // L: 42 break; } } } - } + } // L: 46 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lef;", - garbageValue = "1832696685" + descriptor = "(I)Ler;", + garbageValue = "-2026237468" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = class4.SpotAnimationDefinition_get(this.id); + SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 49 Model var2; - if (!this.isFinished) { + if (!this.isFinished) { // L: 51 var2 = var1.getModel(this.frame); } else { - var2 = var1.getModel(-1); + var2 = var1.getModel(-1); // L: 52 } - return var2 == null ? null : var2; + return var2 == null ? null : var2; // L: 53 } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "104" + ) + static void method2091() { + try { + File var0 = new File(UserComparator2.userHomeDirectory, "random.dat"); // L: 283 + int var2; + if (var0.exists()) { // L: 284 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 285 + } else { + label38: + for (int var1 = 0; var1 < class69.field570.length; ++var1) { // L: 288 + for (var2 = 0; var2 < UserComparator4.field2005.length; ++var2) { // L: 289 + File var3 = new File(UserComparator4.field2005[var2] + class69.field570[var1] + File.separatorChar + "random.dat"); // L: 290 + if (var3.exists()) { // L: 291 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); // L: 292 + break label38; // L: 293 + } + } + } + } + + if (JagexCache.JagexCache_randomDat == null) { // L: 298 + RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); // L: 299 + var2 = var4.read(); // L: 300 + var4.seek(0L); // L: 301 + var4.write(var2); // L: 302 + var4.seek(0L); // L: 303 + var4.close(); // L: 304 + JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); // L: 305 + } + } catch (IOException var5) { // L: 308 + } + + } // L: 309 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1643627841" + ) + public static void method2095() { + try { + if (class206.musicPlayerStatus == 1) { // L: 65 + int var0 = class206.midiPcmStream.method3806(); // L: 66 + if (var0 > 0 && class206.midiPcmStream.isReady()) { // L: 67 + var0 -= FaceNormal.pcmSampleLength; // L: 68 + if (var0 < 0) { // L: 69 + var0 = 0; + } + + class206.midiPcmStream.setPcmStreamVolume(var0); // L: 70 + return; // L: 71 + } + + class206.midiPcmStream.clear(); // L: 73 + class206.midiPcmStream.removeAll(); // L: 74 + if (class204.musicTrackArchive != null) { // L: 75 + class206.musicPlayerStatus = 2; + } else { + class206.musicPlayerStatus = 0; // L: 76 + } + + class206.musicTrack = null; // L: 77 + class39.soundCache = null; // L: 78 + } + } catch (Exception var2) { // L: 81 + var2.printStackTrace(); // L: 82 + class206.midiPcmStream.clear(); // L: 83 + class206.musicPlayerStatus = 0; // L: 84 + class206.musicTrack = null; // L: 85 + class39.soundCache = null; // L: 86 + class204.musicTrackArchive = null; // L: 87 + } + + } // L: 89 } diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index d83f6f8564..a6d5635ef3 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -1,768 +1,790 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ck") +@ObfuscatedName("cu") @Implements("HealthBar") public class HealthBar extends Node { - @ObfuscatedName("p") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lic;" ) - @Export("titleboxSprite") - static IndexedSprite titleboxSprite; - @ObfuscatedName("q") + @Export("Widget_fontsArchive") + public static AbstractArchive Widget_fontsArchive; + @ObfuscatedName("l") + @Export("BZip2Decompressor_block") + static int[] BZip2Decompressor_block; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lik;" + descriptor = "Lir;" ) @Export("definition") HealthBarDefinition definition; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Ljv;" ) @Export("updates") IterableNodeDeque updates; @ObfuscatedSignature( - descriptor = "(Lik;)V" + descriptor = "(Lir;)V" ) HealthBar(HealthBarDefinition var1) { - this.updates = new IterableNodeDeque(); - this.definition = var1; - } + this.updates = new IterableNodeDeque(); // L: 12 + this.definition = var1; // L: 15 + } // L: 16 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "-61" + descriptor = "(IIIII)V", + garbageValue = "-891370152" ) @Export("put") void put(int var1, int var2, int var3, int var4) { - HealthBarUpdate var5 = null; - int var6 = 0; + HealthBarUpdate var5 = null; // L: 19 + int var6 = 0; // L: 20 - for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { - ++var6; - if (var7.cycle == var1) { - var7.set(var1, var2, var3, var4); - return; + for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) { // L: 21 + ++var6; // L: 22 + if (var7.cycle == var1) { // L: 23 + var7.set(var1, var2, var3, var4); // L: 24 + return; // L: 25 } - if (var7.cycle <= var1) { + if (var7.cycle <= var1) { // L: 27 var5 = var7; } } - if (var5 == null) { - if (var6 < 4) { + if (var5 == null) { // L: 29 + if (var6 < 4) { // L: 30 this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4)); } } else { - IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); + IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5); // L: 33 if (var6 >= 4) { - this.updates.last().remove(); + this.updates.last().remove(); // L: 34 } } - } + } // L: 31 35 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Lcb;", - garbageValue = "-200581175" + descriptor = "(IB)Lca;", + garbageValue = "-95" ) @Export("get") HealthBarUpdate get(int var1) { - HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); - if (var2 != null && var2.cycle <= var1) { - for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { - var2.remove(); - var2 = var3; + HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last(); // L: 38 + if (var2 != null && var2.cycle <= var1) { // L: 39 + for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) { // L: 40 41 + var2.remove(); // L: 42 + var2 = var3; // L: 43 } - if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { + if (this.definition.int5 + var2.cycleOffset + var2.cycle > var1) { // L: 47 return var2; } else { - var2.remove(); - return null; + var2.remove(); // L: 49 + return null; // L: 50 } } else { return null; } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1424696628" + descriptor = "(B)Z", + garbageValue = "0" ) @Export("isEmpty") boolean isEmpty() { - return this.updates.method5014(); + return this.updates.method4945(); // L: 55 } - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;III)V", - garbageValue = "1011181344" + descriptor = "(Lec;[Lft;I)V", + garbageValue = "79338939" ) - public static void method2137(String var0, String var1, int var2, int var3) throws IOException { - WorldMapDecoration.idxCount = var3; - RouteStrategy.cacheGamebuild = var2; + static final void method2113(Scene var0, CollisionMap[] var1) { + int var2; + int var3; + int var4; + int var5; + for (var2 = 0; var2 < 4; ++var2) { // L: 485 + for (var3 = 0; var3 < 104; ++var3) { // L: 486 + for (var4 = 0; var4 < 104; ++var4) { // L: 487 + if ((Tiles.Tiles_renderFlags[var2][var3][var4] & 1) == 1) { // L: 488 + var5 = var2; // L: 489 + if ((Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { // L: 490 + var5 = var2 - 1; + } - try { - class225.field2587 = System.getProperty("os.name"); - } catch (Exception var29) { - class225.field2587 = "Unknown"; - } - - JagexCache.field2077 = class225.field2587.toLowerCase(); - - try { - ArchiveLoader.userHomeDirectory = System.getProperty("user.home"); - if (ArchiveLoader.userHomeDirectory != null) { - ArchiveLoader.userHomeDirectory = ArchiveLoader.userHomeDirectory + "/"; - } - } catch (Exception var28) { - } - - try { - if (JagexCache.field2077.startsWith("win")) { - if (ArchiveLoader.userHomeDirectory == null) { - ArchiveLoader.userHomeDirectory = System.getenv("USERPROFILE"); + if (var5 >= 0) { // L: 491 + var1[var5].setBlockedByFloor(var3, var4); + } + } } - } else if (ArchiveLoader.userHomeDirectory == null) { - ArchiveLoader.userHomeDirectory = System.getenv("HOME"); } - - if (ArchiveLoader.userHomeDirectory != null) { - ArchiveLoader.userHomeDirectory = ArchiveLoader.userHomeDirectory + "/"; - } - } catch (Exception var27) { } - if (ArchiveLoader.userHomeDirectory == null) { - ArchiveLoader.userHomeDirectory = "~/"; + Tiles.field535 += (int)(Math.random() * 5.0D) - 2; // L: 496 + if (Tiles.field535 < -8) { // L: 497 + Tiles.field535 = -8; } - class234.field3096 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", ArchiveLoader.userHomeDirectory, "/tmp/", ""}; - InterfaceParent.field590 = new String[]{".jagex_cache_" + RouteStrategy.cacheGamebuild, ".file_store_" + RouteStrategy.cacheGamebuild}; - int var18 = 0; + if (Tiles.field535 > 8) { // L: 498 + Tiles.field535 = 8; + } - label248: - while (var18 < 4) { - String var6 = var18 == 0 ? "" : "" + var18; - JagexCache.JagexCache_locationFile = new File(ArchiveLoader.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); - String var7 = null; - String var8 = null; - boolean var9 = false; - int var12; - int var14; - File var34; - if (JagexCache.JagexCache_locationFile.exists()) { - try { - AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); + Tiles.field520 += (int)(Math.random() * 5.0D) - 2; // L: 499 + if (Tiles.field520 < -16) { // L: 500 + Tiles.field520 = -16; + } - Buffer var11; - for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { - var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); - if (var12 == -1) { - throw new IOException(); + if (Tiles.field520 > 16) { // L: 501 + Tiles.field520 = 16; + } + + int var9; + int var10; + int var11; + int var12; + int var13; + int var14; + int var15; + int var16; + int[] var10000; + int var17; + int var18; + for (var2 = 0; var2 < 4; ++var2) { // L: 502 + byte[][] var42 = class22.field122[var2]; // L: 503 + var9 = (int)Math.sqrt(5100.0D); // L: 509 + var10 = var9 * 768 >> 8; // L: 510 + + int var19; + int var20; + for (var11 = 1; var11 < 103; ++var11) { // L: 511 + for (var12 = 1; var12 < 103; ++var12) { // L: 512 + var13 = Tiles.Tiles_heights[var2][var12 + 1][var11] - Tiles.Tiles_heights[var2][var12 - 1][var11]; // L: 513 + var14 = Tiles.Tiles_heights[var2][var12][var11 + 1] - Tiles.Tiles_heights[var2][var12][var11 - 1]; // L: 514 + var15 = (int)Math.sqrt((double)(var13 * var13 + var14 * var14 + 65536)); // L: 515 + var16 = (var13 << 8) / var15; // L: 516 + var17 = 65536 / var15; // L: 517 + var18 = (var14 << 8) / var15; // L: 518 + var19 = (var18 * -50 + var16 * -50 + var17 * -10) / var10 + 96; // L: 519 + var20 = (var42[var12 - 1][var11] >> 2) + (var42[var12][var11 - 1] >> 2) + (var42[var12 + 1][var11] >> 3) + (var42[var12][var11 + 1] >> 3) + (var42[var12][var11] >> 1); // L: 520 + class39.field282[var12][var11] = var19 - var20; // L: 521 + } + } + + for (var11 = 0; var11 < 104; ++var11) { // L: 524 + Tiles.Tiles_hue[var11] = 0; // L: 525 + Tiles.Tiles_saturation[var11] = 0; // L: 526 + WorldMapRectangle.Tiles_lightness[var11] = 0; // L: 527 + WorldMapScaleHandler.Tiles_hueMultiplier[var11] = 0; // L: 528 + class60.field453[var11] = 0; // L: 529 + } + + for (var11 = -5; var11 < 109; ++var11) { // L: 531 + for (var12 = 0; var12 < 104; ++var12) { // L: 532 + var13 = var11 + 5; // L: 533 + int var10002; + if (var13 >= 0 && var13 < 104) { // L: 534 + var14 = Tiles.field528[var2][var13][var12] & 255; // L: 535 + if (var14 > 0) { // L: 536 + var16 = var14 - 1; // L: 538 + FloorUnderlayDefinition var44 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var16); // L: 540 + FloorUnderlayDefinition var46; + if (var44 != null) { // L: 541 + var46 = var44; // L: 542 + } else { + byte[] var45 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var16); // L: 545 + var44 = new FloorUnderlayDefinition(); // L: 546 + if (var45 != null) { // L: 547 + var44.decode(new Buffer(var45), var16); + } + + var44.postDecode(); // L: 548 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var44, (long)var16); // L: 549 + var46 = var44; // L: 550 + } + + var10000 = Tiles.Tiles_hue; // L: 553 + var10000[var12] += var46.hue; + var10000 = Tiles.Tiles_saturation; // L: 554 + var10000[var12] += var46.saturation; + var10000 = WorldMapRectangle.Tiles_lightness; // L: 555 + var10000[var12] += var46.lightness; + var10000 = WorldMapScaleHandler.Tiles_hueMultiplier; // L: 556 + var10000[var12] += var46.hueMultiplier; + var10002 = class60.field453[var12]++; // L: 557 } } - var11.offset = 0; - var12 = var11.readUnsignedByte(); - if (var12 < 1 || var12 > 3) { - throw new IOException("" + var12); - } + var14 = var11 - 5; // L: 560 + if (var14 >= 0 && var14 < 104) { // L: 561 + var15 = Tiles.field528[var2][var14][var12] & 255; // L: 562 + if (var15 > 0) { // L: 563 + var17 = var15 - 1; // L: 565 + FloorUnderlayDefinition var52 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var17); // L: 567 + FloorUnderlayDefinition var48; + if (var52 != null) { // L: 568 + var48 = var52; // L: 569 + } else { + byte[] var47 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var17); // L: 572 + var52 = new FloorUnderlayDefinition(); // L: 573 + if (var47 != null) { // L: 574 + var52.decode(new Buffer(var47), var17); + } - int var13 = 0; - if (var12 > 1) { - var13 = var11.readUnsignedByte(); - } + var52.postDecode(); // L: 575 + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var52, (long)var17); // L: 576 + var48 = var52; // L: 577 + } - if (var12 <= 2) { - var7 = var11.readStringCp1252NullCircumfixed(); - if (var13 == 1) { - var8 = var11.readStringCp1252NullCircumfixed(); + var10000 = Tiles.Tiles_hue; // L: 580 + var10000[var12] -= var48.hue; + var10000 = Tiles.Tiles_saturation; // L: 581 + var10000[var12] -= var48.saturation; + var10000 = WorldMapRectangle.Tiles_lightness; // L: 582 + var10000[var12] -= var48.lightness; + var10000 = WorldMapScaleHandler.Tiles_hueMultiplier; // L: 583 + var10000[var12] -= var48.hueMultiplier; + var10002 = class60.field453[var12]--; // L: 584 } + } + } + + if (var11 >= 1 && var11 < 103) { // L: 588 + var12 = 0; // L: 589 + var13 = 0; // L: 590 + var14 = 0; // L: 591 + var15 = 0; // L: 592 + var16 = 0; // L: 593 + + for (var17 = -5; var17 < 109; ++var17) { // L: 594 + var18 = var17 + 5; // L: 595 + if (var18 >= 0 && var18 < 104) { // L: 596 + var12 += Tiles.Tiles_hue[var18]; // L: 597 + var13 += Tiles.Tiles_saturation[var18]; // L: 598 + var14 += WorldMapRectangle.Tiles_lightness[var18]; // L: 599 + var15 += WorldMapScaleHandler.Tiles_hueMultiplier[var18]; // L: 600 + var16 += class60.field453[var18]; // L: 601 + } + + var19 = var17 - 5; // L: 603 + if (var19 >= 0 && var19 < 104) { // L: 604 + var12 -= Tiles.Tiles_hue[var19]; // L: 605 + var13 -= Tiles.Tiles_saturation[var19]; // L: 606 + var14 -= WorldMapRectangle.Tiles_lightness[var19]; // L: 607 + var15 -= WorldMapScaleHandler.Tiles_hueMultiplier[var19]; // L: 608 + var16 -= class60.field453[var19]; // L: 609 + } + + if (var17 >= 1 && var17 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var11][var17] & 2) != 0 || (Tiles.Tiles_renderFlags[var2][var11][var17] & 16) == 0)) { // L: 611 612 613 614 + if (var2 < Tiles.Tiles_minPlane) { // L: 617 + Tiles.Tiles_minPlane = var2; + } + + var20 = Tiles.field528[var2][var11][var17] & 255; // L: 618 + int var21 = Tiles.field521[var2][var11][var17] & 255; // L: 619 + if (var20 > 0 || var21 > 0) { // L: 620 + int var22 = Tiles.Tiles_heights[var2][var11][var17]; // L: 621 + int var23 = Tiles.Tiles_heights[var2][var11 + 1][var17]; // L: 622 + int var24 = Tiles.Tiles_heights[var2][var11 + 1][var17 + 1]; // L: 623 + int var25 = Tiles.Tiles_heights[var2][var11][var17 + 1]; // L: 624 + int var26 = class39.field282[var11][var17]; // L: 625 + int var27 = class39.field282[var11 + 1][var17]; // L: 626 + int var28 = class39.field282[var11 + 1][var17 + 1]; // L: 627 + int var29 = class39.field282[var11][var17 + 1]; // L: 628 + int var30 = -1; // L: 629 + int var31 = -1; // L: 630 + int var32; + int var33; + if (var20 > 0) { // L: 631 + var32 = var12 * 256 / var15; // L: 632 + var33 = var13 / var16; // L: 633 + int var34 = var14 / var16; // L: 634 + var30 = class60.hslToRgb(var32, var33, var34); // L: 635 + var32 = var32 + Tiles.field535 & 255; // L: 636 + var34 += Tiles.field520; // L: 637 + if (var34 < 0) { // L: 638 + var34 = 0; + } else if (var34 > 255) { // L: 639 + var34 = 255; + } + + var31 = class60.hslToRgb(var32, var33, var34); // L: 640 + } + + if (var2 > 0) { // L: 642 + boolean var50 = true; // L: 643 + if (var20 == 0 && class297.field3668[var2][var11][var17] != 0) { // L: 644 + var50 = false; + } + + if (var21 > 0 && !SoundSystem.method2594(var21 - 1).hideUnderlay) { // L: 645 + var50 = false; + } + + if (var50 && var23 == var22 && var22 == var24 && var22 == var25) { // L: 646 647 + var10000 = class204.field2421[var2][var11]; + var10000[var17] |= 2340; + } + } + + var32 = 0; // L: 650 + if (var31 != -1) { // L: 651 + var32 = Rasterizer3D.Rasterizer3D_colorPalette[PendingSpawn.method1795(var31, 96)]; + } + + if (var21 == 0) { // L: 652 + var0.addTile(var2, var11, var17, 0, 0, -1, var22, var23, var24, var25, PendingSpawn.method1795(var30, var26), PendingSpawn.method1795(var30, var27), PendingSpawn.method1795(var30, var28), PendingSpawn.method1795(var30, var29), 0, 0, 0, 0, var32, 0); // L: 653 + } else { + var33 = class297.field3668[var2][var11][var17] + 1; // L: 656 + byte var51 = class171.field2049[var2][var11][var17]; // L: 657 + FloorOverlayDefinition var35 = SoundSystem.method2594(var21 - 1); // L: 658 + int var36 = var35.texture; // L: 659 + int var37; + int var38; + int var39; + int var40; + if (var36 >= 0) { // L: 662 + var38 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var36); // L: 663 + var37 = -1; // L: 664 + } else if (var35.primaryRgb == 16711935) { // L: 667 + var37 = -2; // L: 668 + var36 = -1; // L: 669 + var38 = -2; // L: 670 + } else { + var37 = class60.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 673 + var39 = var35.hue + Tiles.field535 & 255; // L: 674 + var40 = var35.lightness + Tiles.field520; // L: 675 + if (var40 < 0) { // L: 676 + var40 = 0; + } else if (var40 > 255) { // L: 677 + var40 = 255; + } + + var38 = class60.hslToRgb(var39, var35.saturation, var40); // L: 678 + } + + var39 = 0; // L: 681 + if (var38 != -2) { // L: 682 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[Coord.method4083(var38, 96)]; + } + + if (var35.secondaryRgb != -1) { // L: 683 + var40 = var35.secondaryHue + Tiles.field535 & 255; // L: 684 + int var41 = var35.secondaryLightness + Tiles.field520; // L: 685 + if (var41 < 0) { // L: 686 + var41 = 0; + } else if (var41 > 255) { // L: 687 + var41 = 255; + } + + var38 = class60.hslToRgb(var40, var35.secondarySaturation, var41); // L: 688 + var39 = Rasterizer3D.Rasterizer3D_colorPalette[Coord.method4083(var38, 96)]; // L: 689 + } + + var0.addTile(var2, var11, var17, var33, var51, var36, var22, var23, var24, var25, PendingSpawn.method1795(var30, var26), PendingSpawn.method1795(var30, var27), PendingSpawn.method1795(var30, var28), PendingSpawn.method1795(var30, var29), Coord.method4083(var37, var26), Coord.method4083(var37, var27), Coord.method4083(var37, var28), Coord.method4083(var37, var29), var32, var39); // L: 691 + } + } + } + } + } + } + + for (var11 = 1; var11 < 103; ++var11) { // L: 698 + for (var12 = 1; var12 < 103; ++var12) { // L: 699 + if ((Tiles.Tiles_renderFlags[var2][var12][var11] & 8) != 0) { // L: 706 + var17 = 0; // L: 707 + } else if (var2 > 0 && (Tiles.Tiles_renderFlags[1][var12][var11] & 2) != 0) { // L: 710 + var17 = var2 - 1; // L: 711 } else { - var7 = var11.readCESU8(); - if (var13 == 1) { - var8 = var11.readCESU8(); - } + var17 = var2; // L: 714 } - var10.close(); - } catch (IOException var31) { - var31.printStackTrace(); - } - - if (var7 != null) { - var34 = new File(var7); - if (!var34.exists()) { - var7 = null; - } - } - - if (var7 != null) { - var34 = new File(var7, "test.dat"); - - boolean var37; - try { - RandomAccessFile var19 = new RandomAccessFile(var34, "rw"); - var14 = var19.read(); - var19.seek(0L); - var19.write(var14); - var19.seek(0L); - var19.close(); - var34.delete(); - var37 = true; - } catch (Exception var26) { - var37 = false; - } - - if (!var37) { - var7 = null; - } + var0.setTileMinPlane(var2, var12, var11, var17); // L: 716 } } - if (var7 == null && var18 == 0) { - label223: - for (int var20 = 0; var20 < InterfaceParent.field590.length; ++var20) { - for (int var21 = 0; var21 < class234.field3096.length; ++var21) { - File var22 = new File(class234.field3096[var21] + InterfaceParent.field590[var20] + File.separatorChar + var0 + File.separatorChar); - if (var22.exists() && class4.method58(new File(var22, "test.dat"), true)) { - var7 = var22.toString(); - var9 = true; - break label223; - } - } - } - } - - if (var7 == null) { - var7 = ArchiveLoader.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; - var9 = true; - } - - if (var8 != null) { - File var33 = new File(var8); - var34 = new File(var7); - - try { - File[] var40 = var33.listFiles(); - File[] var38 = var40; - - for (var14 = 0; var14 < var38.length; ++var14) { - File var15 = var38[var14]; - File var16 = new File(var34, var15.getName()); - boolean var17 = var15.renameTo(var16); - if (!var17) { - throw new IOException(); - } - } - } catch (Exception var30) { - var30.printStackTrace(); - } - - var9 = true; - } - - if (var9) { - Client.method1803(new File(var7), (File)null); - } - - File var5 = new File(var7); - JagexCache.cacheDir = var5; - if (!JagexCache.cacheDir.exists()) { - JagexCache.cacheDir.mkdirs(); - } - - File[] var32 = JagexCache.cacheDir.listFiles(); - if (var32 != null) { - File[] var35 = var32; - - for (int var23 = 0; var23 < var35.length; ++var23) { - File var24 = var35[var23]; - - boolean var39; - try { - RandomAccessFile var36 = new RandomAccessFile(var24, "rw"); - var12 = var36.read(); - var36.seek(0L); - var36.write(var12); - var36.seek(0L); - var36.close(); - var39 = true; - } catch (Exception var25) { - var39 = false; - } - - if (!var39) { - ++var18; - continue label248; - } - } - } - break; + Tiles.field528[var2] = null; // L: 719 + Tiles.field521[var2] = null; // L: 720 + class297.field3668[var2] = null; // L: 721 + class171.field2049[var2] = null; // L: 722 + class22.field122[var2] = null; // L: 723 } - MusicPatch.method4025(JagexCache.cacheDir); - MusicPatchNode.method3970(); - JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(GameBuild.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(GameBuild.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - JagexCache.JagexCache_idxFiles = new BufferedFile[WorldMapDecoration.idxCount]; + var0.method3219(-50, -10, -50); // L: 725 - for (var18 = 0; var18 < WorldMapDecoration.idxCount; ++var18) { - JagexCache.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(GameBuild.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); - } - - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lic;IIB)[Llh;", - garbageValue = "-91" - ) - public static IndexedSprite[] method2125(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); - boolean var3; - if (var4 == null) { - var3 = false; - } else { - class3.SpriteBuffer_decode(var4); - var3 = true; - } - - return !var3 ? null : class232.method4279(); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-631398790" - ) - public static void method2133() { - VarpDefinition.VarpDefinition_cached.clear(); - } - - @ObfuscatedName("eb") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-57" - ) - @Export("load") - static void load() { - int var0; - if (Client.titleLoadingStage == 0) { - UserComparator3.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); - - for (var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0] = new CollisionMap(104, 104); - } - - class3.sceneMinimapSprite = new Sprite(512, 512); - Login.Login_loadingText = "Starting game engine..."; - Login.Login_loadingPercent = 5; - Client.titleLoadingStage = 20; - } else if (Client.titleLoadingStage == 20) { - Login.Login_loadingText = "Prepared visibility map"; - Login.Login_loadingPercent = 10; - Client.titleLoadingStage = 30; - } else if (Client.titleLoadingStage == 30) { - MilliClock.archive0 = WorldMapSection3.newArchive(0, false, true, true); - Message.archive1 = WorldMapSection3.newArchive(1, false, true, true); - Clock.archive2 = WorldMapSection3.newArchive(2, true, false, true); - class105.archive3 = WorldMapSection3.newArchive(3, false, true, true); - GrandExchangeOffer.archive4 = WorldMapSection3.newArchive(4, false, true, true); - WorldMapRectangle.archive5 = WorldMapSection3.newArchive(5, true, true, true); - UserComparator7.archive6 = WorldMapSection3.newArchive(6, true, true, true); - Projectile.archive7 = WorldMapSection3.newArchive(7, false, true, true); - GrandExchangeEvent.archive8 = WorldMapSection3.newArchive(8, false, true, true); - Tile.archive9 = WorldMapSection3.newArchive(9, false, true, true); - GraphicsObject.archive10 = WorldMapSection3.newArchive(10, false, true, true); - WorldMapData_0.archive11 = WorldMapSection3.newArchive(11, false, true, true); - Message.archive12 = WorldMapSection3.newArchive(12, false, true, true); - GameBuild.archive13 = WorldMapSection3.newArchive(13, true, false, true); - WorldMapIcon_1.archive14 = WorldMapSection3.newArchive(14, false, true, true); - WorldMapLabel.archive15 = WorldMapSection3.newArchive(15, false, true, true); - AbstractWorldMapIcon.archive17 = WorldMapSection3.newArchive(17, true, true, true); - VarcInt.archive18 = WorldMapSection3.newArchive(18, false, true, true); - WorldMapData_0.archive19 = WorldMapSection3.newArchive(19, false, true, true); - ClientPacket.archive20 = WorldMapSection3.newArchive(20, false, true, true); - Login.Login_loadingText = "Connecting to update server"; - Login.Login_loadingPercent = 20; - Client.titleLoadingStage = 40; - } else if (Client.titleLoadingStage == 40) { - byte var28 = 0; - var0 = var28 + MilliClock.archive0.percentage() * 4 / 100; - var0 += Message.archive1.percentage() * 4 / 100; - var0 += Clock.archive2.percentage() * 2 / 100; - var0 += class105.archive3.percentage() * 2 / 100; - var0 += GrandExchangeOffer.archive4.percentage() * 6 / 100; - var0 += WorldMapRectangle.archive5.percentage() * 4 / 100; - var0 += UserComparator7.archive6.percentage() * 2 / 100; - var0 += Projectile.archive7.percentage() * 56 / 100; - var0 += GrandExchangeEvent.archive8.percentage() * 2 / 100; - var0 += Tile.archive9.percentage() * 2 / 100; - var0 += GraphicsObject.archive10.percentage() * 2 / 100; - var0 += WorldMapData_0.archive11.percentage() * 2 / 100; - var0 += Message.archive12.percentage() * 2 / 100; - var0 += GameBuild.archive13.percentage() * 2 / 100; - var0 += WorldMapIcon_1.archive14.percentage() * 2 / 100; - var0 += WorldMapLabel.archive15.percentage() * 2 / 100; - var0 += WorldMapData_0.archive19.percentage() / 100; - var0 += VarcInt.archive18.percentage() / 100; - var0 += ClientPacket.archive20.percentage() / 100; - var0 += AbstractWorldMapIcon.archive17.method4456() && AbstractWorldMapIcon.archive17.isFullyLoaded() ? 1 : 0; - if (var0 != 100) { - if (var0 != 0) { - Login.Login_loadingText = "Checking for updates - " + var0 + "%"; + for (var2 = 0; var2 < 104; ++var2) { // L: 726 + for (var3 = 0; var3 < 104; ++var3) { // L: 727 + if ((Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 728 + var0.setLinkBelow(var2, var3); } - - Login.Login_loadingPercent = 30; - } else { - WorldMapSprite.method481(MilliClock.archive0, "Animations"); - WorldMapSprite.method481(Message.archive1, "Skeletons"); - WorldMapSprite.method481(GrandExchangeOffer.archive4, "Sound FX"); - WorldMapSprite.method481(WorldMapRectangle.archive5, "Maps"); - WorldMapSprite.method481(UserComparator7.archive6, "Music Tracks"); - WorldMapSprite.method481(Projectile.archive7, "Models"); - WorldMapSprite.method481(GrandExchangeEvent.archive8, "Sprites"); - WorldMapSprite.method481(WorldMapData_0.archive11, "Music Jingles"); - WorldMapSprite.method481(WorldMapIcon_1.archive14, "Music Samples"); - WorldMapSprite.method481(WorldMapLabel.archive15, "Music Patches"); - WorldMapSprite.method481(WorldMapData_0.archive19, "World Map"); - WorldMapSprite.method481(VarcInt.archive18, "World Map Geography"); - WorldMapSprite.method481(ClientPacket.archive20, "World Map Ground"); - UserComparator10.spriteIds = new GraphicsDefaults(); - UserComparator10.spriteIds.decode(AbstractWorldMapIcon.archive17); - Login.Login_loadingText = "Loaded update list"; - Login.Login_loadingPercent = 30; - Client.titleLoadingStage = 45; } - } else { - Archive var1; - Archive var2; - if (Client.titleLoadingStage == 45) { - class200.method3803(22050, !Client.isLowDetail, 2); - MidiPcmStream var31 = new MidiPcmStream(); - var31.method3935(9, 128); - class2.pcmPlayer0 = FontName.method5519(GrandExchangeOfferAgeComparator.taskHandler, 0, 22050); - class2.pcmPlayer0.setStream(var31); - var1 = WorldMapLabel.archive15; - var2 = WorldMapIcon_1.archive14; - Archive var27 = GrandExchangeOffer.archive4; - class206.musicPatchesArchive = var1; - class206.musicSamplesArchive = var2; - class206.soundEffectsArchive = var27; - WorldMapSprite.midiPcmStream = var31; - class58.pcmPlayer1 = FontName.method5519(GrandExchangeOfferAgeComparator.taskHandler, 1, 2048); - class60.pcmStreamMixer = new PcmStreamMixer(); - class58.pcmPlayer1.setStream(class60.pcmStreamMixer); - class197.decimator = new Decimator(22050, class237.field3113); - Login.Login_loadingText = "Prepared sound engine"; - Login.Login_loadingPercent = 35; - Client.titleLoadingStage = 50; - WorldMapSection0.WorldMapElement_fonts = new Fonts(GrandExchangeEvent.archive8, GameBuild.archive13); - } else { - int var22; - if (Client.titleLoadingStage == 50) { - FontName[] var30 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11}; - var22 = var30.length; - Fonts var26 = WorldMapSection0.WorldMapElement_fonts; - FontName[] var3 = new FontName[]{FontName.FontName_plain12, FontName.FontName_verdana13, FontName.FontName_bold12, FontName.FontName_verdana11, FontName.FontName_verdana15, FontName.FontName_plain11}; - Client.fontsMap = var26.createMap(var3); - if (Client.fontsMap.size() < var22) { - Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var22 + "%"; - Login.Login_loadingPercent = 40; - } else { - WorldMapLabel.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); - MusicPatchNode2.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); - GrandExchangeOfferNameComparator.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); - class13.platformInfo = Client.platformInfoProvider.get(); - Login.Login_loadingText = "Loaded fonts"; - Login.Login_loadingPercent = 40; - Client.titleLoadingStage = 60; - } - } else if (Client.titleLoadingStage == 60) { - var0 = ArchiveDiskActionHandler.method4429(GraphicsObject.archive10, GrandExchangeEvent.archive8); - byte var32 = 12; - if (var0 < var32) { - Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var32 + "%"; - Login.Login_loadingPercent = 50; - } else { - Login.Login_loadingText = "Loaded title screen"; - Login.Login_loadingPercent = 50; - ClientPreferences.updateGameState(5); - Client.titleLoadingStage = 70; - } - } else if (Client.titleLoadingStage == 70) { - if (!Clock.archive2.isFullyLoaded()) { - Login.Login_loadingText = "Loading config - " + Clock.archive2.loadPercent() + "%"; - Login.Login_loadingPercent = 60; - } else { - Archive var29 = Clock.archive2; - FloorOverlayDefinition.FloorOverlayDefinition_archive = var29; - ObjectSound.method1999(Clock.archive2); - GrandExchangeOfferUnitPriceComparator.method195(Clock.archive2, Projectile.archive7); - var1 = Clock.archive2; - var2 = Projectile.archive7; - boolean var33 = Client.isLowDetail; - ObjectDefinition.ObjectDefinition_archive = var1; - ObjectDefinition.ObjectDefinition_modelsArchive = var2; - ObjectDefinition.ObjectDefinition_isLowDetail = var33; - Archive var4 = Clock.archive2; - Archive var5 = Projectile.archive7; - NPCDefinition.NpcDefinition_archive = var4; - NPCDefinition.NpcDefinition_modelArchive = var5; - class197.method3771(Clock.archive2); - UserComparator3.method3548(Clock.archive2, Projectile.archive7, Client.isMembersWorld, WorldMapLabel.fontPlain11); - Archive var6 = Clock.archive2; - Archive var7 = MilliClock.archive0; - Archive var8 = Message.archive1; - SequenceDefinition.SequenceDefinition_archive = var6; - SequenceDefinition.SequenceDefinition_animationsArchive = var7; - SequenceDefinition.SequenceDefinition_skeletonsArchive = var8; - MenuAction.method2171(Clock.archive2, Projectile.archive7); - Archive var9 = Clock.archive2; - VarbitDefinition.VarbitDefinition_archive = var9; - TileItem.method2256(Clock.archive2); - UserComparator4.method3495(class105.archive3, Projectile.archive7, GrandExchangeEvent.archive8, GameBuild.archive13); - Archive var10 = Clock.archive2; - InvDefinition.InvDefinition_archive = var10; - UserComparator8.method3520(Clock.archive2); - Archive var11 = Clock.archive2; - VarcInt.VarcInt_archive = var11; - class8.method103(Clock.archive2); - AttackOption.varcs = new Varcs(); - Archive var12 = Clock.archive2; - Archive var13 = GrandExchangeEvent.archive8; - Archive var14 = GameBuild.archive13; - HitSplatDefinition.HitSplatDefinition_archive = var12; - HitSplatDefinition.field3356 = var13; - HitSplatDefinition.HitSplatDefinition_fontsArchive = var14; - Archive var15 = Clock.archive2; - Archive var16 = GrandExchangeEvent.archive8; - HealthBarDefinition.HealthBarDefinition_archive = var15; - HealthBarDefinition.HitSplatDefinition_spritesArchive = var16; - Archive var17 = Clock.archive2; - Archive var18 = GrandExchangeEvent.archive8; - WorldMapElement.WorldMapElement_archive = var18; - if (var17.isFullyLoaded()) { - WorldMapElement.WorldMapElement_count = var17.getGroupFileCount(35); - class257.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; + } - for (int var19 = 0; var19 < WorldMapElement.WorldMapElement_count; ++var19) { - byte[] var20 = var17.takeFile(35, var19); - class257.WorldMapElement_cached[var19] = new WorldMapElement(var19); - if (var20 != null) { - class257.WorldMapElement_cached[var19].decode(new Buffer(var20)); - class257.WorldMapElement_cached[var19].method4548(); + var2 = 1; // L: 731 + var3 = 2; // L: 732 + var4 = 4; // L: 733 + + for (var5 = 0; var5 < 4; ++var5) { // L: 734 + if (var5 > 0) { // L: 735 + var2 <<= 3; // L: 736 + var3 <<= 3; // L: 737 + var4 <<= 3; // L: 738 + } + + for (int var6 = 0; var6 <= var5; ++var6) { // L: 740 + for (int var7 = 0; var7 <= 104; ++var7) { // L: 741 + for (int var8 = 0; var8 <= 104; ++var8) { // L: 742 + short var49; + if ((class204.field2421[var6][var8][var7] & var2) != 0) { // L: 743 + var9 = var7; // L: 744 + var10 = var7; // L: 745 + var11 = var6; // L: 746 + + for (var12 = var6; var9 > 0 && (class204.field2421[var6][var8][var9 - 1] & var2) != 0; --var9) { // L: 747 748 + } + + while (var10 < 104 && (class204.field2421[var6][var8][var10 + 1] & var2) != 0) { // L: 749 + ++var10; + } + + label453: + while (var11 > 0) { // L: 750 + for (var13 = var9; var13 <= var10; ++var13) { // L: 751 + if ((class204.field2421[var11 - 1][var8][var13] & var2) == 0) { + break label453; + } + } + + --var11; // L: 752 + } + + label442: + while (var12 < var5) { // L: 754 + for (var13 = var9; var13 <= var10; ++var13) { // L: 755 + if ((class204.field2421[var12 + 1][var8][var13] & var2) == 0) { + break label442; + } + } + + ++var12; // L: 756 + } + + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 758 + if (var13 >= 8) { // L: 759 + var49 = 240; // L: 760 + var15 = Tiles.Tiles_heights[var12][var8][var9] - var49; // L: 761 + var16 = Tiles.Tiles_heights[var11][var8][var9]; // L: 762 + Scene.Scene_addOccluder(var5, 1, var8 * 128, var8 * 128, var9 * 128, var10 * 128 + 128, var15, var16); // L: 763 + + for (var17 = var11; var17 <= var12; ++var17) { // L: 764 + for (var18 = var9; var18 <= var10; ++var18) { // L: 765 + var10000 = class204.field2421[var17][var8]; + var10000[var18] &= ~var2; + } } } } - Login.Login_loadingText = "Loaded config"; - Login.Login_loadingPercent = 60; - Client.titleLoadingStage = 80; - } - } else if (Client.titleLoadingStage == 80) { - var0 = 0; - if (GrandExchangeOfferNameComparator.compass == null) { - GrandExchangeOfferNameComparator.compass = GameShell.SpriteBuffer_getSprite(GrandExchangeEvent.archive8, UserComparator10.spriteIds.compass, 0); - } else { - ++var0; - } + if ((class204.field2421[var6][var8][var7] & var3) != 0) { // L: 769 + var9 = var8; // L: 770 + var10 = var8; // L: 771 + var11 = var6; // L: 772 - if (UrlRequester.redHintArrowSprite == null) { - UrlRequester.redHintArrowSprite = GameShell.SpriteBuffer_getSprite(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3825, 0); - } else { - ++var0; - } + for (var12 = var6; var9 > 0 && (class204.field2421[var6][var9 - 1][var7] & var3) != 0; --var9) { // L: 773 774 + } - if (UserComparator6.mapSceneSprites == null) { - UserComparator6.mapSceneSprites = method2125(GrandExchangeEvent.archive8, UserComparator10.spriteIds.mapScenes, 0); - } else { - ++var0; - } + while (var10 < 104 && (class204.field2421[var6][var10 + 1][var7] & var3) != 0) { // L: 775 + ++var10; + } - if (CollisionMap.headIconPkSprites == null) { - CollisionMap.headIconPkSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.headIconsPk, 0); - } else { - ++var0; - } + label506: + while (var11 > 0) { // L: 776 + for (var13 = var9; var13 <= var10; ++var13) { // L: 777 + if ((class204.field2421[var11 - 1][var13][var7] & var3) == 0) { + break label506; + } + } - if (KeyHandler.headIconPrayerSprites == null) { - KeyHandler.headIconPrayerSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3828, 0); - } else { - ++var0; - } + --var11; // L: 778 + } - if (SoundSystem.headIconHintSprites == null) { - SoundSystem.headIconHintSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3829, 0); - } else { - ++var0; - } + label495: + while (var12 < var5) { // L: 780 + for (var13 = var9; var13 <= var10; ++var13) { // L: 781 + if ((class204.field2421[var12 + 1][var13][var7] & var3) == 0) { + break label495; + } + } - if (class9.mapMarkerSprites == null) { - class9.mapMarkerSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3830, 0); - } else { - ++var0; - } + ++var12; // L: 782 + } - if (Timer.crossSprites == null) { - Timer.crossSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3831, 0); - } else { - ++var0; - } + var13 = (var10 - var9 + 1) * (var12 + 1 - var11); // L: 784 + if (var13 >= 8) { // L: 785 + var49 = 240; // L: 786 + var15 = Tiles.Tiles_heights[var12][var9][var7] - var49; // L: 787 + var16 = Tiles.Tiles_heights[var11][var9][var7]; // L: 788 + Scene.Scene_addOccluder(var5, 2, var9 * 128, var10 * 128 + 128, var7 * 128, var7 * 128, var15, var16); // L: 789 - if (AttackOption.mapDotSprites == null) { - AttackOption.mapDotSprites = class217.method4091(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3834, 0); - } else { - ++var0; - } - - if (WorldMapElement.scrollBarSprites == null) { - WorldMapElement.scrollBarSprites = method2125(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3824, 0); - } else { - ++var0; - } - - if (class4.modIconSprites == null) { - class4.modIconSprites = method2125(GrandExchangeEvent.archive8, UserComparator10.spriteIds.field3832, 0); - } else { - ++var0; - } - - if (var0 < 11) { - Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%"; - Login.Login_loadingPercent = 70; - } else { - AbstractFont.AbstractFont_modIconSprites = class4.modIconSprites; - UrlRequester.redHintArrowSprite.normalize(); - var22 = (int)(Math.random() * 21.0D) - 10; - int var23 = (int)(Math.random() * 21.0D) - 10; - int var24 = (int)(Math.random() * 21.0D) - 10; - int var25 = (int)(Math.random() * 41.0D) - 20; - UserComparator6.mapSceneSprites[0].shiftColors(var25 + var22, var25 + var23, var25 + var24); - Login.Login_loadingText = "Loaded sprites"; - Login.Login_loadingPercent = 70; - Client.titleLoadingStage = 90; - } - } else if (Client.titleLoadingStage == 90) { - if (!Tile.archive9.isFullyLoaded()) { - Login.Login_loadingText = "Loading textures - " + "0%"; - Login.Login_loadingPercent = 90; - } else { - UserComparator3.textureProvider = new TextureProvider(Tile.archive9, GrandExchangeEvent.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); - Rasterizer3D.Rasterizer3D_setTextureLoader(UserComparator3.textureProvider); - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - Client.titleLoadingStage = 100; - } - } else if (Client.titleLoadingStage == 100) { - var0 = UserComparator3.textureProvider.getLoadedPercentage(); - if (var0 < 100) { - Login.Login_loadingText = "Loading textures - " + var0 + "%"; - Login.Login_loadingPercent = 90; - } else { - Login.Login_loadingText = "Loaded textures"; - Login.Login_loadingPercent = 90; - Client.titleLoadingStage = 110; - } - } else if (Client.titleLoadingStage == 110) { - class219.mouseRecorder = new MouseRecorder(); - GrandExchangeOfferAgeComparator.taskHandler.newThreadTask(class219.mouseRecorder, 10); - Login.Login_loadingText = "Loaded input handler"; - Login.Login_loadingPercent = 92; - Client.titleLoadingStage = 120; - } else if (Client.titleLoadingStage == 120) { - if (!GraphicsObject.archive10.tryLoadFileByNames("huffman", "")) { - Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; - Login.Login_loadingPercent = 94; - } else { - Huffman var21 = new Huffman(GraphicsObject.archive10.takeFileByNames("huffman", "")); - class219.huffman = var21; - Login.Login_loadingText = "Loaded wordpack"; - Login.Login_loadingPercent = 94; - Client.titleLoadingStage = 130; - } - } else if (Client.titleLoadingStage == 130) { - if (!class105.archive3.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + class105.archive3.loadPercent() * 4 / 5 + "%"; - Login.Login_loadingPercent = 96; - } else if (!Message.archive12.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (80 + Message.archive12.loadPercent() / 6) + "%"; - Login.Login_loadingPercent = 96; - } else if (!GameBuild.archive13.isFullyLoaded()) { - Login.Login_loadingText = "Loading interfaces - " + (96 + GameBuild.archive13.loadPercent() / 50) + "%"; - Login.Login_loadingPercent = 96; - } else { - Login.Login_loadingText = "Loaded interfaces"; - Login.Login_loadingPercent = 98; - Client.titleLoadingStage = 140; - } - } else if (Client.titleLoadingStage == 140) { - Login.Login_loadingPercent = 100; - if (!WorldMapData_0.archive19.tryLoadGroupByName(WorldMapCacheName.field322.name)) { - Login.Login_loadingText = "Loading world map - " + WorldMapData_0.archive19.groupLoadPercentByName(WorldMapCacheName.field322.name) / 10 + "%"; - } else { - if (class228.worldMap == null) { - class228.worldMap = new WorldMap(); - class228.worldMap.init(WorldMapData_0.archive19, VarcInt.archive18, ClientPacket.archive20, GrandExchangeOfferNameComparator.fontBold12, Client.fontsMap, UserComparator6.mapSceneSprites); + for (var17 = var11; var17 <= var12; ++var17) { // L: 790 + for (var18 = var9; var18 <= var10; ++var18) { // L: 791 + var10000 = class204.field2421[var17][var18]; + var10000[var7] &= ~var3; + } + } + } } - Login.Login_loadingText = "Loaded world map"; - Client.titleLoadingStage = 150; + if ((class204.field2421[var6][var8][var7] & var4) != 0) { // L: 795 + var9 = var8; // L: 796 + var10 = var8; // L: 797 + var11 = var7; // L: 798 + + for (var12 = var7; var11 > 0 && (class204.field2421[var6][var8][var11 - 1] & var4) != 0; --var11) { // L: 799 800 + } + + while (var12 < 104 && (class204.field2421[var6][var8][var12 + 1] & var4) != 0) { // L: 801 + ++var12; + } + + label559: + while (var9 > 0) { // L: 802 + for (var13 = var11; var13 <= var12; ++var13) { // L: 803 + if ((class204.field2421[var6][var9 - 1][var13] & var4) == 0) { + break label559; + } + } + + --var9; // L: 804 + } + + label548: + while (var10 < 104) { // L: 806 + for (var13 = var11; var13 <= var12; ++var13) { // L: 807 + if ((class204.field2421[var6][var10 + 1][var13] & var4) == 0) { + break label548; + } + } + + ++var10; // L: 808 + } + + if ((var10 - var9 + 1) * (var12 - var11 + 1) >= 4) { // L: 810 + var13 = Tiles.Tiles_heights[var6][var9][var11]; // L: 811 + Scene.Scene_addOccluder(var5, 4, var9 * 128, var10 * 128 + 128, var11 * 128, var12 * 128 + 128, var13, var13); // L: 812 + + for (var14 = var9; var14 <= var10; ++var14) { // L: 813 + for (var15 = var11; var15 <= var12; ++var15) { // L: 814 + var10000 = class204.field2421[var6][var14]; + var10000[var15] &= ~var4; + } + } + } + } + } + } + } + } + + } // L: 822 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-2034460378" + ) + @Export("Messages_getNextChatID") + static int Messages_getNextChatID(int var0) { + Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); // L: 75 + if (var1 == null) { // L: 76 + return -1; + } else { + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; // L: 77 78 + } + } + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(ILcy;ZB)I", + garbageValue = "-51" + ) + static int method2112(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { // L: 2269 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2270 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); // L: 2271 + return 1; // L: 2272 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { // L: 2274 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2275 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; // L: 2276 + return 1; // L: 2277 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { // L: 2279 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2280 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; // L: 2281 + return 1; // L: 2282 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { // L: 2284 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2285 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; // L: 2286 + return 1; // L: 2287 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { // L: 2289 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2290 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; // L: 2291 + return 1; // L: 2292 + } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { // L: 2294 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2295 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; // L: 2296 + return 1; // L: 2297 + } else { + int var13; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { // L: 2299 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2300 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2301 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 0 ? 1 : 0; // L: 2302 + return 1; // L: 2303 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { // L: 2305 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2306 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2307 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 2 ? 1 : 0; // L: 2308 + return 1; // L: 2309 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { // L: 2311 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2312 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2313 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 5 ? 1 : 0; // L: 2314 + return 1; // L: 2315 + } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { // L: 2317 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2318 + var13 = Client.grandExchangeOffers[var3].status(); // L: 2319 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var13 == 1 ? 1 : 0; // L: 2320 + return 1; // L: 2321 + } else { + boolean var12; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { // L: 2323 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2324 + if (WorldMapSection1.grandExchangeEvents != null) { // L: 2325 + WorldMapSection1.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var12); // L: 2326 + } + + return 1; // L: 2328 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { // L: 2330 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2331 + if (WorldMapSection1.grandExchangeEvents != null) { // L: 2332 + WorldMapSection1.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var12); // L: 2333 + } + + return 1; // L: 2335 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { // L: 2337 + Interpreter.Interpreter_intStackSize -= 2; // L: 2338 + var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == 1; // L: 2339 + boolean var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 2340 + if (WorldMapSection1.grandExchangeEvents != null) { // L: 2341 + Client.GrandExchangeEvents_worldComparator.filterWorlds = var11; // L: 2342 + WorldMapSection1.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var12); // L: 2343 + } + + return 1; // L: 2345 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { // L: 2347 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2348 + if (WorldMapSection1.grandExchangeEvents != null) { // L: 2349 + WorldMapSection1.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var12); // L: 2350 + } + + return 1; // L: 2352 + } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { // L: 2354 + var12 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 2355 + if (WorldMapSection1.grandExchangeEvents != null) { // L: 2356 + WorldMapSection1.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var12); // L: 2357 + } + + return 1; // L: 2359 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { // L: 2361 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection1.grandExchangeEvents == null ? 0 : WorldMapSection1.grandExchangeEvents.events.size(); // L: 2362 + return 1; // L: 2363 + } else { + GrandExchangeEvent var4; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { // L: 2365 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2366 + var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2367 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.world; // L: 2368 + return 1; // L: 2369 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { // L: 2371 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2372 + var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2373 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.getOfferName(); // L: 2374 + return 1; // L: 2375 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { // L: 2377 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2378 + var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2379 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.getPreviousOfferName(); // L: 2380 + return 1; // L: 2381 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { // L: 2383 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2384 + var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2385 + long var5 = PacketWriter.currentTimeMillis() - ItemContainer.field553 - var4.age; // L: 2386 + int var7 = (int)(var5 / 3600000L); // L: 2387 + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); // L: 2388 + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); // L: 2389 + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; // L: 2390 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var10; // L: 2391 + return 1; // L: 2392 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { // L: 2394 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2395 + var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2396 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.totalQuantity; // L: 2397 + return 1; // L: 2398 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { // L: 2400 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2401 + var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2402 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.unitPrice; // L: 2403 + return 1; // L: 2404 + } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { // L: 2406 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2407 + var4 = (GrandExchangeEvent)WorldMapSection1.grandExchangeEvents.events.get(var3); // L: 2408 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.grandExchangeOffer.id; // L: 2409 + return 1; // L: 2410 + } else { + return 2; // L: 2412 } - } else if (Client.titleLoadingStage == 150) { - ClientPreferences.updateGameState(10); } } } } - @ObfuscatedName("go") + @ObfuscatedName("jf") @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "3305" + descriptor = "(IIIILlp;Lhz;I)V", + garbageValue = "728555201" ) - @Export("worldToScreen") - static final void worldToScreen(int var0, int var1, int var2) { - if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { - int var3 = Language.getTileHeight(var0, var1, TileItemPile.Client_plane) - var2; - var0 -= MouseHandler.cameraX; - var3 -= WorldMapSection3.cameraY; - var1 -= ObjectSound.cameraZ; - int var4 = Rasterizer3D.Rasterizer3D_sine[TilePaint.cameraPitch]; - int var5 = Rasterizer3D.Rasterizer3D_cosine[TilePaint.cameraPitch]; - int var6 = Rasterizer3D.Rasterizer3D_sine[Canvas.cameraYaw]; - int var7 = Rasterizer3D.Rasterizer3D_cosine[Canvas.cameraYaw]; - int var8 = var0 * var7 + var6 * var1 >> 16; - var1 = var7 * var1 - var0 * var6 >> 16; - var0 = var8; - var8 = var5 * var3 - var4 * var1 >> 16; - var1 = var5 * var1 + var3 * var4 >> 16; - if (var1 >= 50) { - Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; - Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; - } + @Export("drawSpriteOnMinimap") + static final void drawSpriteOnMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { + if (var4 != null) { // L: 10662 + int var6 = Client.camAngleY & 2047; // L: 10663 + int var7 = var3 * var3 + var2 * var2; // L: 10664 + if (var7 <= 6400) { // L: 10665 + int var8 = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 10666 + int var9 = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 10667 + int var10 = var9 * var2 + var3 * var8 >> 16; // L: 10668 + int var11 = var3 * var9 - var8 * var2 >> 16; // L: 10669 + if (var7 > 2500) { + var4.method6262(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths); // L: 10670 + } else { + var4.drawTransBgAt(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2); // L: 10671 + } - } else { - Client.viewportTempX = -1; - Client.viewportTempY = -1; + } } - } + } // L: 10672 } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index f698b2a033..c2d6bd7b07 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -4,252 +4,248 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ik") +@ObfuscatedName("ir") @Implements("HealthBarDefinition") public class HealthBarDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("HealthBarDefinition_archive") public static AbstractArchive HealthBarDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("HitSplatDefinition_spritesArchive") public static AbstractArchive HitSplatDefinition_spritesArchive; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("HealthBarDefinition_cached") public static EvictingDualNodeHashTable HealthBarDefinition_cached; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("HealthBarDefinition_cachedSprites") - static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; - @ObfuscatedName("io") + public static EvictingDualNodeHashTable HealthBarDefinition_cachedSprites; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1914428317 + intValue = -72609311 ) - @Export("oculusOrbFocalPointY") - static int oculusOrbFocalPointY; - @ObfuscatedName("p") + public int field3314; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -762582303 - ) - public int field3312; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1405603789 + intValue = -2108314947 ) @Export("int1") public int int1; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 66041617 + intValue = 1537532305 ) @Export("int2") public int int2; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1238341031 + intValue = -778241871 ) @Export("int3") public int int3; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 428453315 + intValue = 2007906497 ) - public int field3317; - @ObfuscatedName("y") + public int field3310; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -724830045 + intValue = 1932692413 ) @Export("int5") public int int5; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1257354687 + intValue = -2140238063 ) @Export("frontSpriteID") int frontSpriteID; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -705085889 + intValue = -1649741031 ) @Export("backSpriteID") int backSpriteID; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1995580379 + intValue = 197104923 ) @Export("width") public int width; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -907123185 + intValue = 127920675 ) @Export("widthPadding") public int widthPadding; static { - HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); - HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); + HealthBarDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 + HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 15 } - public HealthBarDefinition() { - this.int1 = 255; - this.int2 = 255; - this.int3 = -1; - this.field3317 = 1; - this.int5 = 70; - this.frontSpriteID = -1; - this.backSpriteID = -1; - this.width = 30; - this.widthPadding = 0; - } + HealthBarDefinition() { + this.int1 = 255; // L: 19 + this.int2 = 255; // L: 20 + this.int3 = -1; // L: 21 + this.field3310 = 1; // L: 22 + this.int5 = 70; // L: 23 + this.frontSpriteID = -1; // L: 24 + this.backSpriteID = -1; // L: 25 + this.width = 30; // L: 26 + this.widthPadding = 0; // L: 27 + } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-2036090908" + descriptor = "(Lkf;I)V", + garbageValue = "1885032868" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 43 + if (var2 == 0) { // L: 44 + return; // L: 47 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 45 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lkf;II)V", + garbageValue = "808317446" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 50 + var1.readUnsignedShort(); // L: 51 + } else if (var2 == 2) { // L: 53 + this.int1 = var1.readUnsignedByte(); + } else if (var2 == 3) { // L: 54 + this.int2 = var1.readUnsignedByte(); + } else if (var2 == 4) { // L: 55 + this.int3 = 0; + } else if (var2 == 5) { // L: 56 + this.int5 = var1.readUnsignedShort(); + } else if (var2 == 6) { // L: 57 + var1.readUnsignedByte(); // L: 58 + } else if (var2 == 7) { // L: 60 + this.frontSpriteID = var1.method5634(); + } else if (var2 == 8) { // L: 61 + this.backSpriteID = var1.method5634(); + } else if (var2 == 11) { // L: 62 + this.int3 = var1.readUnsignedShort(); + } else if (var2 == 14) { // L: 63 + this.width = var1.readUnsignedByte(); + } else if (var2 == 15) { // L: 64 + this.widthPadding = var1.readUnsignedByte(); + } + + } // L: 66 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)Llp;", + garbageValue = "-1096535425" + ) + @Export("getFrontSprite") + public Sprite getFrontSprite() { + if (this.frontSpriteID < 0) { // L: 69 + return null; + } else { + Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); // L: 70 + if (var1 != null) { + return var1; // L: 71 + } else { + var1 = AbstractUserComparator.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); // L: 72 + if (var1 != null) { // L: 73 + HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); + } + + return var1; // L: 75 + } + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)Llp;", + garbageValue = "1" + ) + @Export("getBackSprite") + public Sprite getBackSprite() { + if (this.backSpriteID < 0) { // L: 79 + return null; + } else { + Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); // L: 80 + if (var1 != null) { // L: 81 + return var1; + } else { + var1 = AbstractUserComparator.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); // L: 82 + if (var1 != null) { // L: 83 + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); + } + + return var1; // L: 85 + } } } @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "-2145351852" + descriptor = "(CI)Z", + garbageValue = "-1134464400" ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - var1.readUnsignedShort(); - } else if (var2 == 2) { - this.int1 = var1.readUnsignedByte(); - } else if (var2 == 3) { - this.int2 = var1.readUnsignedByte(); - } else if (var2 == 4) { - this.int3 = 0; - } else if (var2 == 5) { - this.int5 = var1.readUnsignedShort(); - } else if (var2 == 6) { - var1.readUnsignedByte(); - } else if (var2 == 7) { - this.frontSpriteID = var1.method5843(); - } else if (var2 == 8) { - this.backSpriteID = var1.method5843(); - } else if (var2 == 11) { - this.int3 = var1.readUnsignedShort(); - } else if (var2 == 14) { - this.width = var1.readUnsignedByte(); - } else if (var2 == 15) { - this.widthPadding = var1.readUnsignedByte(); - } - - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)Llz;", - garbageValue = "65535" - ) - @Export("getFrontSprite") - public Sprite getFrontSprite() { - if (this.frontSpriteID < 0) { - return null; + @Export("isCharPrintable") + public static boolean isCharPrintable(char var0) { + if (var0 >= ' ' && var0 <= '~') { // L: 183 + return true; + } else if (var0 >= 160 && var0 <= 255) { + return true; // L: 184 } else { - Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); - if (var1 != null) { - return var1; - } else { - var1 = GameShell.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.frontSpriteID, 0); - if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); - } - - return var1; - } + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; // L: 185 } } - @ObfuscatedName("p") + @ObfuscatedName("kc") @ObfuscatedSignature( - descriptor = "(I)Llz;", - garbageValue = "1675324789" + descriptor = "(Ljava/lang/String;ZB)Ljava/lang/String;", + garbageValue = "-91" ) - @Export("getBackSprite") - public Sprite getBackSprite() { - if (this.backSpriteID < 0) { - return null; - } else { - Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); - if (var1 != null) { - return var1; - } else { - var1 = GameShell.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.backSpriteID, 0); - if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); - } - - return var1; - } - } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-32" - ) - static int method4673(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; - } - } - - @ObfuscatedName("kd") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)Ljava/lang/String;", - garbageValue = "-1975463268" - ) - static String method4669(String var0, boolean var1) { - String var2 = var1 ? "https://" : "http://"; - if (Client.gameBuild == 1) { + static String method4563(String var0, boolean var1) { + String var2 = var1 ? "https://" : "http://"; // L: 10752 + if (Client.gameBuild == 1) { // L: 10753 var0 = var0 + "-wtrc"; - } else if (Client.gameBuild == 2) { + } else if (Client.gameBuild == 2) { // L: 10754 var0 = var0 + "-wtqa"; - } else if (Client.gameBuild == 3) { + } else if (Client.gameBuild == 3) { // L: 10755 var0 = var0 + "-wtwip"; - } else if (Client.gameBuild == 5) { + } else if (Client.gameBuild == 5) { // L: 10756 var0 = var0 + "-wti"; - } else if (Client.gameBuild == 4) { + } else if (Client.gameBuild == 4) { // L: 10757 var0 = "local"; } - String var3 = ""; - if (Client.field871 != null) { - var3 = "/p=" + Client.field871; + String var3 = ""; // L: 10758 + if (class200.field2403 != null) { // L: 10759 + var3 = "/p=" + class200.field2403; } - String var4 = "runescape.com"; - return var2 + var0 + "." + var4 + "/l=" + UserComparator9.clientLanguage + "/a=" + class228.field2754 + var3 + "/"; + String var4 = "runescape.com"; // L: 10760 + return var2 + var0 + "." + var4 + "/l=" + class58.clientLanguage + "/a=" + GrandExchangeOffer.field99 + var3 + "/"; // L: 10761 } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 317923f4a1..a1b02581c3 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -1,65 +1,92 @@ -import java.awt.Image; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cb") +@ObfuscatedName("ca") @Implements("HealthBarUpdate") public class HealthBarUpdate extends Node { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Ldh;" - ) - @Export("pcmPlayerProvider") - static PlayerProvider pcmPlayerProvider; - @ObfuscatedName("k") - static int[][][] field1031; - @ObfuscatedName("ak") - static Image field1033; - @ObfuscatedName("m") + @ObfuscatedName("rb") @ObfuscatedGetter( - intValue = -166528229 + intValue = 948728571 + ) + static int field1038; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1931274229 ) @Export("cycle") int cycle; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1062047839 + intValue = 1765683631 ) @Export("health") int health; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -374720445 + intValue = 1932254665 ) @Export("health2") int health2; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 257618229 + intValue = -488536303 ) @Export("cycleOffset") int cycleOffset; HealthBarUpdate(int var1, int var2, int var3, int var4) { - this.cycle = var1; - this.health = var2; - this.health2 = var3; - this.cycleOffset = var4; - } + this.cycle = var1; // L: 12 + this.health = var2; // L: 13 + this.health2 = var3; // L: 14 + this.cycleOffset = var4; // L: 15 + } // L: 16 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "880697270" + descriptor = "(IIIIB)V", + garbageValue = "1" ) @Export("set") void set(int var1, int var2, int var3, int var4) { - this.cycle = var1; - this.health = var2; - this.health2 = var3; - this.cycleOffset = var4; + this.cycle = var1; // L: 19 + this.health = var2; // L: 20 + this.health2 = var3; // L: 21 + this.cycleOffset = var4; // L: 22 + } // L: 23 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1655201695" + ) + public static boolean method1815() { + return class206.musicPlayerStatus != 0 ? true : class206.midiPcmStream.isReady(); // L: 59 60 } + + @ObfuscatedName("ej") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1341706343" + ) + static final void method1818() { + Scene.Scene_isLowDetail = false; // L: 779 + Client.isLowDetail = false; // L: 780 + } // L: 781 + + @ObfuscatedName("hi") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-487929114" + ) + static final void method1817(int var0, int var1, int var2, int var3) { + for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { // L: 7049 + if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { // L: 7050 + Client.field883[var4] = true; + } + } + + } // L: 7052 } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 8ade6bed37..e22f4e2161 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -3,462 +3,424 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("js") +@ObfuscatedName("jd") @Implements("HitSplatDefinition") public class HitSplatDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("HitSplatDefinition_archive") public static AbstractArchive HitSplatDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) - public static AbstractArchive field3356; - @ObfuscatedName("q") + public static AbstractArchive field3364; + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("HitSplatDefinition_fontsArchive") public static AbstractArchive HitSplatDefinition_fontsArchive; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("HitSplatDefinition_cached") public static EvictingDualNodeHashTable HitSplatDefinition_cached; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("HitSplatDefinition_cachedSprites") public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("HitSplatDefinition_cachedFonts") public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts; - @ObfuscatedName("a") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 554677393 - ) - @Export("ItemDefinition_fileCount") - public static int ItemDefinition_fileCount; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1528040183 + intValue = 840460821 ) @Export("fontId") int fontId; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1665504671 + intValue = -910808373 ) @Export("textColor") public int textColor; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1892048919 + intValue = -1699415327 ) - public int field3364; - @ObfuscatedName("k") + public int field3356; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1862744257 + intValue = -359975217 ) - int field3365; - @ObfuscatedName("r") + int field3357; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 173475991 + intValue = -1100166573 ) - int field3366; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1837345819 - ) - int field3378; - @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 275308627 - ) - int field3368; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1590717975 - ) - public int field3369; - @ObfuscatedName("e") - @ObfuscatedGetter( - intValue = -1198049763 - ) - public int field3370; - @ObfuscatedName("l") - @ObfuscatedGetter( - intValue = -796375423 - ) - public int field3363; - @ObfuscatedName("t") - String field3372; - @ObfuscatedName("x") - @ObfuscatedGetter( - intValue = -1600290491 - ) - public int field3373; - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1529892703 - ) - public int field3374; - @ObfuscatedName("i") - @Export("transforms") - public int[] transforms; + int field3351; @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 34744135 + intValue = 620979093 + ) + int field3359; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = -1746417223 + ) + int field3360; + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = 1873666251 + ) + public int field3368; + @ObfuscatedName("j") + @ObfuscatedGetter( + intValue = 1145971425 + ) + public int field3362; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = 1152481113 + ) + public int field3355; + @ObfuscatedName("u") + String field3361; + @ObfuscatedName("p") + @ObfuscatedGetter( + intValue = -444433025 + ) + public int field3365; + @ObfuscatedName("b") + @ObfuscatedGetter( + intValue = 1573149035 + ) + public int field3366; + @ObfuscatedName("l") + @Export("transforms") + public int[] transforms; + @ObfuscatedName("e") + @ObfuscatedGetter( + intValue = -1795835533 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -84298271 + intValue = 1163513145 ) @Export("transformVarp") int transformVarp; static { - HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); - HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); - HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); + HitSplatDefinition_cached = new EvictingDualNodeHashTable(64); // L: 18 + HitSplatDefinition_cachedSprites = new EvictingDualNodeHashTable(64); // L: 19 + HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20); // L: 20 } - public HitSplatDefinition() { - this.fontId = -1; - this.textColor = 16777215; - this.field3364 = 70; - this.field3365 = -1; - this.field3366 = -1; - this.field3378 = -1; - this.field3368 = -1; - this.field3369 = 0; - this.field3370 = 0; - this.field3363 = -1; - this.field3372 = ""; - this.field3373 = -1; - this.field3374 = 0; - this.transformVarbit = -1; - this.transformVarp = -1; - } + HitSplatDefinition() { + this.fontId = -1; // L: 26 + this.textColor = 16777215; // L: 27 + this.field3356 = 70; // L: 28 + this.field3357 = -1; // L: 29 + this.field3351 = -1; // L: 30 + this.field3359 = -1; // L: 31 + this.field3360 = -1; // L: 32 + this.field3368 = 0; // L: 33 + this.field3362 = 0; // L: 34 + this.field3355 = -1; // L: 35 + this.field3361 = ""; // L: 36 + this.field3365 = -1; // L: 37 + this.field3366 = 0; // L: 38 + this.transformVarbit = -1; // L: 40 + this.transformVarp = -1; // L: 41 + } // L: 43 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "-108" + descriptor = "(Lkf;I)V", + garbageValue = "183277091" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 57 + if (var2 == 0) { // L: 58 + return; // L: 61 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 59 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lkf;II)V", + garbageValue = "-2105056828" + ) + @Export("decodeNext") + void decodeNext(Buffer var1, int var2) { + if (var2 == 1) { // L: 64 + this.fontId = var1.method5634(); + } else if (var2 == 2) { // L: 65 + this.textColor = var1.readMedium(); + } else if (var2 == 3) { // L: 66 + this.field3357 = var1.method5634(); + } else if (var2 == 4) { // L: 67 + this.field3359 = var1.method5634(); + } else if (var2 == 5) { // L: 68 + this.field3351 = var1.method5634(); + } else if (var2 == 6) { // L: 69 + this.field3360 = var1.method5634(); + } else if (var2 == 7) { // L: 70 + this.field3368 = var1.readShort(); + } else if (var2 == 8) { // L: 71 + this.field3361 = var1.readStringCp1252NullCircumfixed(); + } else if (var2 == 9) { // L: 72 + this.field3356 = var1.readUnsignedShort(); + } else if (var2 == 10) { // L: 73 + this.field3362 = var1.readShort(); + } else if (var2 == 11) { // L: 74 + this.field3355 = 0; + } else if (var2 == 12) { // L: 75 + this.field3365 = var1.readUnsignedByte(); + } else if (var2 == 13) { // L: 76 + this.field3366 = var1.readShort(); + } else if (var2 == 14) { + this.field3355 = var1.readUnsignedShort(); // L: 77 + } else if (var2 == 17 || var2 == 18) { // L: 78 + this.transformVarbit = var1.readUnsignedShort(); // L: 79 + if (this.transformVarbit == 65535) { // L: 80 + this.transformVarbit = -1; + } + + this.transformVarp = var1.readUnsignedShort(); // L: 81 + if (this.transformVarp == 65535) { // L: 82 + this.transformVarp = -1; + } + + int var3 = -1; // L: 83 + if (var2 == 18) { // L: 84 + var3 = var1.readUnsignedShort(); // L: 85 + if (var3 == 65535) { // L: 86 + var3 = -1; + } + } + + int var4 = var1.readUnsignedByte(); // L: 88 + this.transforms = new int[var4 + 2]; // L: 89 + + for (int var5 = 0; var5 <= var4; ++var5) { // L: 90 + this.transforms[var5] = var1.readUnsignedShort(); // L: 91 + if (this.transforms[var5] == 65535) { // L: 92 + this.transforms[var5] = -1; + } + } + + this.transforms[var4 + 1] = var3; // L: 94 + } + + } // L: 97 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)Ljd;", + garbageValue = "-79" + ) + @Export("transform") + public final HitSplatDefinition transform() { + int var1 = -1; // L: 100 + if (this.transformVarbit != -1) { // L: 101 + var1 = WorldMapSection1.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 102 + var1 = Varps.Varps_main[this.transformVarp]; + } + + int var2; + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 104 + var2 = this.transforms[var1]; // L: 105 + } else { + var2 = this.transforms[this.transforms.length - 1]; + } + + return var2 != -1 ? MusicPatchNode.method3929(var2) : null; // L: 106 107 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-265851490" + ) + @Export("getString") + public String getString(int var1) { + String var2 = this.field3361; // L: 111 + + while (true) { + int var3 = var2.indexOf("%1"); // L: 113 + if (var3 < 0) { // L: 114 + return var2; // L: 117 + } + + var2 = var2.substring(0, var3) + ModeWhere.intToString(var1, false) + var2.substring(var3 + 2); // L: 115 } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "-2104480969" + descriptor = "(I)Llp;", + garbageValue = "-339938865" ) - @Export("decodeNext") - void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.fontId = var1.method5843(); - } else if (var2 == 2) { - this.textColor = var1.readMedium(); - } else if (var2 == 3) { - this.field3365 = var1.method5843(); - } else if (var2 == 4) { - this.field3378 = var1.method5843(); - } else if (var2 == 5) { - this.field3366 = var1.method5843(); - } else if (var2 == 6) { - this.field3368 = var1.method5843(); - } else if (var2 == 7) { - this.field3369 = var1.readShort(); - } else if (var2 == 8) { - this.field3372 = var1.readStringCp1252NullCircumfixed(); - } else if (var2 == 9) { - this.field3364 = var1.readUnsignedShort(); - } else if (var2 == 10) { - this.field3370 = var1.readShort(); - } else if (var2 == 11) { - this.field3363 = 0; - } else if (var2 == 12) { - this.field3373 = var1.readUnsignedByte(); - } else if (var2 == 13) { - this.field3374 = var1.readShort(); - } else if (var2 == 14) { - this.field3363 = var1.readUnsignedShort(); - } else if (var2 == 17 || var2 == 18) { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { - this.transformVarbit = -1; - } - - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { - this.transformVarp = -1; - } - - int var3 = -1; - if (var2 == 18) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { - var3 = -1; - } - } - - int var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; - - for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.readUnsignedShort(); - if (this.transforms[var5] == 65535) { - this.transforms[var5] = -1; - } - } - - this.transforms[var4 + 1] = var3; - } - - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(S)Ljs;", - garbageValue = "24687" - ) - @Export("transform") - public final HitSplatDefinition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = Widget.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { - var1 = Varps.Varps_main[this.transformVarp]; - } - - int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { - var2 = this.transforms[var1]; - } else { - var2 = this.transforms[this.transforms.length - 1]; - } - - if (var2 != -1) { - HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2); - HitSplatDefinition var3; - if (var4 != null) { - var3 = var4; - } else { - byte[] var5 = HitSplatDefinition_archive.takeFile(32, var2); - var4 = new HitSplatDefinition(); - if (var5 != null) { - var4.decode(new Buffer(var5)); - } - - HitSplatDefinition_cached.put(var4, (long)var2); - var3 = var4; - } - - return var3; - } else { - return null; - } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "2134005517" - ) - @Export("getString") - public String getString(int var1) { - String var2 = this.field3372; - - while (true) { - int var3 = var2.indexOf("%1"); - if (var3 < 0) { - return var2; - } - - var2 = var2.substring(0, var3) + class298.intToString(var1, false) + var2.substring(var3 + 2); - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(B)Llz;", - garbageValue = "85" - ) - public Sprite method4755() { - if (this.field3365 < 0) { + public Sprite method4668() { + if (this.field3357 < 0) { // L: 121 return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3365); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3357); // L: 122 if (var1 != null) { - return var1; + return var1; // L: 123 } else { - var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3365, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3365); + var1 = AbstractUserComparator.SpriteBuffer_getSprite(field3364, this.field3357, 0); // L: 124 + if (var1 != null) { // L: 125 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3357); } + return var1; // L: 127 + } + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)Llp;", + garbageValue = "68117664" + ) + public Sprite method4681() { + if (this.field3351 < 0) { // L: 131 + return null; + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3351); // L: 132 + if (var1 != null) { // L: 133 return var1; + } else { + var1 = AbstractUserComparator.SpriteBuffer_getSprite(field3364, this.field3351, 0); // L: 134 + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3351); // L: 135 + } + + return var1; // L: 137 + } + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)Llp;", + garbageValue = "962785869" + ) + public Sprite method4670() { + if (this.field3359 < 0) { // L: 141 + return null; + } else { + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3359); // L: 142 + if (var1 != null) { + return var1; // L: 143 + } else { + var1 = AbstractUserComparator.SpriteBuffer_getSprite(field3364, this.field3359, 0); // L: 144 + if (var1 != null) { // L: 145 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3359); + } + + return var1; // L: 147 } } } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Llz;", - garbageValue = "-2111693825" + descriptor = "(B)Llp;", + garbageValue = "-16" ) - public Sprite method4756() { - if (this.field3366 < 0) { + public Sprite method4678() { + if (this.field3360 < 0) { // L: 151 return null; } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3366); + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3360); // L: 152 if (var1 != null) { - return var1; + return var1; // L: 153 } else { - var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3366, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3366); + var1 = AbstractUserComparator.SpriteBuffer_getSprite(field3364, this.field3360, 0); // L: 154 + if (var1 != null) { // L: 155 + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3360); } - return var1; - } - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)Llz;", - garbageValue = "1" - ) - public Sprite method4752() { - if (this.field3378 < 0) { - return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3378); - if (var1 != null) { - return var1; - } else { - var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3378, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3378); - } - - return var1; - } - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)Llz;", - garbageValue = "148088504" - ) - public Sprite method4763() { - if (this.field3368 < 0) { - return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3368); - if (var1 != null) { - return var1; - } else { - var1 = GameShell.SpriteBuffer_getSprite(field3356, this.field3368, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3368); - } - - return var1; - } - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)Lko;", - garbageValue = "-13" - ) - @Export("getFont") - public Font getFont() { - if (this.fontId == -1) { - return null; - } else { - Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); - if (var1 != null) { - return var1; - } else { - var1 = Frames.method3394(field3356, HitSplatDefinition_fontsArchive, this.fontId, 0); - if (var1 != null) { - HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); - } - - return var1; + return var1; // L: 157 } } } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lkb;B)V", - garbageValue = "121" + descriptor = "(I)Lkr;", + garbageValue = "-456462046" ) - @Export("updatePlayer") - static final void updatePlayer(PacketBuffer var0) { - var0.importIndex(); - int var1 = Client.localPlayerIndex; - Player var2 = class60.localPlayer = Client.players[var1] = new Player(); - var2.index = var1; - int var3 = var0.readBits(30); - byte var4 = (byte)(var3 >> 28); - int var5 = var3 >> 14 & 16383; - int var6 = var3 & 16383; - var2.pathX[0] = var5 - class182.baseX; - var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); - var2.pathY[0] = var6 - SecureRandomFuture.baseY; - var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); - TileItemPile.Client_plane = var2.plane = var4; - if (Players.field1279[var1] != null) { - var2.read(Players.field1279[var1]); - } + @Export("getFont") + public Font getFont() { + if (this.fontId == -1) { // L: 161 + return null; + } else { + Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); // L: 162 + if (var1 != null) { // L: 163 + return var1; + } else { + var1 = RouteStrategy.method3688(field3364, HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 164 + if (var1 != null) { // L: 165 + HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); + } - Players.Players_count = 0; - Players.Players_indices[++Players.Players_count - 1] = var1; - Players.field1282[var1] = 0; - Players.Players_emptyIdxCount = 0; - - for (int var7 = 1; var7 < 2048; ++var7) { - if (var1 != var7) { - int var8 = var0.readBits(18); - int var9 = var8 >> 16; - int var10 = var8 >> 8 & 597; - int var11 = var8 & 597; - Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); - Players.Players_orientations[var7] = 0; - Players.Players_targetIndices[var7] = -1; - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; - Players.field1282[var7] = 0; + return var1; // L: 167 } } + } - var0.exportIndex(); + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(ILcy;ZB)I", + garbageValue = "20" + ) + static int method4698(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 1144 + var0 -= 1000; // L: 1145 + var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1146 + } else { + var3 = var2 ? Canvas.field438 : class3.field12; // L: 1148 + } + + if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { // L: 1149 + if (Interpreter.field1135 >= 10) { // L: 1150 + throw new RuntimeException(); // L: 1151 + } else if (var3.onResize == null) { // L: 1153 + return 0; + } else { + ScriptEvent var4 = new ScriptEvent(); // L: 1154 + var4.widget = var3; // L: 1155 + var4.args = var3.onResize; // L: 1156 + var4.field593 = Interpreter.field1135 + 1; // L: 1157 + Client.scriptEvents.addFirst(var4); // L: 1158 + return 1; // L: 1159 + } + } else { + return 2; // L: 1161 + } } } diff --git a/runescape-client/src/main/java/HorizontalAlignment.java b/runescape-client/src/main/java/HorizontalAlignment.java index 2c655f4be1..12cedc7f23 100644 --- a/runescape-client/src/main/java/HorizontalAlignment.java +++ b/runescape-client/src/main/java/HorizontalAlignment.java @@ -4,54 +4,97 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jc") +@ObfuscatedName("ju") @Implements("HorizontalAlignment") public enum HorizontalAlignment implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lju;" ) - field3488(2, 0), - @ObfuscatedName("o") + field3479(1, 0), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lju;" ) @Export("HorizontalAlignment_centered") - HorizontalAlignment_centered(1, 1), - @ObfuscatedName("q") + HorizontalAlignment_centered(0, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lju;" ) - field3492(0, 2); + field3481(2, 2); - @ObfuscatedName("bq") - @Export("worldListURL") - static String worldListURL; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1908984303 + intValue = 1646295401 ) @Export("value") public final int value; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1088861253 + intValue = -1817509831 ) @Export("id") final int id; HorizontalAlignment(int var3, int var4) { - this.value = var3; - this.id = var4; - } + this.value = var3; // L: 18 + this.id = var4; // L: 19 + } // L: 20 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 23 } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lky;B)V", + garbageValue = "-34" + ) + @Export("updatePlayer") + static final void updatePlayer(PacketBuffer var0) { + var0.importIndex(); // L: 37 + int var1 = Client.localPlayerIndex; // L: 38 + Player var2 = WorldMapLabelSize.localPlayer = Client.players[var1] = new Player(); // L: 39 + var2.index = var1; // L: 40 + int var3 = var0.readBits(30); // L: 41 + byte var4 = (byte)(var3 >> 28); // L: 42 + int var5 = var3 >> 14 & 16383; // L: 43 + int var6 = var3 & 16383; // L: 44 + var2.pathX[0] = var5 - WorldMapManager.baseX; // L: 45 + var2.x = (var2.pathX[0] << 7) + (var2.transformedSize() << 6); // L: 46 + var2.pathY[0] = var6 - WorldMapLabel.baseY; // L: 47 + var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6); // L: 48 + Huffman.Client_plane = var2.plane = var4; // L: 49 + if (Players.field1277[var1] != null) { // L: 50 + var2.read(Players.field1277[var1]); + } + + Players.Players_count = 0; // L: 51 + Players.Players_indices[++Players.Players_count - 1] = var1; // L: 52 + Players.field1285[var1] = 0; // L: 53 + Players.Players_emptyIdxCount = 0; // L: 54 + + for (int var7 = 1; var7 < 2048; ++var7) { // L: 55 + if (var1 != var7) { // L: 56 + int var8 = var0.readBits(18); // L: 57 + int var9 = var8 >> 16; // L: 58 + int var10 = var8 >> 8 & 597; // L: 59 + int var11 = var8 & 597; // L: 60 + Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28); // L: 61 + Players.Players_orientations[var7] = 0; // L: 62 + Players.Players_targetIndices[var7] = -1; // L: 63 + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var7; // L: 64 + Players.field1285[var7] = 0; // L: 65 + } + } + + var0.exportIndex(); // L: 67 + } // L: 68 } diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index 18bb814a14..673b5a287e 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -1,38 +1,47 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("he") +@ObfuscatedName("ht") @Implements("Huffman") public class Huffman { - @ObfuscatedName("g") + @ObfuscatedName("o") + @Export("ArchiveDiskActionHandler_thread") + static Thread ArchiveDiskActionHandler_thread; + @ObfuscatedName("du") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Liw;" ) - @Export("musicTrackArchive") - public static AbstractArchive musicTrackArchive; - @ObfuscatedName("m") + @Export("archive8") + static Archive archive8; + @ObfuscatedName("kk") + @ObfuscatedGetter( + intValue = 360288727 + ) + @Export("Client_plane") + static int Client_plane; + @ObfuscatedName("z") @Export("masks") int[] masks; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("bits") byte[] bits; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("keys") int[] keys; public Huffman(byte[] var1) { - int var2 = var1.length; - this.masks = new int[var2]; - this.bits = var1; - int[] var3 = new int[33]; - this.keys = new int[8]; - int var4 = 0; + int var2 = var1.length; // L: 9 + this.masks = new int[var2]; // L: 10 + this.bits = var1; // L: 11 + int[] var3 = new int[33]; // L: 12 + this.keys = new int[8]; // L: 13 + int var4 = 0; // L: 14 - for (int var5 = 0; var5 < var2; ++var5) { - byte var6 = var1[var5]; + for (int var5 = 0; var5 < var2; ++var5) { // L: 15 + byte var6 = var1[var5]; // L: 16 if (var6 != 0) { int var7 = 1 << 32 - var6; int var8 = var3[var6]; @@ -41,20 +50,20 @@ public class Huffman { int var10; int var11; int var12; - if ((var8 & var7) != 0) { + if ((var8 & var7) != 0) { // L: 22 var9 = var3[var6 - 1]; } else { - var9 = var8 | var7; + var9 = var8 | var7; // L: 24 - for (var10 = var6 - 1; var10 >= 1; --var10) { - var11 = var3[var10]; - if (var11 != var8) { + for (var10 = var6 - 1; var10 >= 1; --var10) { // L: 25 + var11 = var3[var10]; // L: 26 + if (var11 != var8) { // L: 27 break; } - var12 = 1 << 32 - var10; - if ((var11 & var12) != 0) { - var3[var10] = var3[var10 - 1]; + var12 = 1 << 32 - var10; // L: 28 + if ((var11 & var12) != 0) { // L: 29 + var3[var10] = var3[var10 - 1]; // L: 30 break; } @@ -70,208 +79,208 @@ public class Huffman { } } - var10 = 0; + var10 = 0; // L: 42 - for (var11 = 0; var11 < var6; ++var11) { - var12 = Integer.MIN_VALUE >>> var11; - if ((var8 & var12) != 0) { - if (this.keys[var10] == 0) { + for (var11 = 0; var11 < var6; ++var11) { // L: 43 + var12 = Integer.MIN_VALUE >>> var11; // L: 44 + if ((var8 & var12) != 0) { // L: 45 + if (this.keys[var10] == 0) { // L: 46 this.keys[var10] = var4; } - var10 = this.keys[var10]; + var10 = this.keys[var10]; // L: 47 } else { - ++var10; + ++var10; // L: 49 } - if (var10 >= this.keys.length) { - int[] var13 = new int[this.keys.length * 2]; + if (var10 >= this.keys.length) { // L: 50 + int[] var13 = new int[this.keys.length * 2]; // L: 51 - for (int var14 = 0; var14 < this.keys.length; ++var14) { + for (int var14 = 0; var14 < this.keys.length; ++var14) { // L: 52 var13[var14] = this.keys[var14]; } - this.keys = var13; + this.keys = var13; // L: 53 } - var12 >>>= 1; + var12 >>>= 1; // L: 55 } - this.keys[var10] = ~var5; - if (var10 >= var4) { + this.keys[var10] = ~var5; // L: 57 + if (var10 >= var4) { // L: 58 var4 = var10 + 1; } } } - } + } // L: 60 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([BII[BII)I", - garbageValue = "1506774655" + garbageValue = "-141428387" ) @Export("compress") int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) { - int var6 = 0; - int var7 = var5 << 3; + int var6 = 0; // L: 63 + int var7 = var5 << 3; // L: 64 - for (var3 += var2; var2 < var3; ++var2) { - int var8 = var1[var2] & 255; - int var9 = this.masks[var8]; - byte var10 = this.bits[var8]; - if (var10 == 0) { + for (var3 += var2; var2 < var3; ++var2) { // L: 65 66 + int var8 = var1[var2] & 255; // L: 67 + int var9 = this.masks[var8]; // L: 68 + byte var10 = this.bits[var8]; // L: 69 + if (var10 == 0) { // L: 70 throw new RuntimeException("" + var8); } - int var11 = var7 >> 3; - int var12 = var7 & 7; - var6 &= -var12 >> 31; - int var13 = (var12 + var10 - 1 >> 3) + var11; - var12 += 24; - var4[var11] = (byte)(var6 |= var9 >>> var12); - if (var11 < var13) { - ++var11; - var12 -= 8; - var4[var11] = (byte)(var6 = var9 >>> var12); - if (var11 < var13) { - ++var11; - var12 -= 8; - var4[var11] = (byte)(var6 = var9 >>> var12); - if (var11 < var13) { - ++var11; - var12 -= 8; - var4[var11] = (byte)(var6 = var9 >>> var12); - if (var11 < var13) { - ++var11; - var12 -= 8; - var4[var11] = (byte)(var6 = var9 << -var12); + int var11 = var7 >> 3; // L: 71 + int var12 = var7 & 7; // L: 72 + var6 &= -var12 >> 31; // L: 73 + int var13 = (var12 + var10 - 1 >> 3) + var11; // L: 74 + var12 += 24; // L: 76 + var4[var11] = (byte)(var6 |= var9 >>> var12); // L: 77 + if (var11 < var13) { // L: 78 + ++var11; // L: 79 + var12 -= 8; // L: 80 + var4[var11] = (byte)(var6 = var9 >>> var12); // L: 81 + if (var11 < var13) { // L: 82 + ++var11; // L: 83 + var12 -= 8; // L: 84 + var4[var11] = (byte)(var6 = var9 >>> var12); // L: 85 + if (var11 < var13) { // L: 86 + ++var11; // L: 87 + var12 -= 8; // L: 88 + var4[var11] = (byte)(var6 = var9 >>> var12); // L: 89 + if (var11 < var13) { // L: 90 + ++var11; // L: 91 + var12 -= 8; // L: 92 + var4[var11] = (byte)(var6 = var9 << -var12); // L: 93 } } } } - var7 += var10; + var7 += var10; // L: 95 } - return (var7 + 7 >> 3) - var5; + return (var7 + 7 >> 3) - var5; // L: 97 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "([BI[BIII)I", - garbageValue = "-417422425" + garbageValue = "-238004531" ) @Export("decompress") int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { - if (var5 == 0) { + if (var5 == 0) { // L: 101 return 0; } else { - int var6 = 0; - var5 += var4; + int var6 = 0; // L: 102 + var5 += var4; // L: 103 int var7 = var2; while (true) { - byte var8 = var1[var7]; - if (var8 < 0) { + byte var8 = var1[var7]; // L: 106 + if (var8 < 0) { // L: 108 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 109 } int var9; - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 110 + var3[var4++] = (byte)(~var9); // L: 111 + if (var4 >= var5) { // L: 112 break; } - var6 = 0; + var6 = 0; // L: 113 } - if ((var8 & 64) != 0) { + if ((var8 & 64) != 0) { // L: 115 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 116 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 117 + var3[var4++] = (byte)(~var9); // L: 118 + if (var4 >= var5) { // L: 119 break; } - var6 = 0; + var6 = 0; // L: 120 } - if ((var8 & 32) != 0) { + if ((var8 & 32) != 0) { // L: 122 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 123 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 124 + var3[var4++] = (byte)(~var9); // L: 125 + if (var4 >= var5) { // L: 126 break; } - var6 = 0; + var6 = 0; // L: 127 } - if ((var8 & 16) != 0) { + if ((var8 & 16) != 0) { // L: 129 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 130 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 131 + var3[var4++] = (byte)(~var9); // L: 132 + if (var4 >= var5) { // L: 133 break; } - var6 = 0; + var6 = 0; // L: 134 } - if ((var8 & 8) != 0) { + if ((var8 & 8) != 0) { // L: 136 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 137 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 138 + var3[var4++] = (byte)(~var9); // L: 139 + if (var4 >= var5) { // L: 140 break; } - var6 = 0; + var6 = 0; // L: 141 } - if ((var8 & 4) != 0) { + if ((var8 & 4) != 0) { // L: 143 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 144 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { + if ((var9 = this.keys[var6]) < 0) { // L: 145 + var3[var4++] = (byte)(~var9); // L: 146 + if (var4 >= var5) { // L: 147 break; } - var6 = 0; + var6 = 0; // L: 148 } - if ((var8 & 2) != 0) { + if ((var8 & 2) != 0) { // L: 150 var6 = this.keys[var6]; } else { - ++var6; + ++var6; // L: 151 } - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); + if ((var9 = this.keys[var6]) < 0) { // L: 152 + var3[var4++] = (byte)(~var9); // L: 153 if (var4 >= var5) { break; } @@ -294,40 +303,83 @@ public class Huffman { var6 = 0; } - ++var7; + ++var7; // L: 105 } - return var7 + 1 - var2; + return var7 + 1 - var2; // L: 165 } } - @ObfuscatedName("e") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "-2030952139" + descriptor = "(III)V", + garbageValue = "-1277930744" ) - static int method4099(int var0, Script var1, boolean var2) { - Widget var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETX) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETY) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.parentId; - return 1; + public static void method4047(int var0, int var1) { + VarbitDefinition var2 = TaskHandler.method3567(var0); // L: 33 + int var3 = var2.baseVar; // L: 34 + int var4 = var2.startBit; // L: 35 + int var5 = var2.endBit; // L: 36 + int var6 = Varps.Varps_masks[var5 - var4]; // L: 37 + if (var1 < 0 || var1 > var6) { // L: 38 + var1 = 0; + } + + var6 <<= var4; // L: 39 + Varps.Varps_main[var3] = Varps.Varps_main[var3] & ~var6 | var1 << var4 & var6; // L: 40 + } // L: 41 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIIB)I", + garbageValue = "81" + ) + public static int method4041(int var0, int var1, int var2) { + var2 &= 3; // L: 17 + if (var2 == 0) { // L: 18 + return var1; + } else if (var2 == 1) { // L: 19 + return 7 - var0; } else { - return 2; + return var2 == 2 ? 7 - var1 : var0; // L: 20 } } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;B)Ljava/lang/String;", + garbageValue = "2" + ) + public static String method4049(String var0) { + int var1 = var0.length(); // L: 154 + char[] var2 = new char[var1]; // L: 155 + byte var3 = 2; // L: 156 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 157 + char var5 = var0.charAt(var4); // L: 158 + if (var3 == 0) { // L: 159 + var5 = Character.toLowerCase(var5); + } else if (var3 == 2 || Character.isUpperCase(var5)) { // L: 160 + var5 = UserList.method5199(var5); + } + + if (Character.isLetter(var5)) { // L: 161 + var3 = 0; + } else if (var5 != '.' && var5 != '?' && var5 != '!') { // L: 162 + if (Character.isSpaceChar(var5)) { // L: 163 + if (var3 != 2) { // L: 164 + var3 = 1; + } + } else { + var3 = 1; // L: 166 + } + } else { + var3 = 2; + } + + var2[var4] = var5; // L: 167 + } + + return new String(var2); // L: 169 + } } diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java index c2625ba78a..7e3887e8be 100644 --- a/runescape-client/src/main/java/IgnoreList.java +++ b/runescape-client/src/main/java/IgnoreList.java @@ -1,90 +1,105 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jw") +@ObfuscatedName("js") @Implements("IgnoreList") public class IgnoreList extends UserList { - @ObfuscatedName("q") + @ObfuscatedName("rj") + @ObfuscatedGetter( + intValue = -1974595173 + ) + static int field3620; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) @Export("loginType") final LoginType loginType; @ObfuscatedSignature( - descriptor = "(Lmo;)V" + descriptor = "(Lmu;)V" ) public IgnoreList(LoginType var1) { - super(400); + super(400); // L: 12 this.loginType = var1; - } + } // L: 14 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Ljf;", - garbageValue = "551595115" + descriptor = "(B)Ljc;", + garbageValue = "35" ) @Export("newInstance") User newInstance() { - return new Ignored(); + return new Ignored(); // L: 17 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)[Ljf;", - garbageValue = "1959965595" + descriptor = "(IB)[Ljc;", + garbageValue = "-19" ) @Export("newTypedArray") User[] newTypedArray(int var1) { - return new Ignored[var1]; + return new Ignored[var1]; // L: 21 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;IB)V", - garbageValue = "77" + descriptor = "(Lkf;IB)V", + garbageValue = "-55" ) @Export("read") public void read(Buffer var1, int var2) { while (true) { - if (var1.offset < var2) { - int var3 = var1.readUnsignedByte(); - boolean var4 = (var3 & 1) == 1; - Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); - var1.readStringCp1252NullTerminated(); - if (var5 != null && var5.hasCleanName()) { - Ignored var7 = (Ignored)this.getByCurrentUsername(var5); - if (var4) { - Ignored var8 = (Ignored)this.getByCurrentUsername(var6); - if (var8 != null && var7 != var8) { - if (var7 != null) { - this.remove(var8); + if (var1.offset < var2) { // L: 25 + int var3 = var1.readUnsignedByte(); // L: 26 + boolean var4 = (var3 & 1) == 1; // L: 27 + Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 28 + Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 29 + var1.readStringCp1252NullTerminated(); // L: 30 + if (var5 != null && var5.hasCleanName()) { // L: 31 + Ignored var7 = (Ignored)this.getByCurrentUsername(var5); // L: 32 + if (var4) { // L: 33 + Ignored var8 = (Ignored)this.getByCurrentUsername(var6); // L: 34 + if (var8 != null && var8 != var7) { // L: 35 + if (var7 != null) { // L: 36 + this.remove(var8); // L: 37 } else { - var7 = var8; + var7 = var8; // L: 40 } } } - if (var7 != null) { - this.changeName(var7, var5, var6); + if (var7 != null) { // L: 44 + this.changeName(var7, var5, var6); // L: 45 continue; } - if (this.getSize() < 400) { - int var9 = this.getSize(); - var7 = (Ignored)this.addLast(var5, var6); - var7.id = var9; + if (this.getSize() < 400) { // L: 47 + int var9 = this.getSize(); // L: 48 + var7 = (Ignored)this.addLast(var5, var6); // L: 49 + var7.id = var9; // L: 50 } continue; } - throw new IllegalStateException(); + throw new IllegalStateException(); // L: 53 } - return; + return; // L: 54 } } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)[Lij;", + garbageValue = "1485577751" + ) + static GameBuild[] method5182() { + return new GameBuild[]{GameBuild.LIVE, GameBuild.WIP, GameBuild.RC, GameBuild.BUILDLIVE}; // L: 13 + } } diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index c12d42adb0..2b0e6eb6a6 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -4,40 +4,40 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kc") +@ObfuscatedName("kk") @Implements("Ignored") public class Ignored extends User { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1754728745 + intValue = 1266323763 ) @Export("id") int id; Ignored() { - } + } // L: 6 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkc;I)I", - garbageValue = "-857572865" + descriptor = "(Lkk;I)I", + garbageValue = "1464728446" ) @Export("compareTo_ignored") int compareTo_ignored(Ignored var1) { - return this.id - var1.id; + return this.id - var1.id; // L: 9 } - @ObfuscatedName("ah") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljf;I)I", - garbageValue = "334051838" + descriptor = "(Ljc;I)I", + garbageValue = "-243007320" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.compareTo_ignored((Ignored)var1); + return this.compareTo_ignored((Ignored)var1); // L: 13 } public int compareTo(Object var1) { - return this.compareTo_ignored((Ignored)var1); + return this.compareTo_ignored((Ignored)var1); // L: 17 } } diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java index bdf4ff90b6..1e61795d1c 100644 --- a/runescape-client/src/main/java/IndexedSprite.java +++ b/runescape-client/src/main/java/IndexedSprite.java @@ -2,276 +2,276 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lh") +@ObfuscatedName("ls") @Implements("IndexedSprite") public final class IndexedSprite extends Rasterizer2D { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("pixels") public byte[] pixels; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("palette") public int[] palette; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("subWidth") public int subWidth; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("subHeight") public int subHeight; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("xOffset") public int xOffset; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("yOffset") public int yOffset; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("width") public int width; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("height") public int height; IndexedSprite() { - } + } // L: 15 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("normalize") public void normalize() { - if (this.subWidth != this.width || this.subHeight != this.height) { - byte[] var1 = new byte[this.width * this.height]; - int var2 = 0; + if (this.subWidth != this.width || this.subHeight != this.height) { // L: 18 + byte[] var1 = new byte[this.width * this.height]; // L: 19 + int var2 = 0; // L: 20 - for (int var3 = 0; var3 < this.subHeight; ++var3) { - for (int var4 = 0; var4 < this.subWidth; ++var4) { - var1[var4 + (var3 + this.yOffset) * this.width + this.xOffset] = this.pixels[var2++]; + for (int var3 = 0; var3 < this.subHeight; ++var3) { // L: 21 + for (int var4 = 0; var4 < this.subWidth; ++var4) { // L: 22 + var1[var4 + (var3 + this.yOffset) * this.width + this.xOffset] = this.pixels[var2++]; // L: 23 } } - this.pixels = var1; - this.subWidth = this.width; - this.subHeight = this.height; - this.xOffset = 0; - this.yOffset = 0; + this.pixels = var1; // L: 26 + this.subWidth = this.width; // L: 27 + this.subHeight = this.height; // L: 28 + this.xOffset = 0; // L: 29 + this.yOffset = 0; // L: 30 } - } + } // L: 31 - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("shiftColors") public void shiftColors(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.palette.length; ++var4) { - int var5 = this.palette[var4] >> 16 & 255; - var5 += var1; - if (var5 < 0) { + for (int var4 = 0; var4 < this.palette.length; ++var4) { // L: 34 + int var5 = this.palette[var4] >> 16 & 255; // L: 35 + var5 += var1; // L: 36 + if (var5 < 0) { // L: 37 var5 = 0; - } else if (var5 > 255) { + } else if (var5 > 255) { // L: 38 var5 = 255; } - int var6 = this.palette[var4] >> 8 & 255; - var6 += var2; - if (var6 < 0) { + int var6 = this.palette[var4] >> 8 & 255; // L: 39 + var6 += var2; // L: 40 + if (var6 < 0) { // L: 41 var6 = 0; - } else if (var6 > 255) { + } else if (var6 > 255) { // L: 42 var6 = 255; } - int var7 = this.palette[var4] & 255; - var7 += var3; - if (var7 < 0) { + int var7 = this.palette[var4] & 255; // L: 43 + var7 += var3; // L: 44 + if (var7 < 0) { // L: 45 var7 = 0; - } else if (var7 > 255) { + } else if (var7 > 255) { // L: 46 var7 = 255; } - this.palette[var4] = var7 + (var6 << 8) + (var5 << 16); + this.palette[var4] = var7 + (var6 << 8) + (var5 << 16); // L: 47 } - } + } // L: 49 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("drawAt") public void drawAt(int var1, int var2) { - var1 += this.xOffset; - var2 += this.yOffset; - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var4 = 0; - int var5 = this.subHeight; - int var6 = this.subWidth; - int var7 = Rasterizer2D.Rasterizer2D_width - var6; - int var8 = 0; + var1 += this.xOffset; // L: 52 + var2 += this.yOffset; // L: 53 + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 54 + int var4 = 0; // L: 55 + int var5 = this.subHeight; // L: 56 + int var6 = this.subWidth; // L: 57 + int var7 = Rasterizer2D.Rasterizer2D_width - var6; // L: 58 + int var8 = 0; // L: 59 int var9; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var5 -= var9; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var4 += var9 * var6; - var3 += var9 * Rasterizer2D.Rasterizer2D_width; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 60 + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 61 + var5 -= var9; // L: 62 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 63 + var4 += var9 * var6; // L: 64 + var3 += var9 * Rasterizer2D.Rasterizer2D_width; // L: 65 } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 67 var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var6 -= var9; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; - var4 += var9; - var3 += var9; - var8 += var9; - var7 += var9; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 68 + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 69 + var6 -= var9; // L: 70 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 71 + var4 += var9; // L: 72 + var3 += var9; // L: 73 + var8 += var9; // L: 74 + var7 += var9; // L: 75 } - if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var6 -= var9; - var8 += var9; - var7 += var9; + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 77 + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 78 + var6 -= var9; // L: 79 + var8 += var9; // L: 80 + var7 += var9; // L: 81 } - if (var6 > 0 && var5 > 0) { - IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); + if (var6 > 0 && var5 > 0) { // L: 83 + IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8); // L: 84 } - } + } // L: 85 - @ObfuscatedName("p") - public void method6322(int var1, int var2, int var3, int var4) { - int var5 = this.subWidth; - int var6 = this.subHeight; - int var7 = 0; - int var8 = 0; - int var9 = this.width; - int var10 = this.height; - int var11 = (var9 << 16) / var3; - int var12 = (var10 << 16) / var4; + @ObfuscatedName("i") + public void method6217(int var1, int var2, int var3, int var4) { + int var5 = this.subWidth; // L: 116 + int var6 = this.subHeight; // L: 117 + int var7 = 0; // L: 118 + int var8 = 0; // L: 119 + int var9 = this.width; // L: 120 + int var10 = this.height; // L: 121 + int var11 = (var9 << 16) / var3; // L: 122 + int var12 = (var10 << 16) / var4; // L: 123 int var13; - if (this.xOffset > 0) { - var13 = (var11 + (this.xOffset << 16) - 1) / var11; - var1 += var13; - var7 += var13 * var11 - (this.xOffset << 16); + if (this.xOffset > 0) { // L: 124 + var13 = (var11 + (this.xOffset << 16) - 1) / var11; // L: 125 + var1 += var13; // L: 126 + var7 += var13 * var11 - (this.xOffset << 16); // L: 127 } - if (this.yOffset > 0) { - var13 = (var12 + (this.yOffset << 16) - 1) / var12; - var2 += var13; - var8 += var13 * var12 - (this.yOffset << 16); + if (this.yOffset > 0) { // L: 129 + var13 = (var12 + (this.yOffset << 16) - 1) / var12; // L: 130 + var2 += var13; // L: 131 + var8 += var13 * var12 - (this.yOffset << 16); // L: 132 } - if (var5 < var9) { + if (var5 < var9) { // L: 134 var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if (var6 < var10) { + if (var6 < var10) { // L: 135 var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_width - var3; - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 136 + int var14 = Rasterizer2D.Rasterizer2D_width - var3; // L: 137 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 138 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var15; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var15; - var13 += var15 * Rasterizer2D.Rasterizer2D_width; - var8 += var12 * var15; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 139 + var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 140 + var4 -= var15; // L: 141 + var13 += var15 * Rasterizer2D.Rasterizer2D_width; // L: 142 + var8 += var12 * var15; // L: 143 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var15; - var14 += var15; + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 145 + var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 146 + var3 -= var15; // L: 147 + var14 += var15; // L: 148 } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var15; - var13 += var15; - var7 += var11 * var15; - var14 += var15; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 150 + var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 151 + var3 -= var15; // L: 152 + var13 += var15; // L: 153 + var7 += var11 * var15; // L: 154 + var14 += var15; // L: 155 } - IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); - } + IndexedSprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 157 + } // L: 158 - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("IndexedSprite_two") static void IndexedSprite_two(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); - var5 = -(var5 & 3); + int var9 = -(var5 >> 2); // L: 88 + var5 = -(var5 & 3); // L: 89 - for (int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { // L: 90 int var11; byte var12; - for (var11 = var9; var11 < 0; ++var11) { - var12 = var1[var3++]; + for (var11 = var9; var11 < 0; ++var11) { // L: 91 + var12 = var1[var3++]; // L: 92 if (var12 != 0) { - var0[var4++] = var2[var12 & 255]; + var0[var4++] = var2[var12 & 255]; // L: 93 } else { - ++var4; + ++var4; // L: 94 } - var12 = var1[var3++]; - if (var12 != 0) { + var12 = var1[var3++]; // L: 95 + if (var12 != 0) { // L: 96 var0[var4++] = var2[var12 & 255]; } else { - ++var4; + ++var4; // L: 97 } - var12 = var1[var3++]; - if (var12 != 0) { + var12 = var1[var3++]; // L: 98 + if (var12 != 0) { // L: 99 var0[var4++] = var2[var12 & 255]; } else { - ++var4; + ++var4; // L: 100 } - var12 = var1[var3++]; - if (var12 != 0) { + var12 = var1[var3++]; // L: 101 + if (var12 != 0) { // L: 102 var0[var4++] = var2[var12 & 255]; } else { - ++var4; + ++var4; // L: 103 } } - for (var11 = var5; var11 < 0; ++var11) { - var12 = var1[var3++]; - if (var12 != 0) { + for (var11 = var5; var11 < 0; ++var11) { // L: 105 + var12 = var1[var3++]; // L: 106 + if (var12 != 0) { // L: 107 var0[var4++] = var2[var12 & 255]; } else { - ++var4; + ++var4; // L: 108 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 110 + var3 += var8; // L: 111 } - } + } // L: 113 - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("IndexedSprite_something") static void IndexedSprite_something(int[] var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { - int var12 = var3; + int var12 = var3; // L: 161 - for (int var13 = -var8; var13 < 0; ++var13) { - int var14 = var11 * (var4 >> 16); + for (int var13 = -var8; var13 < 0; ++var13) { // L: 162 + int var14 = var11 * (var4 >> 16); // L: 163 - for (int var15 = -var7; var15 < 0; ++var15) { - byte var16 = var1[(var3 >> 16) + var14]; - if (var16 != 0) { + for (int var15 = -var7; var15 < 0; ++var15) { // L: 164 + byte var16 = var1[(var3 >> 16) + var14]; // L: 165 + if (var16 != 0) { // L: 166 var0[var5++] = var2[var16 & 255]; } else { - ++var5; + ++var5; // L: 167 } - var3 += var9; + var3 += var9; // L: 168 } - var4 += var10; - var3 = var12; - var5 += var6; + var4 += var10; // L: 170 + var3 = var12; // L: 171 + var5 += var6; // L: 172 } - } + } // L: 174 } diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 8df3261823..347eed1bf8 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -4,186 +4,186 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dq") +@ObfuscatedName("dz") @Implements("Instrument") public class Instrument { - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("Instrument_samples") static int[] Instrument_samples; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("Instrument_noise") static int[] Instrument_noise; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("Instrument_sine") static int[] Instrument_sine; - @ObfuscatedName("t") + @ObfuscatedName("u") @Export("Instrument_phases") static int[] Instrument_phases; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("Instrument_delays") static int[] Instrument_delays; @ObfuscatedName("b") @Export("Instrument_volumeSteps") static int[] Instrument_volumeSteps; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("Instrument_pitchSteps") static int[] Instrument_pitchSteps; - @ObfuscatedName("f") + @ObfuscatedName("e") @Export("Instrument_pitchBaseSteps") static int[] Instrument_pitchBaseSteps; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldw;" ) @Export("pitch") SoundEnvelope pitch; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldw;" ) @Export("volume") SoundEnvelope volume; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldw;" ) @Export("pitchModifier") SoundEnvelope pitchModifier; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldw;" ) @Export("pitchModifierAmplitude") SoundEnvelope pitchModifierAmplitude; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldw;" ) @Export("volumeMultiplier") SoundEnvelope volumeMultiplier; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldw;" ) @Export("volumeMultiplierAmplitude") SoundEnvelope volumeMultiplierAmplitude; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldw;" ) @Export("release") SoundEnvelope release; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldw;" ) @Export("attack") SoundEnvelope attack; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("oscillatorVolume") int[] oscillatorVolume; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("oscillatorPitch") int[] oscillatorPitch; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("oscillatorDelays") int[] oscillatorDelays; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("delayTime") int delayTime; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("delayDecay") int delayDecay; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lda;" + descriptor = "Ldu;" ) @Export("filter") AudioFilter filter; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lds;" + descriptor = "Ldw;" ) @Export("filterEnvelope") SoundEnvelope filterEnvelope; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("duration") int duration; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("offset") int offset; static { - Instrument_noise = new int[32768]; - Random var0 = new Random(0L); + Instrument_noise = new int[32768]; // L: 31 + Random var0 = new Random(0L); // L: 32 int var1; - for (var1 = 0; var1 < 32768; ++var1) { - Instrument_noise[var1] = (var0.nextInt() & 2) - 1; + for (var1 = 0; var1 < 32768; ++var1) { // L: 33 + Instrument_noise[var1] = (var0.nextInt() & 2) - 1; // L: 34 } - Instrument_sine = new int[32768]; + Instrument_sine = new int[32768]; // L: 36 - for (var1 = 0; var1 < 32768; ++var1) { - Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); + for (var1 = 0; var1 < 32768; ++var1) { // L: 37 + Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D); // L: 38 } - Instrument_samples = new int[220500]; - Instrument_phases = new int[5]; - Instrument_delays = new int[5]; - Instrument_volumeSteps = new int[5]; - Instrument_pitchSteps = new int[5]; - Instrument_pitchBaseSteps = new int[5]; + Instrument_samples = new int[220500]; // L: 40 + Instrument_phases = new int[5]; // L: 44 + Instrument_delays = new int[5]; // L: 45 + Instrument_volumeSteps = new int[5]; // L: 46 + Instrument_pitchSteps = new int[5]; // L: 47 + Instrument_pitchBaseSteps = new int[5]; // L: 48 } Instrument() { - this.oscillatorVolume = new int[]{0, 0, 0, 0, 0}; - this.oscillatorPitch = new int[]{0, 0, 0, 0, 0}; - this.oscillatorDelays = new int[]{0, 0, 0, 0, 0}; - this.delayTime = 0; - this.delayDecay = 100; - this.duration = 500; - this.offset = 0; - } + this.oscillatorVolume = new int[]{0, 0, 0, 0, 0}; // L: 17 + this.oscillatorPitch = new int[]{0, 0, 0, 0, 0}; // L: 18 + this.oscillatorDelays = new int[]{0, 0, 0, 0, 0}; // L: 19 + this.delayTime = 0; // L: 20 + this.delayDecay = 100; // L: 21 + this.duration = 500; // L: 24 + this.offset = 0; // L: 25 + } // L: 50 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("synthesize") final int[] synthesize(int var1, int var2) { - class310.clearIntArray(Instrument_samples, 0, var1); - if (var2 < 10) { + class310.clearIntArray(Instrument_samples, 0, var1); // L: 53 + if (var2 < 10) { // L: 54 return Instrument_samples; } else { - double var3 = (double)var1 / ((double)var2 + 0.0D); - this.pitch.reset(); - this.volume.reset(); - int var5 = 0; - int var6 = 0; - int var7 = 0; - if (this.pitchModifier != null) { - this.pitchModifier.reset(); - this.pitchModifierAmplitude.reset(); - var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); - var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); + double var3 = (double)var1 / ((double)var2 + 0.0D); // L: 55 + this.pitch.reset(); // L: 56 + this.volume.reset(); // L: 57 + int var5 = 0; // L: 58 + int var6 = 0; // L: 59 + int var7 = 0; // L: 60 + if (this.pitchModifier != null) { // L: 61 + this.pitchModifier.reset(); // L: 62 + this.pitchModifierAmplitude.reset(); // L: 63 + var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); // L: 64 + var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); // L: 65 } - int var8 = 0; - int var9 = 0; - int var10 = 0; - if (this.volumeMultiplier != null) { - this.volumeMultiplier.reset(); - this.volumeMultiplierAmplitude.reset(); - var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); - var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); + int var8 = 0; // L: 67 + int var9 = 0; // L: 68 + int var10 = 0; // L: 69 + if (this.volumeMultiplier != null) { // L: 70 + this.volumeMultiplier.reset(); // L: 71 + this.volumeMultiplierAmplitude.reset(); // L: 72 + var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); // L: 73 + var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); // L: 74 } int var11; - for (var11 = 0; var11 < 5; ++var11) { - if (this.oscillatorVolume[var11] != 0) { - Instrument_phases[var11] = 0; - Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); - Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; - Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); - Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); + for (var11 = 0; var11 < 5; ++var11) { // L: 76 + if (this.oscillatorVolume[var11] != 0) { // L: 77 + Instrument_phases[var11] = 0; // L: 78 + Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); // L: 79 + Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; // L: 80 + Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); // L: 81 + Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); // L: 82 } } @@ -192,30 +192,30 @@ public class Instrument { int var14; int var15; int[] var10000; - for (var11 = 0; var11 < var1; ++var11) { - var12 = this.pitch.doStep(var1); - var13 = this.volume.doStep(var1); - if (this.pitchModifier != null) { - var14 = this.pitchModifier.doStep(var1); - var15 = this.pitchModifierAmplitude.doStep(var1); - var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; - var7 = var7 + var6 + (var14 * var5 >> 16); + for (var11 = 0; var11 < var1; ++var11) { // L: 84 + var12 = this.pitch.doStep(var1); // L: 85 + var13 = this.volume.doStep(var1); // L: 86 + if (this.pitchModifier != null) { // L: 87 + var14 = this.pitchModifier.doStep(var1); // L: 88 + var15 = this.pitchModifierAmplitude.doStep(var1); // L: 89 + var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; // L: 90 + var7 = var7 + var6 + (var14 * var5 >> 16); // L: 91 } - if (this.volumeMultiplier != null) { - var14 = this.volumeMultiplier.doStep(var1); - var15 = this.volumeMultiplierAmplitude.doStep(var1); - var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; - var10 = var10 + var9 + (var14 * var8 >> 16); + if (this.volumeMultiplier != null) { // L: 93 + var14 = this.volumeMultiplier.doStep(var1); // L: 94 + var15 = this.volumeMultiplierAmplitude.doStep(var1); // L: 95 + var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; // L: 96 + var10 = var10 + var9 + (var14 * var8 >> 16); // L: 97 } - for (var14 = 0; var14 < 5; ++var14) { - if (this.oscillatorVolume[var14] != 0) { - var15 = Instrument_delays[var14] + var11; - if (var15 < var1) { - var10000 = Instrument_samples; + for (var14 = 0; var14 < 5; ++var14) { // L: 99 + if (this.oscillatorVolume[var14] != 0) { // L: 100 + var15 = Instrument_delays[var14] + var11; // L: 101 + if (var15 < var1) { // L: 102 + var10000 = Instrument_samples; // L: 103 var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form); - var10000 = Instrument_phases; + var10000 = Instrument_phases; // L: 104 var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; } } @@ -223,204 +223,204 @@ public class Instrument { } int var16; - if (this.release != null) { - this.release.reset(); - this.attack.reset(); - var11 = 0; - boolean var19 = false; - boolean var20 = true; + if (this.release != null) { // L: 108 + this.release.reset(); // L: 109 + this.attack.reset(); // L: 110 + var11 = 0; // L: 111 + boolean var19 = false; // L: 112 + boolean var20 = true; // L: 113 - for (var14 = 0; var14 < var1; ++var14) { - var15 = this.release.doStep(var1); - var16 = this.attack.doStep(var1); - if (var20) { + for (var14 = 0; var14 < var1; ++var14) { // L: 114 + var15 = this.release.doStep(var1); // L: 115 + var16 = this.attack.doStep(var1); // L: 116 + if (var20) { // L: 117 var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start; } else { - var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; + var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; // L: 118 } - var11 += 256; + var11 += 256; // L: 119 if (var11 >= var12) { - var11 = 0; - var20 = !var20; + var11 = 0; // L: 120 + var20 = !var20; // L: 121 } - if (var20) { + if (var20) { // L: 123 Instrument_samples[var14] = 0; } } } - if (this.delayTime > 0 && this.delayDecay > 0) { - var11 = (int)((double)this.delayTime * var3); + if (this.delayTime > 0 && this.delayDecay > 0) { // L: 126 + var11 = (int)((double)this.delayTime * var3); // L: 127 - for (var12 = var11; var12 < var1; ++var12) { + for (var12 = var11; var12 < var1; ++var12) { // L: 128 var10000 = Instrument_samples; var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; } } - if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { - this.filterEnvelope.reset(); - var11 = this.filterEnvelope.doStep(var1 + 1); - var12 = this.filter.compute(0, (float)var11 / 65536.0F); - var13 = this.filter.compute(1, (float)var11 / 65536.0F); - if (var1 >= var12 + var13) { - var14 = 0; - var15 = var13; - if (var13 > var1 - var12) { + if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { // L: 130 + this.filterEnvelope.reset(); // L: 131 + var11 = this.filterEnvelope.doStep(var1 + 1); // L: 132 + var12 = this.filter.compute(0, (float)var11 / 65536.0F); // L: 133 + var13 = this.filter.compute(1, (float)var11 / 65536.0F); // L: 134 + if (var1 >= var12 + var13) { // L: 135 + var14 = 0; // L: 136 + var15 = var13; // L: 137 + if (var13 > var1 - var12) { // L: 138 var15 = var1 - var12; } int var17; while (var14 < var15) { - var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); + var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); // L: 140 - for (var17 = 0; var17 < var12; ++var17) { + for (var17 = 0; var17 < var12; ++var17) { // L: 141 var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16); } - for (var17 = 0; var17 < var14; ++var17) { + for (var17 = 0; var17 < var14; ++var17) { // L: 142 var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16); } - Instrument_samples[var14] = var16; - var11 = this.filterEnvelope.doStep(var1 + 1); - ++var14; + Instrument_samples[var14] = var16; // L: 143 + var11 = this.filterEnvelope.doStep(var1 + 1); // L: 144 + ++var14; // L: 139 } - var15 = 128; + var15 = 128; // L: 147 while (true) { - if (var15 > var1 - var12) { + if (var15 > var1 - var12) { // L: 149 var15 = var1 - var12; } int var18; while (var14 < var15) { - var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); + var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); // L: 151 - for (var18 = 0; var18 < var12; ++var18) { + for (var18 = 0; var18 < var12; ++var18) { // L: 152 var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } - for (var18 = 0; var18 < var13; ++var18) { + for (var18 = 0; var18 < var13; ++var18) { // L: 153 var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); } - Instrument_samples[var14] = var17; - var11 = this.filterEnvelope.doStep(var1 + 1); - ++var14; + Instrument_samples[var14] = var17; // L: 154 + var11 = this.filterEnvelope.doStep(var1 + 1); // L: 155 + ++var14; // L: 150 } - if (var14 >= var1 - var12) { + if (var14 >= var1 - var12) { // L: 157 while (var14 < var1) { - var17 = 0; + var17 = 0; // L: 163 - for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { + for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { // L: 164 var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } - for (var18 = 0; var18 < var13; ++var18) { + for (var18 = 0; var18 < var13; ++var18) { // L: 165 var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); } - Instrument_samples[var14] = var17; - this.filterEnvelope.doStep(var1 + 1); - ++var14; + Instrument_samples[var14] = var17; // L: 166 + this.filterEnvelope.doStep(var1 + 1); // L: 167 + ++var14; // L: 162 } break; } - var12 = this.filter.compute(0, (float)var11 / 65536.0F); - var13 = this.filter.compute(1, (float)var11 / 65536.0F); - var15 += 128; + var12 = this.filter.compute(0, (float)var11 / 65536.0F); // L: 158 + var13 = this.filter.compute(1, (float)var11 / 65536.0F); // L: 159 + var15 += 128; // L: 160 } } } - for (var11 = 0; var11 < var1; ++var11) { - if (Instrument_samples[var11] < -32768) { + for (var11 = 0; var11 < var1; ++var11) { // L: 171 + if (Instrument_samples[var11] < -32768) { // L: 172 Instrument_samples[var11] = -32768; } - if (Instrument_samples[var11] > 32767) { + if (Instrument_samples[var11] > 32767) { // L: 173 Instrument_samples[var11] = 32767; } } - return Instrument_samples; + return Instrument_samples; // L: 175 } } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("evaluateWave") final int evaluateWave(int var1, int var2, int var3) { - if (var3 == 1) { - return (var1 & 32767) < 16384 ? var2 : -var2; - } else if (var3 == 2) { + if (var3 == 1) { // L: 179 + return (var1 & 32767) < 16384 ? var2 : -var2; // L: 180 181 + } else if (var3 == 2) { // L: 183 return Instrument_sine[var1 & 32767] * var2 >> 14; - } else if (var3 == 3) { + } else if (var3 == 3) { // L: 184 return (var2 * (var1 & 32767) >> 14) - var2; } else { - return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; + return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; // L: 185 186 } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;)V" + descriptor = "(Lkf;)V" ) @Export("decode") final void decode(Buffer var1) { - this.pitch = new SoundEnvelope(); - this.pitch.decode(var1); - this.volume = new SoundEnvelope(); - this.volume.decode(var1); - int var2 = var1.readUnsignedByte(); - if (var2 != 0) { - --var1.offset; - this.pitchModifier = new SoundEnvelope(); - this.pitchModifier.decode(var1); - this.pitchModifierAmplitude = new SoundEnvelope(); - this.pitchModifierAmplitude.decode(var1); + this.pitch = new SoundEnvelope(); // L: 190 + this.pitch.decode(var1); // L: 191 + this.volume = new SoundEnvelope(); // L: 192 + this.volume.decode(var1); // L: 193 + int var2 = var1.readUnsignedByte(); // L: 194 + if (var2 != 0) { // L: 195 + --var1.offset; // L: 196 + this.pitchModifier = new SoundEnvelope(); // L: 197 + this.pitchModifier.decode(var1); // L: 198 + this.pitchModifierAmplitude = new SoundEnvelope(); // L: 199 + this.pitchModifierAmplitude.decode(var1); // L: 200 } - var2 = var1.readUnsignedByte(); - if (var2 != 0) { - --var1.offset; - this.volumeMultiplier = new SoundEnvelope(); - this.volumeMultiplier.decode(var1); - this.volumeMultiplierAmplitude = new SoundEnvelope(); - this.volumeMultiplierAmplitude.decode(var1); + var2 = var1.readUnsignedByte(); // L: 202 + if (var2 != 0) { // L: 203 + --var1.offset; // L: 204 + this.volumeMultiplier = new SoundEnvelope(); // L: 205 + this.volumeMultiplier.decode(var1); // L: 206 + this.volumeMultiplierAmplitude = new SoundEnvelope(); // L: 207 + this.volumeMultiplierAmplitude.decode(var1); // L: 208 } - var2 = var1.readUnsignedByte(); - if (var2 != 0) { - --var1.offset; - this.release = new SoundEnvelope(); - this.release.decode(var1); - this.attack = new SoundEnvelope(); - this.attack.decode(var1); + var2 = var1.readUnsignedByte(); // L: 210 + if (var2 != 0) { // L: 211 + --var1.offset; // L: 212 + this.release = new SoundEnvelope(); // L: 213 + this.release.decode(var1); // L: 214 + this.attack = new SoundEnvelope(); // L: 215 + this.attack.decode(var1); // L: 216 } - for (int var3 = 0; var3 < 10; ++var3) { - int var4 = var1.readUShortSmart(); - if (var4 == 0) { + for (int var3 = 0; var3 < 10; ++var3) { // L: 218 + int var4 = var1.readUShortSmart(); // L: 219 + if (var4 == 0) { // L: 220 break; } - this.oscillatorVolume[var3] = var4; - this.oscillatorPitch[var3] = var1.readShortSmart(); - this.oscillatorDelays[var3] = var1.readUShortSmart(); + this.oscillatorVolume[var3] = var4; // L: 221 + this.oscillatorPitch[var3] = var1.readShortSmart(); // L: 222 + this.oscillatorDelays[var3] = var1.readUShortSmart(); // L: 223 } - this.delayTime = var1.readUShortSmart(); - this.delayDecay = var1.readUShortSmart(); - this.duration = var1.readUnsignedShort(); - this.offset = var1.readUnsignedShort(); - this.filter = new AudioFilter(); - this.filterEnvelope = new SoundEnvelope(); - this.filter.method2829(var1, this.filterEnvelope); - } + this.delayTime = var1.readUShortSmart(); // L: 225 + this.delayDecay = var1.readUShortSmart(); // L: 226 + this.duration = var1.readUnsignedShort(); // L: 227 + this.offset = var1.readUnsignedShort(); // L: 228 + this.filter = new AudioFilter(); // L: 229 + this.filterEnvelope = new SoundEnvelope(); // L: 230 + this.filter.method2809(var1, this.filterEnvelope); // L: 231 + } // L: 232 } diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java index 5638ce6808..714ad657f8 100644 --- a/runescape-client/src/main/java/IntHashTable.java +++ b/runescape-client/src/main/java/IntHashTable.java @@ -3,56 +3,62 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mh") +@ObfuscatedName("mc") @Implements("IntHashTable") public class IntHashTable { - @ObfuscatedName("m") + @ObfuscatedName("qy") + @ObfuscatedSignature( + descriptor = "Ldr;" + ) + @Export("pcmPlayer1") + static PcmPlayer pcmPlayer1; + @ObfuscatedName("z") @Export("array") int[] array; public IntHashTable(int[] var1) { int var2; - for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { + for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) { // L: 7 8 } - this.array = new int[var2 + var2]; + this.array = new int[var2 + var2]; // L: 9 int var3; - for (var3 = 0; var3 < var2 + var2; ++var3) { + for (var3 = 0; var3 < var2 + var2; ++var3) { // L: 10 this.array[var3] = -1; } int var4; - for (var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) { - for (var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) { + for (var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) { // L: 11 15 + for (var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) { // L: 12 13 } - this.array[var4 + var4] = var1[var3]; + this.array[var4 + var4] = var1[var3]; // L: 14 } - } + } // L: 17 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "-57" + descriptor = "(II)I", + garbageValue = "1243310529" ) @Export("get") public int get(int var1) { - int var2 = (this.array.length >> 1) - 1; - int var3 = var1 & var2; + int var2 = (this.array.length >> 1) - 1; // L: 20 + int var3 = var1 & var2; // L: 21 while (true) { - int var4 = this.array[var3 + var3 + 1]; - if (var4 == -1) { + int var4 = this.array[var3 + var3 + 1]; // L: 23 + if (var4 == -1) { // L: 24 return -1; } - if (this.array[var3 + var3] == var1) { + if (this.array[var3 + var3] == var1) { // L: 25 return var4; } - var3 = var3 + 1 & var2; + var3 = var3 + 1 & var2; // L: 26 } } } diff --git a/runescape-client/src/main/java/IntegerNode.java b/runescape-client/src/main/java/IntegerNode.java index 5194213a1b..5bd705292e 100644 --- a/runescape-client/src/main/java/IntegerNode.java +++ b/runescape-client/src/main/java/IntegerNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gc") +@ObfuscatedName("gv") @Implements("IntegerNode") public class IntegerNode extends Node { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("integer") public int integer; public IntegerNode(int var1) { - this.integer = var1; - } + this.integer = var1; // L: 7 + } // L: 8 } diff --git a/runescape-client/src/main/java/InterfaceParent.java b/runescape-client/src/main/java/InterfaceParent.java index 551c53b0ec..7745399182 100644 --- a/runescape-client/src/main/java/InterfaceParent.java +++ b/runescape-client/src/main/java/InterfaceParent.java @@ -2,50 +2,26 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bz") +@ObfuscatedName("bq") @Implements("InterfaceParent") public class InterfaceParent extends Node { - @ObfuscatedName("v") - static String[] field590; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -228767789 + intValue = -1616122647 ) @Export("group") int group; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -109575985 + intValue = 1330314565 ) @Export("type") int type; - @ObfuscatedName("q") - boolean field587; + @ObfuscatedName("s") + boolean field580; InterfaceParent() { - this.field587 = false; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(IIIB)Llz;", - garbageValue = "-72" - ) - static Sprite method1233(int var0, int var1, int var2) { - DemotingHashTable var3 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var4 = (long)(var2 << 16 | var0 << 8 | var1); - return (Sprite)var3.get(var4); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lbu;I)V", - garbageValue = "-764301386" - ) - @Export("runScriptEvent") - public static void runScriptEvent(ScriptEvent var0) { - WorldMapLabel.runScript(var0, 500000); - } + this.field580 = false; // L: 8 + } // L: 10 } diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index d4a195dd48..f5313d6c54 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -4,176 +4,72 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ce") +@ObfuscatedName("ci") @Implements("Interpreter") public class Interpreter { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Interpreter_intLocals") static int[] Interpreter_intLocals; - @ObfuscatedName("j") - @Export("Interpreter_stringLocals") - static String[] Interpreter_stringLocals; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("Interpreter_arrayLengths") static int[] Interpreter_arrayLengths; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("Interpreter_arrays") static int[][] Interpreter_arrays; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("Interpreter_intStack") static int[] Interpreter_intStack; - @ObfuscatedName("a") - @Export("Interpreter_stringStack") - static String[] Interpreter_stringStack; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1436904999 + intValue = -1375275397 + ) + @Export("Interpreter_intStackSize") + static int Interpreter_intStackSize; + @ObfuscatedName("g") + @Export("Interpreter_stringStack") + static String[] Interpreter_stringStack; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = -800989913 ) @Export("Interpreter_frameDepth") static int Interpreter_frameDepth; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[Lbp;" + descriptor = "[Lba;" ) @Export("Interpreter_frames") static ScriptFrame[] Interpreter_frames; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("Interpreter_calendar") static java.util.Calendar Interpreter_calendar; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Interpreter_MONTHS") static final String[] Interpreter_MONTHS; + @ObfuscatedName("y") + static boolean field1131; @ObfuscatedName("v") - static boolean field1125; - @ObfuscatedName("d") - static boolean field1118; - @ObfuscatedName("e") + static boolean field1132; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 544842363 + intValue = -387233075 ) - static int field1132; + static int field1135; @ObfuscatedName("b") - static final double field1126; + static final double field1120; static { - Interpreter_arrayLengths = new int[5]; - Interpreter_arrays = new int[5][5000]; - Interpreter_intStack = new int[1000]; - Interpreter_stringStack = new String[1000]; - Interpreter_frameDepth = 0; - Interpreter_frames = new ScriptFrame[50]; - Interpreter_calendar = java.util.Calendar.getInstance(); - Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - field1125 = false; - field1118 = false; - field1132 = 0; - field1126 = Math.log(2.0D); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IILga;Lfz;S)Z", - garbageValue = "-8766" - ) - static final boolean method2112(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class182.directions[var6][var7] = 99; - class182.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class182.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class182.bufferY[var10001] = var1; - int[][] var12 = var3.flags; - - while (var11 != var18) { - var4 = class182.bufferX[var11]; - var5 = class182.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if (var2.hasArrived(1, var4, var5, var3)) { - class182.field2132 = var4; - GrandExchangeOfferOwnWorldComparator.field666 = var5; - return true; - } - - int var15 = class182.distances[var16][var17] + 1; - if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { - class182.bufferX[var18] = var4 - 1; - class182.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class182.directions[var16 - 1][var17] = 2; - class182.distances[var16 - 1][var17] = var15; - } - - if (var16 < 127 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { - class182.bufferX[var18] = var4 + 1; - class182.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class182.directions[var16 + 1][var17] = 8; - class182.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class182.bufferX[var18] = var4; - class182.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class182.directions[var16][var17 - 1] = 1; - class182.distances[var16][var17 - 1] = var15; - } - - if (var17 < 127 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class182.bufferX[var18] = var4; - class182.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class182.directions[var16][var17 + 1] = 4; - class182.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class182.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class182.bufferX[var18] = var4 - 1; - class182.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class182.directions[var16 - 1][var17 - 1] = 3; - class182.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 127 && var17 > 0 && class182.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { - class182.bufferX[var18] = var4 + 1; - class182.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class182.directions[var16 + 1][var17 - 1] = 9; - class182.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 127 && class182.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class182.bufferX[var18] = var4 - 1; - class182.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class182.directions[var16 - 1][var17 + 1] = 6; - class182.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 127 && var17 < 127 && class182.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { - class182.bufferX[var18] = var4 + 1; - class182.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class182.directions[var16 + 1][var17 + 1] = 12; - class182.distances[var16 + 1][var17 + 1] = var15; - } - } - - class182.field2132 = var4; - GrandExchangeOfferOwnWorldComparator.field666 = var5; - return false; + Interpreter_arrayLengths = new int[5]; // L: 68 + Interpreter_arrays = new int[5][5000]; // L: 69 + Interpreter_intStack = new int[1000]; // L: 70 + Interpreter_stringStack = new String[1000]; // L: 72 + Interpreter_frameDepth = 0; // L: 74 + Interpreter_frames = new ScriptFrame[50]; // L: 75 + Interpreter_calendar = java.util.Calendar.getInstance(); // L: 78 + Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; // L: 81 + field1131 = false; // L: 84 + field1132 = false; // L: 85 + field1135 = 0; // L: 86 + field1120 = Math.log(2.0D); // L: 90 } } diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java index 98d5d4e8d6..e8ec0fec53 100644 --- a/runescape-client/src/main/java/InvDefinition.java +++ b/runescape-client/src/main/java/InvDefinition.java @@ -3,269 +3,88 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("il") +@ObfuscatedName("iq") @Implements("InvDefinition") public class InvDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("InvDefinition_archive") - public static AbstractArchive InvDefinition_archive; - @ObfuscatedName("o") + static AbstractArchive InvDefinition_archive; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("InvDefinition_cached") static EvictingDualNodeHashTable InvDefinition_cached; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1649709869 + intValue = 1545647129 ) @Export("size") public int size; static { - InvDefinition_cached = new EvictingDualNodeHashTable(64); + InvDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } InvDefinition() { - this.size = 0; - } + this.size = 0; // L: 12 + } // L: 14 - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "-52" + descriptor = "(Lkf;I)V", + garbageValue = "-1963217868" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 32 + if (var2 == 0) { // L: 33 + return; // L: 36 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 34 } } - @ObfuscatedName("q") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "2103513845" + descriptor = "(Lkf;II)V", + garbageValue = "-1931159207" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 2) { + if (var2 == 2) { // L: 39 this.size = var1.readUnsignedShort(); } - } + } // L: 41 @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1737706956" + descriptor = "(I)Lls;", + garbageValue = "-1532284396" ) - static int method4530(int var0, Script var1, boolean var2) { - int var4 = -1; - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var3 = WorldMapSprite.getWidget(var4); - } else { - var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - } - - if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { - UrlRequester.Interpreter_intStackSize -= 2; - var3.scrollX = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - if (var3.scrollX > var3.scrollWidth - var3.width) { - var3.scrollX = var3.scrollWidth - var3.width; - } - - if (var3.scrollX < 0) { - var3.scrollX = 0; - } - - var3.scrollY = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - if (var3.scrollY > var3.scrollHeight - var3.height) { - var3.scrollY = var3.scrollHeight - var3.height; - } - - if (var3.scrollY < 0) { - var3.scrollY = 0; - } - - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { - var3.color = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { - var3.fill = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { - var3.transparencyTop = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { - var3.lineWid = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { - var3.spriteId2 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { - var3.spriteAngle = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { - var3.spriteTiling = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { - var3.modelType = 1; - var3.modelId = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { - UrlRequester.Interpreter_intStackSize -= 6; - var3.modelOffsetX = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var3.modelOffsetY = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var3.modelAngleX = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - var3.modelAngleY = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; - var3.modelAngleZ = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 4]; - var3.modelZoom = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 5]; - class234.invalidateWidget(var3); - return 1; - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - class234.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { - String var7 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - if (!var7.equals(var3.text)) { - var3.text = var7; - class234.invalidateWidget(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { - UrlRequester.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { - UrlRequester.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - class234.invalidateWidget(var3); - if (var4 != -1 && var3.type == 0) { - WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - WorldMapArea.resumePauseWidget(var3.id, var3.childIndex); - Client.meslayerContinueWidget = var3; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class234.invalidateWidget(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { - var8 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class332 var6 = (class332)FaceNormal.findEnumerated(MusicPatch.FillMode_values(), var8); - if (var6 != null) { - var3.fillMode = var6; - class234.invalidateWidget(var3); - } - - return 1; - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - var3.field2633 = var5; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else { - return 2; - } - } - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "93" - ) - public static void method4523(boolean var0) { - if (var0 != SoundCache.ItemDefinition_inMembersWorld) { - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); - SoundCache.ItemDefinition_inMembersWorld = var0; - } - + public static IndexedSprite method4448() { + IndexedSprite var0 = new IndexedSprite(); // L: 178 + var0.width = class335.SpriteBuffer_spriteWidth; // L: 179 + var0.height = class335.SpriteBuffer_spriteHeight; // L: 180 + var0.xOffset = Username.SpriteBuffer_xOffsets[0]; // L: 181 + var0.yOffset = class335.SpriteBuffer_yOffsets[0]; // L: 182 + var0.subWidth = class335.SpriteBuffer_spriteWidths[0]; // L: 183 + var0.subHeight = class335.SpriteBuffer_spriteHeights[0]; // L: 184 + var0.palette = TaskHandler.SpriteBuffer_spritePalette; // L: 185 + var0.pixels = class92.SpriteBuffer_pixels[0]; // L: 186 + Username.SpriteBuffer_xOffsets = null; // L: 188 + class335.SpriteBuffer_yOffsets = null; // L: 189 + class335.SpriteBuffer_spriteWidths = null; // L: 190 + class335.SpriteBuffer_spriteHeights = null; // L: 191 + TaskHandler.SpriteBuffer_spritePalette = null; // L: 192 + class92.SpriteBuffer_pixels = null; // L: 193 + return var0; // L: 195 } } diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java index bb6eacf031..3fa05cf06e 100644 --- a/runescape-client/src/main/java/IsaacCipher.java +++ b/runescape-client/src/main/java/IsaacCipher.java @@ -4,241 +4,247 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lb") +@ObfuscatedName("lh") @Implements("IsaacCipher") public final class IsaacCipher { - @ObfuscatedName("j") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 10918611 + intValue = -1897659753 + ) + @Export("loginBoxCenter") + static int loginBoxCenter; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2032699001 ) @Export("valuesRemaining") int valuesRemaining; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("results") int[] results; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("mm") int[] mm; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1198902383 + intValue = 438764975 ) @Export("aa") int aa; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 976024717 + intValue = 704852085 ) @Export("bb") int bb; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -2134869821 + intValue = 208618071 ) @Export("cc") int cc; public IsaacCipher(int[] var1) { - this.mm = new int[256]; - this.results = new int[256]; + this.mm = new int[256]; // L: 15 + this.results = new int[256]; // L: 16 - for (int var2 = 0; var2 < var1.length; ++var2) { - this.results[var2] = var1[var2]; + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 17 + this.results[var2] = var1[var2]; // L: 18 } - this.method6476(); - } + this.method6384(); // L: 20 + } // L: 21 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-51" + descriptor = "(I)I", + garbageValue = "940858488" ) @Export("nextInt") public final int nextInt() { - if (this.valuesRemaining == 0) { - this.generateMoreResults(); - this.valuesRemaining = 256; + if (this.valuesRemaining == 0) { // L: 24 + this.generateMoreResults(); // L: 25 + this.valuesRemaining = 256; // L: 26 } - return this.results[--this.valuesRemaining]; + return this.results[--this.valuesRemaining]; // L: 28 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1026117939" + garbageValue = "-1337220040" ) - public final int method6467() { - if (this.valuesRemaining == 0) { - this.generateMoreResults(); - this.valuesRemaining = 256; + public final int method6394() { + if (this.valuesRemaining == 0) { // L: 32 + this.generateMoreResults(); // L: 33 + this.valuesRemaining = 256; // L: 34 } - return this.results[this.valuesRemaining - 1]; + return this.results[this.valuesRemaining - 1]; // L: 36 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2064479197" + garbageValue = "388315820" ) @Export("generateMoreResults") final void generateMoreResults() { - this.bb += ++this.cc; + this.bb += ++this.cc; // L: 43 - for (int var1 = 0; var1 < 256; ++var1) { - int var2 = this.mm[var1]; - if ((var1 & 2) == 0) { - if ((var1 & 1) == 0) { + for (int var1 = 0; var1 < 256; ++var1) { // L: 44 + int var2 = this.mm[var1]; // L: 45 + if ((var1 & 2) == 0) { // L: 46 + if ((var1 & 1) == 0) { // L: 47 this.aa ^= this.aa << 13; } else { - this.aa ^= this.aa >>> 6; + this.aa ^= this.aa >>> 6; // L: 48 } - } else if ((var1 & 1) == 0) { + } else if ((var1 & 1) == 0) { // L: 51 this.aa ^= this.aa << 2; } else { - this.aa ^= this.aa >>> 16; + this.aa ^= this.aa >>> 16; // L: 52 } - this.aa += this.mm[var1 + 128 & 255]; + this.aa += this.mm[128 + var1 & 255]; // L: 54 int var3; - this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; - this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; + this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.aa + this.bb; // L: 55 + this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2; // L: 56 } - } + } // L: 58 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1036873606" + garbageValue = "270001482" ) - final void method6476() { - int var9 = -1640531527; - int var8 = -1640531527; - int var7 = -1640531527; - int var6 = -1640531527; - int var5 = -1640531527; - int var4 = -1640531527; - int var3 = -1640531527; - int var2 = -1640531527; + final void method6384() { + int var9 = -1640531527; // L: 70 + int var8 = -1640531527; // L: 71 + int var7 = -1640531527; // L: 72 + int var6 = -1640531527; // L: 73 + int var5 = -1640531527; // L: 74 + int var4 = -1640531527; // L: 75 + int var3 = -1640531527; // L: 76 + int var2 = -1640531527; // L: 77 int var1; - for (var1 = 0; var1 < 4; ++var1) { - var2 ^= var3 << 11; - var5 += var2; - var3 += var4; - var3 ^= var4 >>> 2; - var6 += var3; - var4 += var5; - var4 ^= var5 << 8; - var7 += var4; - var5 += var6; - var5 ^= var6 >>> 16; - var8 += var5; - var6 += var7; - var6 ^= var7 << 10; - var9 += var6; - var7 += var8; - var7 ^= var8 >>> 4; - var2 += var7; - var8 += var9; - var8 ^= var9 << 8; - var3 += var8; - var9 += var2; - var9 ^= var2 >>> 9; - var4 += var9; - var2 += var3; + for (var1 = 0; var1 < 4; ++var1) { // L: 78 + var2 ^= var3 << 11; // L: 79 + var5 += var2; // L: 80 + var3 += var4; // L: 81 + var3 ^= var4 >>> 2; // L: 82 + var6 += var3; // L: 83 + var4 += var5; // L: 84 + var4 ^= var5 << 8; // L: 85 + var7 += var4; // L: 86 + var5 += var6; // L: 87 + var5 ^= var6 >>> 16; // L: 88 + var8 += var5; // L: 89 + var6 += var7; // L: 90 + var6 ^= var7 << 10; // L: 91 + var9 += var6; // L: 92 + var7 += var8; // L: 93 + var7 ^= var8 >>> 4; // L: 94 + var2 += var7; // L: 95 + var8 += var9; // L: 96 + var8 ^= var9 << 8; // L: 97 + var3 += var8; // L: 98 + var9 += var2; // L: 99 + var9 ^= var2 >>> 9; // L: 100 + var4 += var9; // L: 101 + var2 += var3; // L: 102 } - for (var1 = 0; var1 < 256; var1 += 8) { - var2 += this.results[var1]; - var3 += this.results[var1 + 1]; - var4 += this.results[var1 + 2]; - var5 += this.results[var1 + 3]; - var6 += this.results[var1 + 4]; - var7 += this.results[var1 + 5]; - var8 += this.results[var1 + 6]; - var9 += this.results[var1 + 7]; - var2 ^= var3 << 11; - var5 += var2; - var3 += var4; - var3 ^= var4 >>> 2; - var6 += var3; - var4 += var5; - var4 ^= var5 << 8; - var7 += var4; - var5 += var6; - var5 ^= var6 >>> 16; - var8 += var5; - var6 += var7; - var6 ^= var7 << 10; - var9 += var6; - var7 += var8; - var7 ^= var8 >>> 4; - var2 += var7; - var8 += var9; - var8 ^= var9 << 8; - var3 += var8; - var9 += var2; - var9 ^= var2 >>> 9; - var4 += var9; - var2 += var3; - this.mm[var1] = var2; - this.mm[var1 + 1] = var3; - this.mm[var1 + 2] = var4; - this.mm[var1 + 3] = var5; - this.mm[var1 + 4] = var6; - this.mm[var1 + 5] = var7; - this.mm[var1 + 6] = var8; - this.mm[var1 + 7] = var9; + for (var1 = 0; var1 < 256; var1 += 8) { // L: 104 + var2 += this.results[var1]; // L: 105 + var3 += this.results[var1 + 1]; // L: 106 + var4 += this.results[var1 + 2]; // L: 107 + var5 += this.results[var1 + 3]; // L: 108 + var6 += this.results[var1 + 4]; // L: 109 + var7 += this.results[var1 + 5]; // L: 110 + var8 += this.results[var1 + 6]; // L: 111 + var9 += this.results[var1 + 7]; // L: 112 + var2 ^= var3 << 11; // L: 113 + var5 += var2; // L: 114 + var3 += var4; // L: 115 + var3 ^= var4 >>> 2; // L: 116 + var6 += var3; // L: 117 + var4 += var5; // L: 118 + var4 ^= var5 << 8; // L: 119 + var7 += var4; // L: 120 + var5 += var6; // L: 121 + var5 ^= var6 >>> 16; // L: 122 + var8 += var5; // L: 123 + var6 += var7; // L: 124 + var6 ^= var7 << 10; // L: 125 + var9 += var6; // L: 126 + var7 += var8; // L: 127 + var7 ^= var8 >>> 4; // L: 128 + var2 += var7; // L: 129 + var8 += var9; // L: 130 + var8 ^= var9 << 8; // L: 131 + var3 += var8; // L: 132 + var9 += var2; // L: 133 + var9 ^= var2 >>> 9; // L: 134 + var4 += var9; // L: 135 + var2 += var3; // L: 136 + this.mm[var1] = var2; // L: 137 + this.mm[var1 + 1] = var3; // L: 138 + this.mm[var1 + 2] = var4; // L: 139 + this.mm[var1 + 3] = var5; // L: 140 + this.mm[var1 + 4] = var6; // L: 141 + this.mm[var1 + 5] = var7; // L: 142 + this.mm[var1 + 6] = var8; // L: 143 + this.mm[var1 + 7] = var9; // L: 144 } - for (var1 = 0; var1 < 256; var1 += 8) { - var2 += this.mm[var1]; - var3 += this.mm[var1 + 1]; - var4 += this.mm[var1 + 2]; - var5 += this.mm[var1 + 3]; - var6 += this.mm[var1 + 4]; - var7 += this.mm[var1 + 5]; - var8 += this.mm[var1 + 6]; - var9 += this.mm[var1 + 7]; - var2 ^= var3 << 11; - var5 += var2; - var3 += var4; - var3 ^= var4 >>> 2; - var6 += var3; - var4 += var5; - var4 ^= var5 << 8; - var7 += var4; - var5 += var6; - var5 ^= var6 >>> 16; - var8 += var5; - var6 += var7; - var6 ^= var7 << 10; - var9 += var6; - var7 += var8; - var7 ^= var8 >>> 4; - var2 += var7; - var8 += var9; - var8 ^= var9 << 8; - var3 += var8; - var9 += var2; - var9 ^= var2 >>> 9; - var4 += var9; - var2 += var3; - this.mm[var1] = var2; - this.mm[var1 + 1] = var3; - this.mm[var1 + 2] = var4; - this.mm[var1 + 3] = var5; - this.mm[var1 + 4] = var6; - this.mm[var1 + 5] = var7; - this.mm[var1 + 6] = var8; - this.mm[var1 + 7] = var9; + for (var1 = 0; var1 < 256; var1 += 8) { // L: 146 + var2 += this.mm[var1]; // L: 147 + var3 += this.mm[var1 + 1]; // L: 148 + var4 += this.mm[var1 + 2]; // L: 149 + var5 += this.mm[var1 + 3]; // L: 150 + var6 += this.mm[var1 + 4]; // L: 151 + var7 += this.mm[var1 + 5]; // L: 152 + var8 += this.mm[var1 + 6]; // L: 153 + var9 += this.mm[var1 + 7]; // L: 154 + var2 ^= var3 << 11; // L: 155 + var5 += var2; // L: 156 + var3 += var4; // L: 157 + var3 ^= var4 >>> 2; // L: 158 + var6 += var3; // L: 159 + var4 += var5; // L: 160 + var4 ^= var5 << 8; // L: 161 + var7 += var4; // L: 162 + var5 += var6; // L: 163 + var5 ^= var6 >>> 16; // L: 164 + var8 += var5; // L: 165 + var6 += var7; // L: 166 + var6 ^= var7 << 10; // L: 167 + var9 += var6; // L: 168 + var7 += var8; // L: 169 + var7 ^= var8 >>> 4; // L: 170 + var2 += var7; // L: 171 + var8 += var9; // L: 172 + var8 ^= var9 << 8; // L: 173 + var3 += var8; // L: 174 + var9 += var2; // L: 175 + var9 ^= var2 >>> 9; // L: 176 + var4 += var9; // L: 177 + var2 += var3; // L: 178 + this.mm[var1] = var2; // L: 179 + this.mm[var1 + 1] = var3; // L: 180 + this.mm[var1 + 2] = var4; // L: 181 + this.mm[var1 + 3] = var5; // L: 182 + this.mm[var1 + 4] = var6; // L: 183 + this.mm[var1 + 5] = var7; // L: 184 + this.mm[var1 + 6] = var8; // L: 185 + this.mm[var1 + 7] = var9; // L: 186 } - this.generateMoreResults(); - this.valuesRemaining = 256; - } + this.generateMoreResults(); // L: 188 + this.valuesRemaining = 256; // L: 189 + } // L: 190 } diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 5dddd8eed8..1af1f0b55d 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -4,113 +4,85 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bv") +@ObfuscatedName("bb") @Implements("ItemContainer") public class ItemContainer extends Node { - @ObfuscatedName("m") + @ObfuscatedName("sf") + @ObfuscatedGetter( + longValue = 6214484709053611949L + ) + static long field553; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("itemContainers") static NodeHashTable itemContainers; - @ObfuscatedName("u") + @ObfuscatedName("dk") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Lln;" ) - @Export("rightTitleSprite") - static Sprite rightTitleSprite; - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "Llv;" - ) - static Bounds field567; - @ObfuscatedName("ma") - @ObfuscatedGetter( - intValue = -1890638997 - ) - @Export("selectedSpellWidget") - static int selectedSpellWidget; - @ObfuscatedName("o") + @Export("js5Socket") + static AbstractSocket js5Socket; + @ObfuscatedName("ec") + @Export("worldHost") + static String worldHost; + @ObfuscatedName("k") @Export("ids") int[] ids; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("quantities") int[] quantities; static { - itemContainers = new NodeHashTable(32); + itemContainers = new NodeHashTable(32); // L: 7 } ItemContainer() { - this.ids = new int[]{-1}; - this.quantities = new int[]{0}; + this.ids = new int[]{-1}; // L: 8 + this.quantities = new int[]{0}; // L: 9 + } // L: 11 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)Lgb;", + garbageValue = "1985186614" + ) + static PacketBufferNode method1226() { + return PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0 ? new PacketBufferNode() : PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 22 23 } - @ObfuscatedName("m") + @ObfuscatedName("jh") @ObfuscatedSignature( - descriptor = "(II)Lls;", - garbageValue = "-1724420240" + descriptor = "(B)V", + garbageValue = "-22" ) - public static PrivateChatMode method1232(int var0) { - PrivateChatMode[] var1 = new PrivateChatMode[]{PrivateChatMode.field3818, PrivateChatMode.field3820, PrivateChatMode.field3819}; - PrivateChatMode[] var2 = var1; + static final void method1213() { + PacketBufferNode var0 = Client.getPacketBufferNode(ClientPacket.field2336, Client.packetWriter.isaacCipher); // L: 10474 + Client.packetWriter.addNode(var0); // L: 10475 - for (int var3 = 0; var3 < var2.length; ++var3) { - PrivateChatMode var4 = var2[var3]; - if (var0 == var4.field3817) { - return var4; + for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { // L: 10476 + if (var1.type == 0 || var1.type == 3) { // L: 10477 + class58.closeInterface(var1, true); } } - return null; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "1507611056" - ) - @Export("colorStartTag") - static String colorStartTag(int var0) { - return ""; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Ljr;", - garbageValue = "2131303603" - ) - @Export("getEnum") - public static EnumDefinition getEnum(int var0) { - EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class349.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); - return var1; + if (Client.meslayerContinueWidget != null) { // L: 10479 + class52.invalidateWidget(Client.meslayerContinueWidget); // L: 10480 + Client.meslayerContinueWidget = null; // L: 10481 } - } - @ObfuscatedName("g") + } // L: 10483 + + @ObfuscatedName("kl") @ObfuscatedSignature( - descriptor = "(Lch;Lch;IZIZI)I", - garbageValue = "-1532099004" + descriptor = "(I)V", + garbageValue = "-158946213" ) - static int method1225(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { - int var6 = Actor.compareWorlds(var0, var1, var2, var3); - if (var6 != 0) { - return var3 ? -var6 : var6; - } else if (var4 == -1) { - return 0; - } else { - int var7 = Actor.compareWorlds(var0, var1, var4, var5); - return var5 ? -var7 : var7; + static void method1225() { + if (Client.oculusOrbState == 1) { // L: 10880 + Client.field759 = true; // L: 10881 } - } + + } // L: 10883 } diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index ea312fd26f..0e5084f7b2 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -3,109 +3,116 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jo") +@ObfuscatedName("jq") @Implements("ItemDefinition") public class ItemDefinition extends DualNode { - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("ItemDefinition_modelArchive") static AbstractArchive ItemDefinition_modelArchive; - @ObfuscatedName("a") - @Export("SpriteBuffer_pixels") - static byte[][] SpriteBuffer_pixels; - @ObfuscatedName("z") + @ObfuscatedName("w") + @Export("ItemDefinition_inMembersWorld") + static boolean ItemDefinition_inMembersWorld; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("ItemDefinition_cached") - public static EvictingDualNodeHashTable ItemDefinition_cached; - @ObfuscatedName("w") + static EvictingDualNodeHashTable ItemDefinition_cached; + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("ItemDefinition_cachedModels") - public static EvictingDualNodeHashTable ItemDefinition_cachedModels; - @ObfuscatedName("y") + static EvictingDualNodeHashTable ItemDefinition_cachedModels; + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("ItemDefinition_cachedSprites") public static EvictingDualNodeHashTable ItemDefinition_cachedSprites; - @ObfuscatedName("h") + @ObfuscatedName("fn") + @ObfuscatedSignature( + descriptor = "Lkr;" + ) + @Export("fontPlain12") + static Font fontPlain12; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -387734495 + intValue = -2127308741 ) @Export("id") public int id; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1846336697 + intValue = -1602793113 ) @Export("model") int model; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("name") public String name; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -757926125 + intValue = 1758314265 ) @Export("zoom2d") public int zoom2d; - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 1898813449 + intValue = 1530794933 ) @Export("xan2d") public int xan2d; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1438796167 + intValue = 86096515 ) @Export("yan2d") public int yan2d; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 1360428013 + intValue = 1159522461 ) @Export("zan2d") public int zan2d; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 722443685 + intValue = -1451755111 ) @Export("offsetX2d") public int offsetX2d; - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = -1309918665 + intValue = 685841117 ) @Export("offsetY2d") public int offsetY2d; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 1307428521 + intValue = -85010485 ) @Export("isStackable") public int isStackable; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1345886409 + intValue = 1232545811 ) @Export("price") public int price; @@ -115,789 +122,1264 @@ public class ItemDefinition extends DualNode { @ObfuscatedName("ae") @Export("groundActions") public String[] groundActions; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("inventoryActions") public String[] inventoryActions; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 1852422487 + intValue = 1175273971 ) @Export("shiftClickIndex") int shiftClickIndex; - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = 1683383921 + intValue = 1901023651 ) @Export("maleModel") int maleModel; - @ObfuscatedName("ak") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = 203809743 + intValue = 50964429 ) @Export("maleModel1") int maleModel1; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1331375069 + intValue = 2010056683 ) @Export("maleOffset") int maleOffset; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -1572881273 + intValue = 711077729 ) @Export("femaleModel") int femaleModel; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -2104915687 + intValue = -806873799 ) @Export("femaleModel1") int femaleModel1; - @ObfuscatedName("ap") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -860403817 + intValue = 404192005 ) @Export("femaleOffset") int femaleOffset; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -1286326291 + intValue = -312638611 ) @Export("maleModel2") int maleModel2; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 68314197 + intValue = -440294405 ) @Export("femaleModel2") int femaleModel2; - @ObfuscatedName("ac") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -896933211 + intValue = -2008584399 ) @Export("maleHeadModel") int maleHeadModel; - @ObfuscatedName("av") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -1972414089 + intValue = -2121233033 ) @Export("maleHeadModel2") int maleHeadModel2; - @ObfuscatedName("af") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 614455691 + intValue = 1514421507 ) @Export("femaleHeadModel") int femaleHeadModel; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -92317883 + intValue = -1568432281 ) @Export("femaleHeadModel2") int femaleHeadModel2; - @ObfuscatedName("aa") + @ObfuscatedName("ai") @Export("countobj") int[] countobj; - @ObfuscatedName("aw") + @ObfuscatedName("ay") @Export("countco") int[] countco; - @ObfuscatedName("az") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = -1033402307 + intValue = -1332734959 ) @Export("note") public int note; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -833610513 + intValue = -1348741783 ) @Export("noteTemplate") public int noteTemplate; - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 2144457461 + intValue = 645309775 ) @Export("resizeX") int resizeX; - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 132826193 + intValue = -96685405 ) @Export("resizeY") int resizeY; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 477946841 + intValue = -948017029 ) @Export("resizeZ") int resizeZ; - @ObfuscatedName("bk") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 37898747 + intValue = -1509364621 ) @Export("ambient") public int ambient; - @ObfuscatedName("bh") + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -1234802265 + intValue = 178466347 ) @Export("contrast") public int contrast; - @ObfuscatedName("bg") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = -1542522067 + intValue = 165771595 ) @Export("team") public int team; - @ObfuscatedName("be") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llq;" ) @Export("params") IterableNodeHashTable params; - @ObfuscatedName("bf") + @ObfuscatedName("bh") @Export("isTradable") public boolean isTradable; - @ObfuscatedName("ba") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = -265652873 + intValue = 1906961775 ) @Export("unnotedId") int unnotedId; - @ObfuscatedName("bd") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = -721013975 + intValue = 612376009 ) @Export("notedId") int notedId; - @ObfuscatedName("bb") + @ObfuscatedName("br") @ObfuscatedGetter( - intValue = 101881603 + intValue = -956191485 ) @Export("placeholder") public int placeholder; - @ObfuscatedName("bw") + @ObfuscatedName("bp") @ObfuscatedGetter( - intValue = 1978644905 + intValue = -2061792563 ) @Export("placeholderTemplate") public int placeholderTemplate; static { - ItemDefinition_cached = new EvictingDualNodeHashTable(64); - ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); - ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); + ItemDefinition_cached = new EvictingDualNodeHashTable(64); // L: 28 + ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 29 + ItemDefinition_cachedSprites = new EvictingDualNodeHashTable(200); // L: 30 } ItemDefinition() { - this.name = "null"; - this.zoom2d = 2000; - this.xan2d = 0; - this.yan2d = 0; - this.zan2d = 0; - this.offsetX2d = 0; - this.offsetY2d = 0; - this.isStackable = 0; - this.price = 1; - this.isMembersOnly = false; - this.groundActions = new String[]{null, null, "Take", null, null}; - this.inventoryActions = new String[]{null, null, null, null, "Drop"}; - this.shiftClickIndex = -2; - this.maleModel = -1; - this.maleModel1 = -1; - this.maleOffset = 0; - this.femaleModel = -1; - this.femaleModel1 = -1; - this.femaleOffset = 0; - this.maleModel2 = -1; - this.femaleModel2 = -1; - this.maleHeadModel = -1; - this.maleHeadModel2 = -1; - this.femaleHeadModel = -1; - this.femaleHeadModel2 = -1; - this.note = -1; - this.noteTemplate = -1; - this.resizeX = 128; - this.resizeY = 128; - this.resizeZ = 128; - this.ambient = 0; - this.contrast = 0; - this.team = 0; - this.isTradable = false; - this.unnotedId = -1; - this.notedId = -1; - this.placeholder = -1; - this.placeholderTemplate = -1; - } + this.name = "null"; // L: 34 + this.zoom2d = 2000; // L: 39 + this.xan2d = 0; // L: 40 + this.yan2d = 0; // L: 41 + this.zan2d = 0; // L: 42 + this.offsetX2d = 0; // L: 43 + this.offsetY2d = 0; // L: 44 + this.isStackable = 0; // L: 45 + this.price = 1; // L: 46 + this.isMembersOnly = false; // L: 47 + this.groundActions = new String[]{null, null, "Take", null, null}; // L: 48 + this.inventoryActions = new String[]{null, null, null, null, "Drop"}; // L: 49 + this.shiftClickIndex = -2; // L: 51 + this.maleModel = -1; // L: 52 + this.maleModel1 = -1; // L: 53 + this.maleOffset = 0; // L: 54 + this.femaleModel = -1; // L: 55 + this.femaleModel1 = -1; // L: 56 + this.femaleOffset = 0; // L: 57 + this.maleModel2 = -1; // L: 58 + this.femaleModel2 = -1; // L: 59 + this.maleHeadModel = -1; // L: 60 + this.maleHeadModel2 = -1; // L: 61 + this.femaleHeadModel = -1; // L: 62 + this.femaleHeadModel2 = -1; // L: 63 + this.note = -1; // L: 66 + this.noteTemplate = -1; // L: 67 + this.resizeX = 128; // L: 68 + this.resizeY = 128; // L: 69 + this.resizeZ = 128; // L: 70 + this.ambient = 0; // L: 71 + this.contrast = 0; // L: 72 + this.team = 0; // L: 73 + this.isTradable = false; // L: 75 + this.unnotedId = -1; // L: 76 + this.notedId = -1; // L: 77 + this.placeholder = -1; // L: 78 + this.placeholderTemplate = -1; // L: 79 + } // L: 81 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-196322626" + garbageValue = "1532230322" ) @Export("post") void post() { - } + } // L: 123 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "1671660410" + descriptor = "(Lkf;I)V", + garbageValue = "-1512040719" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 127 + if (var2 == 0) { // L: 128 + return; // L: 131 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 129 } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "2109543922" + descriptor = "(Lkf;II)V", + garbageValue = "-2035131194" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { + if (var2 == 1) { // L: 134 this.model = var1.readUnsignedShort(); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 135 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 136 this.zoom2d = var1.readUnsignedShort(); - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 137 this.xan2d = var1.readUnsignedShort(); - } else if (var2 == 6) { + } else if (var2 == 6) { // L: 138 this.yan2d = var1.readUnsignedShort(); - } else if (var2 == 7) { - this.offsetX2d = var1.readUnsignedShort(); - if (this.offsetX2d > 32767) { + } else if (var2 == 7) { // L: 139 + this.offsetX2d = var1.readUnsignedShort(); // L: 140 + if (this.offsetX2d > 32767) { // L: 141 this.offsetX2d -= 65536; } - } else if (var2 == 8) { - this.offsetY2d = var1.readUnsignedShort(); + } else if (var2 == 8) { // L: 143 + this.offsetY2d = var1.readUnsignedShort(); // L: 144 if (this.offsetY2d > 32767) { - this.offsetY2d -= 65536; + this.offsetY2d -= 65536; // L: 145 } - } else if (var2 == 11) { + } else if (var2 == 11) { // L: 147 this.isStackable = 1; - } else if (var2 == 12) { + } else if (var2 == 12) { // L: 148 this.price = var1.readInt(); - } else if (var2 == 16) { + } else if (var2 == 16) { // L: 149 this.isMembersOnly = true; - } else if (var2 == 23) { - this.maleModel = var1.readUnsignedShort(); - this.maleOffset = var1.readUnsignedByte(); - } else if (var2 == 24) { + } else if (var2 == 23) { // L: 150 + this.maleModel = var1.readUnsignedShort(); // L: 151 + this.maleOffset = var1.readUnsignedByte(); // L: 152 + } else if (var2 == 24) { // L: 154 this.maleModel1 = var1.readUnsignedShort(); - } else if (var2 == 25) { - this.femaleModel = var1.readUnsignedShort(); - this.femaleOffset = var1.readUnsignedByte(); - } else if (var2 == 26) { + } else if (var2 == 25) { // L: 155 + this.femaleModel = var1.readUnsignedShort(); // L: 156 + this.femaleOffset = var1.readUnsignedByte(); // L: 157 + } else if (var2 == 26) { // L: 159 this.femaleModel1 = var1.readUnsignedShort(); - } else if (var2 >= 30 && var2 < 35) { - this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); - if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { + } else if (var2 >= 30 && var2 < 35) { // L: 160 + this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 161 + if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 162 this.groundActions[var2 - 30] = null; } - } else if (var2 >= 35 && var2 < 40) { + } else if (var2 >= 35 && var2 < 40) { // L: 164 this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated(); } else { int var3; int var4; - if (var2 == 40) { - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + if (var2 == 40) { // L: 165 + var3 = var1.readUnsignedByte(); // L: 166 + this.recolorFrom = new short[var3]; // L: 167 + this.recolorTo = new short[var3]; // L: 168 - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 169 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 170 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 171 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 174 + var3 = var1.readUnsignedByte(); // L: 175 + this.retextureFrom = new short[var3]; // L: 176 + this.retextureTo = new short[var3]; // L: 177 - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 178 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 179 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 180 } - } else if (var2 == 42) { - this.shiftClickIndex = var1.readByte(); - } else if (var2 == 65) { + } else if (var2 == 42) { // L: 183 + this.shiftClickIndex = var1.readByte(); // L: 184 + } else if (var2 == 65) { // L: 186 this.isTradable = true; - } else if (var2 == 78) { + } else if (var2 == 78) { // L: 187 this.maleModel2 = var1.readUnsignedShort(); - } else if (var2 == 79) { + } else if (var2 == 79) { // L: 188 this.femaleModel2 = var1.readUnsignedShort(); - } else if (var2 == 90) { + } else if (var2 == 90) { // L: 189 this.maleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 91) { + } else if (var2 == 91) { // L: 190 this.femaleHeadModel = var1.readUnsignedShort(); - } else if (var2 == 92) { + } else if (var2 == 92) { // L: 191 this.maleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 93) { + } else if (var2 == 93) { // L: 192 this.femaleHeadModel2 = var1.readUnsignedShort(); - } else if (var2 == 95) { + } else if (var2 == 95) { // L: 193 this.zan2d = var1.readUnsignedShort(); - } else if (var2 == 97) { + } else if (var2 == 97) { // L: 194 this.note = var1.readUnsignedShort(); - } else if (var2 == 98) { + } else if (var2 == 98) { // L: 195 this.noteTemplate = var1.readUnsignedShort(); - } else if (var2 >= 100 && var2 < 110) { - if (this.countobj == null) { - this.countobj = new int[10]; - this.countco = new int[10]; + } else if (var2 >= 100 && var2 < 110) { // L: 196 + if (this.countobj == null) { // L: 197 + this.countobj = new int[10]; // L: 198 + this.countco = new int[10]; // L: 199 } - this.countobj[var2 - 100] = var1.readUnsignedShort(); - this.countco[var2 - 100] = var1.readUnsignedShort(); - } else if (var2 == 110) { + this.countobj[var2 - 100] = var1.readUnsignedShort(); // L: 201 + this.countco[var2 - 100] = var1.readUnsignedShort(); // L: 202 + } else if (var2 == 110) { // L: 204 this.resizeX = var1.readUnsignedShort(); - } else if (var2 == 111) { + } else if (var2 == 111) { // L: 205 this.resizeY = var1.readUnsignedShort(); - } else if (var2 == 112) { + } else if (var2 == 112) { // L: 206 this.resizeZ = var1.readUnsignedShort(); - } else if (var2 == 113) { + } else if (var2 == 113) { // L: 207 this.ambient = var1.readByte(); - } else if (var2 == 114) { + } else if (var2 == 114) { // L: 208 this.contrast = var1.readByte() * 5; - } else if (var2 == 115) { + } else if (var2 == 115) { // L: 209 this.team = var1.readUnsignedByte(); - } else if (var2 == 139) { + } else if (var2 == 139) { // L: 210 this.unnotedId = var1.readUnsignedShort(); - } else if (var2 == 140) { + } else if (var2 == 140) { // L: 211 this.notedId = var1.readUnsignedShort(); - } else if (var2 == 148) { + } else if (var2 == 148) { // L: 212 this.placeholder = var1.readUnsignedShort(); - } else if (var2 == 149) { + } else if (var2 == 149) { // L: 213 this.placeholderTemplate = var1.readUnsignedShort(); - } else if (var2 == 249) { - this.params = WorldMapElement.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 214 + this.params = PacketWriter.readStringIntParameters(var1, this.params); } } - } + } // L: 216 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljo;Ljo;I)V", - garbageValue = "1175603747" + descriptor = "(Ljq;Ljq;I)V", + garbageValue = "2102368712" ) @Export("genCert") void genCert(ItemDefinition var1, ItemDefinition var2) { - this.model = var1.model; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var1.recolorFrom; - this.recolorTo = var1.recolorTo; - this.retextureFrom = var1.retextureFrom; - this.retextureTo = var1.retextureTo; - this.name = var2.name; - this.isMembersOnly = var2.isMembersOnly; - this.price = var2.price; - this.isStackable = 1; - } + this.model = var1.model; // L: 219 + this.zoom2d = var1.zoom2d; // L: 220 + this.xan2d = var1.xan2d; // L: 221 + this.yan2d = var1.yan2d; // L: 222 + this.zan2d = var1.zan2d; // L: 223 + this.offsetX2d = var1.offsetX2d; // L: 224 + this.offsetY2d = var1.offsetY2d; // L: 225 + this.recolorFrom = var1.recolorFrom; // L: 226 + this.recolorTo = var1.recolorTo; // L: 227 + this.retextureFrom = var1.retextureFrom; // L: 228 + this.retextureTo = var1.retextureTo; // L: 229 + this.name = var2.name; // L: 230 + this.isMembersOnly = var2.isMembersOnly; // L: 231 + this.price = var2.price; // L: 232 + this.isStackable = 1; // L: 233 + } // L: 234 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljo;Ljo;B)V", - garbageValue = "12" + descriptor = "(Ljq;Ljq;I)V", + garbageValue = "1918043668" ) @Export("genBought") void genBought(ItemDefinition var1, ItemDefinition var2) { - this.model = var1.model; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var2.recolorFrom; - this.recolorTo = var2.recolorTo; - this.retextureFrom = var2.retextureFrom; - this.retextureTo = var2.retextureTo; - this.name = var2.name; - this.isMembersOnly = var2.isMembersOnly; - this.isStackable = var2.isStackable; - this.maleModel = var2.maleModel; - this.maleModel1 = var2.maleModel1; - this.maleModel2 = var2.maleModel2; - this.femaleModel = var2.femaleModel; - this.femaleModel1 = var2.femaleModel1; - this.femaleModel2 = var2.femaleModel2; - this.maleHeadModel = var2.maleHeadModel; - this.maleHeadModel2 = var2.maleHeadModel2; - this.femaleHeadModel = var2.femaleHeadModel; - this.femaleHeadModel2 = var2.femaleHeadModel2; - this.team = var2.team; - this.groundActions = var2.groundActions; - this.inventoryActions = new String[5]; - if (var2.inventoryActions != null) { + this.model = var1.model; // L: 237 + this.zoom2d = var1.zoom2d; // L: 238 + this.xan2d = var1.xan2d; // L: 239 + this.yan2d = var1.yan2d; // L: 240 + this.zan2d = var1.zan2d; // L: 241 + this.offsetX2d = var1.offsetX2d; // L: 242 + this.offsetY2d = var1.offsetY2d; // L: 243 + this.recolorFrom = var2.recolorFrom; // L: 244 + this.recolorTo = var2.recolorTo; // L: 245 + this.retextureFrom = var2.retextureFrom; // L: 246 + this.retextureTo = var2.retextureTo; // L: 247 + this.name = var2.name; // L: 248 + this.isMembersOnly = var2.isMembersOnly; // L: 249 + this.isStackable = var2.isStackable; // L: 250 + this.maleModel = var2.maleModel; // L: 251 + this.maleModel1 = var2.maleModel1; // L: 252 + this.maleModel2 = var2.maleModel2; // L: 253 + this.femaleModel = var2.femaleModel; // L: 254 + this.femaleModel1 = var2.femaleModel1; // L: 255 + this.femaleModel2 = var2.femaleModel2; // L: 256 + this.maleHeadModel = var2.maleHeadModel; // L: 257 + this.maleHeadModel2 = var2.maleHeadModel2; // L: 258 + this.femaleHeadModel = var2.femaleHeadModel; // L: 259 + this.femaleHeadModel2 = var2.femaleHeadModel2; // L: 260 + this.team = var2.team; // L: 261 + this.groundActions = var2.groundActions; // L: 262 + this.inventoryActions = new String[5]; // L: 263 + if (var2.inventoryActions != null) { // L: 264 for (int var3 = 0; var3 < 4; ++var3) { this.inventoryActions[var3] = var2.inventoryActions[var3]; } } - this.inventoryActions[4] = "Discard"; - this.price = 0; - } + this.inventoryActions[4] = "Discard"; // L: 265 + this.price = 0; // L: 266 + } // L: 267 - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljo;Ljo;I)V", - garbageValue = "-1279749968" + descriptor = "(Ljq;Ljq;B)V", + garbageValue = "0" ) @Export("genPlaceholder") void genPlaceholder(ItemDefinition var1, ItemDefinition var2) { - this.model = var1.model; - this.zoom2d = var1.zoom2d; - this.xan2d = var1.xan2d; - this.yan2d = var1.yan2d; - this.zan2d = var1.zan2d; - this.offsetX2d = var1.offsetX2d; - this.offsetY2d = var1.offsetY2d; - this.recolorFrom = var1.recolorFrom; - this.recolorTo = var1.recolorTo; - this.retextureFrom = var1.retextureFrom; - this.retextureTo = var1.retextureTo; - this.isStackable = var1.isStackable; - this.name = var2.name; - this.price = 0; - this.isMembersOnly = false; - this.isTradable = false; - } + this.model = var1.model; // L: 270 + this.zoom2d = var1.zoom2d; // L: 271 + this.xan2d = var1.xan2d; // L: 272 + this.yan2d = var1.yan2d; // L: 273 + this.zan2d = var1.zan2d; // L: 274 + this.offsetX2d = var1.offsetX2d; // L: 275 + this.offsetY2d = var1.offsetY2d; // L: 276 + this.recolorFrom = var1.recolorFrom; // L: 277 + this.recolorTo = var1.recolorTo; // L: 278 + this.retextureFrom = var1.retextureFrom; // L: 279 + this.retextureTo = var1.retextureTo; // L: 280 + this.isStackable = var1.isStackable; // L: 281 + this.name = var2.name; // L: 282 + this.price = 0; // L: 283 + this.isMembersOnly = false; // L: 284 + this.isTradable = false; // L: 285 + } // L: 286 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IB)Lek;", - garbageValue = "3" + descriptor = "(II)Lee;", + garbageValue = "361581400" ) @Export("getModelData") public final ModelData getModelData(int var1) { int var3; - if (this.countobj != null && var1 > 1) { - int var2 = -1; + if (this.countobj != null && var1 > 1) { // L: 289 + int var2 = -1; // L: 290 - for (var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + for (var3 = 0; var3 < 10; ++var3) { // L: 291 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 292 var2 = this.countobj[var3]; } } - if (var2 != -1) { - return KitDefinition.ItemDefinition_get(var2).getModelData(1); + if (var2 != -1) { // L: 294 + return GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var2).getModelData(1); } } - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); - if (var4 == null) { + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 296 + if (var4 == null) { // L: 297 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 298 var4.resize(this.resizeX, this.resizeY, this.resizeZ); } - if (this.recolorFrom != null) { - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + if (this.recolorFrom != null) { // L: 299 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 300 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 301 } } - if (this.retextureFrom != null) { - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + if (this.retextureFrom != null) { // L: 304 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 305 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 306 } } - return var4; + return var4; // L: 309 } } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(II)Lef;", - garbageValue = "1775717489" + descriptor = "(II)Ler;", + garbageValue = "1340452049" ) @Export("getModel") public final Model getModel(int var1) { - if (this.countobj != null && var1 > 1) { - int var2 = -1; + if (this.countobj != null && var1 > 1) { // L: 313 + int var2 = -1; // L: 314 - for (int var3 = 0; var3 < 10; ++var3) { - if (var1 >= this.countco[var3] && this.countco[var3] != 0) { + for (int var3 = 0; var3 < 10; ++var3) { // L: 315 + if (var1 >= this.countco[var3] && this.countco[var3] != 0) { // L: 316 var2 = this.countobj[var3]; } } - if (var2 != -1) { - return KitDefinition.ItemDefinition_get(var2).getModel(1); + if (var2 != -1) { // L: 318 + return GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var2).getModel(1); } } - Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); - if (var5 != null) { + Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); // L: 320 + if (var5 != null) { // L: 321 return var5; } else { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); - if (var6 == null) { + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, this.model, 0); // L: 322 + if (var6 == null) { // L: 323 return null; } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { // L: 324 var6.resize(this.resizeX, this.resizeY, this.resizeZ); } int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + if (this.recolorFrom != null) { // L: 325 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 326 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 327 } } - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + if (this.retextureFrom != null) { // L: 330 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 331 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 332 } } - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - var5.isSingleTile = true; - ItemDefinition_cachedModels.put(var5, (long)this.id); - return var5; + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 335 + var5.isSingleTile = true; // L: 336 + ItemDefinition_cachedModels.put(var5, (long)this.id); // L: 337 + return var5; // L: 338 } } } - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(II)Ljo;", - garbageValue = "-539705094" + descriptor = "(II)Ljq;", + garbageValue = "-1034116663" ) @Export("getCountObj") public ItemDefinition getCountObj(int var1) { - if (this.countobj != null && var1 > 1) { - int var2 = -1; + if (this.countobj != null && var1 > 1) { // L: 342 + int var2 = -1; // L: 343 - for (int var3 = 0; var3 < 10; ++var3) { + for (int var3 = 0; var3 < 10; ++var3) { // L: 344 if (var1 >= this.countco[var3] && this.countco[var3] != 0) { - var2 = this.countobj[var3]; + var2 = this.countobj[var3]; // L: 345 } } - if (var2 != -1) { - return KitDefinition.ItemDefinition_get(var2); + if (var2 != -1) { // L: 347 + return GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var2); } } - return this; + return this; // L: 349 } - @ObfuscatedName("c") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ZB)Z", - garbageValue = "118" + descriptor = "(ZI)Z", + garbageValue = "-627527711" ) @Export("hasNoValidModel") public final boolean hasNoValidModel(boolean var1) { - int var2 = this.maleModel; - int var3 = this.maleModel1; - int var4 = this.maleModel2; - if (var1) { - var2 = this.femaleModel; - var3 = this.femaleModel1; - var4 = this.femaleModel2; + int var2 = this.maleModel; // L: 427 + int var3 = this.maleModel1; // L: 428 + int var4 = this.maleModel2; // L: 429 + if (var1) { // L: 430 + var2 = this.femaleModel; // L: 431 + var3 = this.femaleModel1; // L: 432 + var4 = this.femaleModel2; // L: 433 } - if (var2 == -1) { + if (var2 == -1) { // L: 435 return true; } else { - boolean var5 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + boolean var5 = true; // L: 436 + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 437 var5 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 438 var5 = false; } - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { // L: 439 var5 = false; } - return var5; + return var5; // L: 440 } } - @ObfuscatedName("h") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(ZI)Lek;", - garbageValue = "-952045746" + descriptor = "(ZI)Lee;", + garbageValue = "887428237" ) - public final ModelData method4839(boolean var1) { - int var2 = this.maleModel; - int var3 = this.maleModel1; - int var4 = this.maleModel2; - if (var1) { - var2 = this.femaleModel; - var3 = this.femaleModel1; - var4 = this.femaleModel2; + public final ModelData method4760(boolean var1) { + int var2 = this.maleModel; // L: 444 + int var3 = this.maleModel1; // L: 445 + int var4 = this.maleModel2; // L: 446 + if (var1) { // L: 447 + var2 = this.femaleModel; // L: 448 + var3 = this.femaleModel1; // L: 449 + var4 = this.femaleModel2; // L: 450 } - if (var2 == -1) { + if (var2 == -1) { // L: 452 return null; } else { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); - if (var3 != -1) { - ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); - if (var4 != -1) { - ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); - ModelData[] var8 = new ModelData[]{var5, var6, var7}; - var5 = new ModelData(var8, 3); + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 453 + if (var3 != -1) { // L: 454 + ModelData var6 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 455 + if (var4 != -1) { // L: 456 + ModelData var7 = ModelData.ModelData_get(ItemDefinition_modelArchive, var4, 0); // L: 457 + ModelData[] var8 = new ModelData[]{var5, var6, var7}; // L: 458 + var5 = new ModelData(var8, 3); // L: 459 } else { - ModelData[] var10 = new ModelData[]{var5, var6}; - var5 = new ModelData(var10, 2); + ModelData[] var10 = new ModelData[]{var5, var6}; // L: 462 + var5 = new ModelData(var10, 2); // L: 463 } } - if (!var1 && this.maleOffset != 0) { + if (!var1 && this.maleOffset != 0) { // L: 466 var5.changeOffset(0, this.maleOffset, 0); } - if (var1 && this.femaleOffset != 0) { + if (var1 && this.femaleOffset != 0) { // L: 467 var5.changeOffset(0, this.femaleOffset, 0); } int var9; - if (this.recolorFrom != null) { - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); + if (this.recolorFrom != null) { // L: 468 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 469 + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 470 } } - if (this.retextureFrom != null) { - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + if (this.retextureFrom != null) { // L: 473 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 474 + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 475 } } - return var5; + return var5; // L: 478 } } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(ZI)Z", - garbageValue = "-209072389" + garbageValue = "936958354" ) - public final boolean method4840(boolean var1) { - int var2 = this.maleHeadModel; - int var3 = this.maleHeadModel2; - if (var1) { - var2 = this.femaleHeadModel; - var3 = this.femaleHeadModel2; + public final boolean method4805(boolean var1) { + int var2 = this.maleHeadModel; // L: 482 + int var3 = this.maleHeadModel2; // L: 483 + if (var1) { // L: 484 + var2 = this.femaleHeadModel; // L: 485 + var3 = this.femaleHeadModel2; // L: 486 } - if (var2 == -1) { + if (var2 == -1) { // L: 488 return true; } else { - boolean var4 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + boolean var4 = true; // L: 489 + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { // L: 490 var4 = false; } - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { // L: 491 var4 = false; } - return var4; + return var4; // L: 492 + } + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(ZB)Lee;", + garbageValue = "0" + ) + public final ModelData method4762(boolean var1) { + int var2 = this.maleHeadModel; // L: 496 + int var3 = this.maleHeadModel2; // L: 497 + if (var1) { // L: 498 + var2 = this.femaleHeadModel; // L: 499 + var3 = this.femaleHeadModel2; // L: 500 + } + + if (var2 == -1) { // L: 502 + return null; + } else { + ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); // L: 503 + if (var3 != -1) { // L: 504 + ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); // L: 505 + ModelData[] var6 = new ModelData[]{var4, var5}; // L: 506 + var4 = new ModelData(var6, 2); // L: 507 + } + + int var7; + if (this.recolorFrom != null) { // L: 509 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 510 + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 511 + } + } + + if (this.retextureFrom != null) { // L: 514 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 515 + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 516 + } + } + + return var4; // L: 519 } } @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(ZB)Lek;", - garbageValue = "52" - ) - public final ModelData method4841(boolean var1) { - int var2 = this.maleHeadModel; - int var3 = this.maleHeadModel2; - if (var1) { - var2 = this.femaleHeadModel; - var3 = this.femaleHeadModel2; - } - - if (var2 == -1) { - return null; - } else { - ModelData var4 = ModelData.ModelData_get(ItemDefinition_modelArchive, var2, 0); - if (var3 != -1) { - ModelData var5 = ModelData.ModelData_get(ItemDefinition_modelArchive, var3, 0); - ModelData[] var6 = new ModelData[]{var4, var5}; - var4 = new ModelData(var6, 2); - } - - int var7; - if (this.recolorFrom != null) { - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); - } - } - - if (this.retextureFrom != null) { - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); - } - } - - return var4; - } - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "2" + descriptor = "(III)I", + garbageValue = "678325185" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return Language.method3801(this.params, var1, var2); + return Username.method5309(this.params, var1, var2); // L: 523 } - @ObfuscatedName("e") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "2076909967" + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "6" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return FloorUnderlayDefinition.method4612(this.params, var1, var2); + IterableNodeHashTable var4 = this.params; // L: 528 + String var3; + if (var4 == null) { // L: 530 + var3 = var2; // L: 531 + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 534 + if (var5 == null) { // L: 535 + var3 = var2; // L: 536 + } else { + var3 = (String)var5.obj; // L: 539 + } + } + + return var3; // L: 541 } - @ObfuscatedName("l") + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "269605013" + descriptor = "(B)I", + garbageValue = "-17" ) @Export("getShiftClickIndex") public int getShiftClickIndex() { - if (this.shiftClickIndex != -1 && this.inventoryActions != null) { - if (this.shiftClickIndex >= 0) { - return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 1852422487 * -1191034265 : -1; + if (this.shiftClickIndex != -1 && this.inventoryActions != null) { // L: 545 + if (this.shiftClickIndex >= 0) { // L: 546 + return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex * 1175273971 * 2965307 : -1; } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; // L: 547 } } else { return -1; } } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lkr;Lkr;I)V", + garbageValue = "-2013337959" + ) + static void method4823(Font var0, Font var1) { + Archive var3; + int var4; + int var5; + if (MidiPcmStream.worldSelectBackSprites == null) { // L: 1462 + var3 = Huffman.archive8; // L: 1464 + var4 = var3.getGroupId("sl_back"); // L: 1466 + var5 = var3.getFileId(var4, ""); // L: 1467 + Sprite[] var2 = GameBuild.method4214(var3, var4, var5); // L: 1468 + MidiPcmStream.worldSelectBackSprites = var2; // L: 1470 + } + + IndexedSprite[] var25; + if (AbstractWorldMapIcon.worldSelectFlagSprites == null) { // L: 1472 + var3 = Huffman.archive8; // L: 1474 + var4 = var3.getGroupId("sl_flags"); // L: 1476 + var5 = var3.getFileId(var4, ""); // L: 1477 + var25 = UserComparator5.method3515(var3, var4, var5); // L: 1478 + AbstractWorldMapIcon.worldSelectFlagSprites = var25; // L: 1480 + } + + if (MusicPatchNode.worldSelectArrows == null) { // L: 1482 + var3 = Huffman.archive8; // L: 1484 + var4 = var3.getGroupId("sl_arrows"); // L: 1486 + var5 = var3.getFileId(var4, ""); // L: 1487 + var25 = UserComparator5.method3515(var3, var4, var5); // L: 1488 + MusicPatchNode.worldSelectArrows = var25; // L: 1490 + } + + if (Login.worldSelectStars == null) { // L: 1492 + var3 = Huffman.archive8; // L: 1494 + var4 = var3.getGroupId("sl_stars"); // L: 1496 + var5 = var3.getFileId(var4, ""); // L: 1497 + var25 = UserComparator5.method3515(var3, var4, var5); // L: 1498 + Login.worldSelectStars = var25; // L: 1500 + } + + if (WorldMapIcon_0.worldSelectLeftSprite == null) { // L: 1502 + WorldMapIcon_0.worldSelectLeftSprite = class234.SpriteBuffer_getIndexedSpriteByName(Huffman.archive8, "leftarrow", ""); + } + + if (ArchiveDiskActionHandler.worldSelectRightSprite == null) { // L: 1503 + ArchiveDiskActionHandler.worldSelectRightSprite = class234.SpriteBuffer_getIndexedSpriteByName(Huffman.archive8, "rightarrow", ""); + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); // L: 1504 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); // L: 1505 + Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); // L: 1506 + var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); // L: 1507 + if (Login.worldSelectStars != null) { // L: 1508 + Login.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); // L: 1509 + var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); // L: 1510 + Login.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); // L: 1511 + var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); // L: 1512 + } + + if (MusicPatchNode.worldSelectArrows != null) { // L: 1514 + int var22 = Login.xPadding + 280; // L: 1515 + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { // L: 1516 + MusicPatchNode.worldSelectArrows[2].drawAt(var22, 4); + } else { + MusicPatchNode.worldSelectArrows[0].drawAt(var22, 4); // L: 1517 + } + + if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { // L: 1518 + MusicPatchNode.worldSelectArrows[3].drawAt(var22 + 15, 4); + } else { + MusicPatchNode.worldSelectArrows[1].drawAt(var22 + 15, 4); // L: 1519 + } + + var0.draw("World", var22 + 32, 17, 16777215, -1); // L: 1520 + int var23 = Login.xPadding + 390; // L: 1521 + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { // L: 1522 + MusicPatchNode.worldSelectArrows[2].drawAt(var23, 4); + } else { + MusicPatchNode.worldSelectArrows[0].drawAt(var23, 4); // L: 1523 + } + + if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { // L: 1524 + MusicPatchNode.worldSelectArrows[3].drawAt(var23 + 15, 4); + } else { + MusicPatchNode.worldSelectArrows[1].drawAt(var23 + 15, 4); // L: 1525 + } + + var0.draw("Players", var23 + 32, 17, 16777215, -1); // L: 1526 + var4 = Login.xPadding + 500; // L: 1527 + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { // L: 1528 + MusicPatchNode.worldSelectArrows[2].drawAt(var4, 4); + } else { + MusicPatchNode.worldSelectArrows[0].drawAt(var4, 4); // L: 1529 + } + + if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { // L: 1530 + MusicPatchNode.worldSelectArrows[3].drawAt(var4 + 15, 4); + } else { + MusicPatchNode.worldSelectArrows[1].drawAt(var4 + 15, 4); // L: 1531 + } + + var0.draw("Location", var4 + 32, 17, 16777215, -1); // L: 1532 + var5 = Login.xPadding + 610; // L: 1533 + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { // L: 1534 + MusicPatchNode.worldSelectArrows[2].drawAt(var5, 4); + } else { + MusicPatchNode.worldSelectArrows[0].drawAt(var5, 4); // L: 1535 + } + + if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { // L: 1536 + MusicPatchNode.worldSelectArrows[3].drawAt(var5 + 15, 4); + } else { + MusicPatchNode.worldSelectArrows[1].drawAt(var5 + 15, 4); // L: 1537 + } + + var0.draw("Type", var5 + 32, 17, 16777215, -1); // L: 1538 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); // L: 1540 + var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); // L: 1541 + Login.hoveredWorldIndex = -1; // L: 1542 + if (MidiPcmStream.worldSelectBackSprites != null) { // L: 1543 + byte var27 = 88; // L: 1544 + byte var28 = 19; // L: 1545 + var4 = 765 / (var27 + 1) - 1; // L: 1546 + var5 = 480 / (var28 + 1); // L: 1547 + + int var6; + int var7; + do { + var6 = var5; // L: 1549 + var7 = var4; // L: 1550 + if (var5 * (var4 - 1) >= World.World_count) { // L: 1551 + --var4; + } + + if (var4 * (var5 - 1) >= World.World_count) { // L: 1552 + --var5; + } + + if (var4 * (var5 - 1) >= World.World_count) { // L: 1553 + --var5; + } + } while(var5 != var6 || var4 != var7); // L: 1554 + + var6 = (765 - var27 * var4) / (var4 + 1); // L: 1556 + if (var6 > 5) { // L: 1557 + var6 = 5; + } + + var7 = (480 - var28 * var5) / (var5 + 1); // L: 1558 + if (var7 > 5) { // L: 1559 + var7 = 5; + } + + int var8 = (765 - var27 * var4 - var6 * (var4 - 1)) / 2; // L: 1560 + int var9 = (480 - var5 * var28 - var7 * (var5 - 1)) / 2; // L: 1561 + int var10 = (var5 + World.World_count - 1) / var5; // L: 1562 + Login.worldSelectPagesCount = var10 - var4; // L: 1563 + if (WorldMapIcon_0.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { // L: 1564 + WorldMapIcon_0.worldSelectLeftSprite.drawAt(8, GameShell.canvasHeight / 2 - WorldMapIcon_0.worldSelectLeftSprite.subHeight / 2); // L: 1565 + } + + if (ArchiveDiskActionHandler.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { // L: 1567 + ArchiveDiskActionHandler.worldSelectRightSprite.drawAt(FloorDecoration.canvasWidth - ArchiveDiskActionHandler.worldSelectRightSprite.subWidth - 8, GameShell.canvasHeight / 2 - ArchiveDiskActionHandler.worldSelectRightSprite.subHeight / 2); // L: 1568 + } + + int var11 = var9 + 23; // L: 1570 + int var12 = var8 + Login.xPadding; // L: 1571 + int var13 = 0; // L: 1572 + boolean var14 = false; // L: 1573 + int var15 = Login.worldSelectPage; // L: 1574 + + int var16; + for (var16 = var5 * var15; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { // L: 1575 1576 + World var17 = AbstractByteArrayCopier.World_worlds[var16]; // L: 1579 + boolean var18 = true; // L: 1580 + String var19 = Integer.toString(var17.population); // L: 1581 + if (var17.population == -1) { // L: 1582 + var19 = "OFF"; // L: 1583 + var18 = false; // L: 1584 + } else if (var17.population > 1980) { // L: 1586 + var19 = "FULL"; // L: 1587 + var18 = false; // L: 1588 + } + + int var21 = 0; // L: 1591 + byte var20; + if (var17.isBeta()) { // L: 1592 + if (var17.isMembersOnly()) { // L: 1593 + var20 = 7; + } else { + var20 = 6; // L: 1594 + } + } else if (var17.isDeadman()) { // L: 1596 + var21 = 16711680; // L: 1597 + if (var17.isMembersOnly()) { // L: 1598 + var20 = 5; + } else { + var20 = 4; // L: 1599 + } + } else if (var17.method1826()) { // L: 1601 + if (var17.isMembersOnly()) { // L: 1602 + var20 = 9; + } else { + var20 = 8; // L: 1603 + } + } else if (var17.isPvp()) { // L: 1605 + if (var17.isMembersOnly()) { // L: 1606 + var20 = 3; + } else { + var20 = 2; // L: 1607 + } + } else if (var17.isMembersOnly()) { // L: 1610 + var20 = 1; + } else { + var20 = 0; // L: 1611 + } + + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var27 && MouseHandler.MouseHandler_y < var11 + var28 && var18) { // L: 1613 + Login.hoveredWorldIndex = var16; // L: 1614 + MidiPcmStream.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); // L: 1615 + var14 = true; // L: 1616 + } else { + MidiPcmStream.worldSelectBackSprites[var20].drawAt(var12, var11); // L: 1618 + } + + if (AbstractWorldMapIcon.worldSelectFlagSprites != null) { // L: 1619 + AbstractWorldMapIcon.worldSelectFlagSprites[(var17.isMembersOnly() ? 8 : 0) + var17.location].drawAt(var12 + 29, var11); + } + + var0.drawCentered(Integer.toString(var17.id), var12 + 15, var28 / 2 + var11 + 5, var21, -1); // L: 1620 + var1.drawCentered(var19, var12 + 60, var28 / 2 + var11 + 5, 268435455, -1); // L: 1621 + var11 = var11 + var7 + var28; // L: 1622 + ++var13; // L: 1623 + if (var13 >= var5) { + var11 = var9 + 23; // L: 1624 + var12 = var12 + var6 + var27; // L: 1625 + var13 = 0; // L: 1626 + ++var15; // L: 1627 + } + } + + if (var14) { // L: 1630 + var16 = var1.stringWidth(AbstractByteArrayCopier.World_worlds[Login.hoveredWorldIndex].activity) + 6; // L: 1631 + int var24 = var1.ascent + 8; // L: 1632 + int var26 = MouseHandler.MouseHandler_y + 25; // L: 1633 + if (var24 + var26 > 480) { // L: 1634 + var26 = MouseHandler.MouseHandler_y - 25 - var24; // L: 1635 + } + + Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var26, var16, var24, 16777120); // L: 1637 + Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var26, var16, var24, 0); // L: 1638 + var1.drawCentered(AbstractByteArrayCopier.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var26 + var1.ascent + 4, 0, -1); // L: 1639 + } + } + + WorldMapSprite.rasterProvider.drawFull(0, 0); // L: 1642 + } // L: 1643 + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "137776557" + ) + static int method4793(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { // L: 3273 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ScriptFrame.loadWorlds() ? 1 : 0; // L: 3274 + return 1; // L: 3275 + } else { + World var9; + if (var0 == ScriptOpcodes.WORLDLIST_START) { // L: 3277 + var9 = Decimator.worldListStart(); // L: 3278 + if (var9 != null) { // L: 3279 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3280 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3281 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var9.activity; // L: 3282 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3283 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3284 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var9.host; // L: 3285 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3288 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3289 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3290 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3291 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3292 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3293 + } + + return 1; // L: 3295 + } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { // L: 3297 + var9 = WorldMapEvent.getNextWorldListWorld(); // L: 3298 + if (var9 != null) { // L: 3299 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.id; // L: 3300 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.properties; // L: 3301 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var9.activity; // L: 3302 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.location; // L: 3303 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.population; // L: 3304 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var9.host; // L: 3305 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3308 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3309 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3310 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3311 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3312 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3313 + } + + return 1; // L: 3315 + } else { + int var3; + World var7; + int var8; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { // L: 3317 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3318 + var7 = null; // L: 3319 + + for (var8 = 0; var8 < World.World_count; ++var8) { // L: 3320 + if (var3 == AbstractByteArrayCopier.World_worlds[var8].id) { // L: 3321 + var7 = AbstractByteArrayCopier.World_worlds[var8]; // L: 3322 + break; + } + } + + if (var7 != null) { // L: 3326 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3327 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3328 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.activity; // L: 3329 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3330 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3331 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.host; // L: 3332 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3335 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3336 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3337 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3338 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3339 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3340 + } + + return 1; // L: 3342 + } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { // L: 3344 + Interpreter.Interpreter_intStackSize -= 4; // L: 3345 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3346 + boolean var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3347 + var8 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3348 + boolean var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3] == 1; // L: 3349 + TilePaint.sortWorldList(var3, var10, var8, var6); // L: 3350 + return 1; // L: 3351 + } else if (var0 != ScriptOpcodes.GETWORLDINFO) { // L: 3353 + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { // L: 3374 + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3375 + return 1; // L: 3376 + } else { + int var4; + ParamDefinition var5; + if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3378 + Interpreter.Interpreter_intStackSize -= 2; // L: 3379 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3380 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3381 + var5 = PlayerAppearance.getParamDefinition(var4); // L: 3382 + if (var5.isString()) { // L: 3383 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Skeleton.getNpcDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3384 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Skeleton.getNpcDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3387 + } + + return 1; // L: 3389 + } else if (var0 == ScriptOpcodes.LC_PARAM) { // L: 3391 + Interpreter.Interpreter_intStackSize -= 2; // L: 3392 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3393 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3394 + var5 = PlayerAppearance.getParamDefinition(var4); // L: 3395 + if (var5.isString()) { // L: 3396 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = MidiPcmStream.getObjectDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3397 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MidiPcmStream.getObjectDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3400 + } + + return 1; // L: 3402 + } else if (var0 == ScriptOpcodes.OC_PARAM) { // L: 3404 + Interpreter.Interpreter_intStackSize -= 2; // L: 3405 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3406 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3407 + var5 = PlayerAppearance.getParamDefinition(var4); // L: 3408 + if (var5.isString()) { // L: 3409 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3).getStringParam(var4, var5.defaultStr); // L: 3410 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3).getIntParam(var4, var5.defaultInt); // L: 3413 + } + + return 1; // L: 3415 + } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { // L: 3417 + Interpreter.Interpreter_intStackSize -= 2; // L: 3418 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3419 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3420 + var5 = PlayerAppearance.getParamDefinition(var4); // L: 3421 + if (var5.isString()) { // L: 3422 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = NetSocket.StructDefinition_getStructDefinition(var3).getStringParam(var4, var5.defaultStr); // L: 3423 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NetSocket.StructDefinition_getStructDefinition(var3).getIntParam(var4, var5.defaultInt); // L: 3426 + } + + return 1; // L: 3428 + } else if (var0 == ScriptOpcodes.ON_MOBILE) { // L: 3430 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; // L: 3431 + return 1; // L: 3432 + } else if (var0 == ScriptOpcodes.CLIENTTYPE) { // L: 3434 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.clientType & 3; // L: 3435 + return 1; // L: 3436 + } else if (var0 == 6520) { // L: 3438 + return 1; // L: 3439 + } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { // L: 3441 + return 1; // L: 3442 + } else if (var0 == 6522) { // L: 3444 + --Varps.Interpreter_stringStackSize; // L: 3445 + --Interpreter.Interpreter_intStackSize; // L: 3446 + return 1; // L: 3447 + } else if (var0 == 6523) { // L: 3449 + --Varps.Interpreter_stringStackSize; // L: 3450 + --Interpreter.Interpreter_intStackSize; // L: 3451 + return 1; // L: 3452 + } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { // L: 3454 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3455 + return 1; // L: 3456 + } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { // L: 3458 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 3459 + return 1; // L: 3460 + } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { // L: 3462 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; // L: 3463 + return 1; // L: 3464 + } else { + return 2; // L: 3466 + } + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3354 + if (var3 >= 0 && var3 < World.World_count) { // L: 3355 + var7 = AbstractByteArrayCopier.World_worlds[var3]; // L: 3356 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.id; // L: 3357 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.properties; // L: 3358 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.activity; // L: 3359 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.location; // L: 3360 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.population; // L: 3361 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.host; // L: 3362 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3365 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3366 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3367 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3368 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3369 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3370 + } + + return 1; // L: 3372 + } + } + } + } } diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 22949da632..32c6b34837 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -4,132 +4,132 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jq") +@ObfuscatedName("jh") @Implements("IterableDualNodeQueue") public class IterableDualNodeQueue implements Iterable { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgs;" ) @Export("sentinel") public DualNode sentinel; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgs;" ) @Export("head") DualNode head; public IterableDualNodeQueue() { - this.sentinel = new DualNode(); - this.sentinel.previousDual = this.sentinel; - this.sentinel.nextDual = this.sentinel; - } + this.sentinel = new DualNode(); // L: 7 + this.sentinel.previousDual = this.sentinel; // L: 11 + this.sentinel.nextDual = this.sentinel; // L: 12 + } // L: 13 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("clear") public void clear() { - while (this.sentinel.previousDual != this.sentinel) { - this.sentinel.previousDual.removeDual(); + while (this.sentinel.previousDual != this.sentinel) { // L: 16 + this.sentinel.previousDual.removeDual(); // L: 17 } + } // L: 19 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lgs;)V" + ) + @Export("add") + public void add(DualNode var1) { + if (var1.nextDual != null) { // L: 22 + var1.removeDual(); + } + + var1.nextDual = this.sentinel.nextDual; // L: 23 + var1.previousDual = this.sentinel; // L: 24 + var1.nextDual.previousDual = var1; // L: 25 + var1.previousDual.nextDual = var1; // L: 26 + } // L: 27 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "()Lgs;" + ) + @Export("removeLast") + public DualNode removeLast() { + DualNode var1 = this.sentinel.previousDual; // L: 38 + if (var1 == this.sentinel) { + return null; // L: 39 + } else { + var1.removeDual(); // L: 40 + return var1; // L: 41 + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "()Lgs;" + ) + @Export("last") + public DualNode last() { + return this.previousOrLast((DualNode)null); // L: 45 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgf;)V" - ) - @Export("add") - public void add(DualNode var1) { - if (var1.nextDual != null) { - var1.removeDual(); - } - - var1.nextDual = this.sentinel.nextDual; - var1.previousDual = this.sentinel; - var1.nextDual.previousDual = var1; - var1.previousDual.nextDual = var1; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "()Lgf;" - ) - @Export("removeLast") - public DualNode removeLast() { - DualNode var1 = this.sentinel.previousDual; - if (var1 == this.sentinel) { - return null; - } else { - var1.removeDual(); - return var1; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "()Lgf;" - ) - @Export("last") - public DualNode last() { - return this.previousOrLast((DualNode)null); - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Lgf;)Lgf;" + descriptor = "(Lgs;)Lgs;" ) @Export("previousOrLast") DualNode previousOrLast(DualNode var1) { DualNode var2; - if (var1 == null) { + if (var1 == null) { // L: 50 var2 = this.sentinel.previousDual; } else { - var2 = var1; + var2 = var1; // L: 51 } - if (var2 == this.sentinel) { - this.head = null; - return null; + if (var2 == this.sentinel) { // L: 52 + this.head = null; // L: 53 + return null; // L: 54 } else { - this.head = var2.previousDual; - return var2; + this.head = var2.previousDual; // L: 56 + return var2; // L: 57 } } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "()Lgf;" + descriptor = "()Lgs;" ) @Export("previous") public DualNode previous() { - DualNode var1 = this.head; - if (var1 == this.sentinel) { - this.head = null; - return null; + DualNode var1 = this.head; // L: 61 + if (var1 == this.sentinel) { // L: 62 + this.head = null; // L: 63 + return null; // L: 64 } else { - this.head = var1.previousDual; - return var1; + this.head = var1.previousDual; // L: 66 + return var1; // L: 67 } } public Iterator iterator() { - return new IterableDualNodeQueueIterator(this); + return new IterableDualNodeQueueIterator(this); // L: 71 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lgf;Lgf;)V" + descriptor = "(Lgs;Lgs;)V" ) @Export("DualNodeDeque_addBefore") public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) { - if (var0.nextDual != null) { + if (var0.nextDual != null) { // L: 30 var0.removeDual(); } - var0.nextDual = var1; - var0.previousDual = var1.previousDual; - var0.nextDual.previousDual = var0; - var0.previousDual.nextDual = var0; - } + var0.nextDual = var1; // L: 31 + var0.previousDual = var1.previousDual; // L: 32 + var0.nextDual.previousDual = var0; // L: 33 + var0.previousDual.nextDual = var0; // L: 34 + } // L: 35 } diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index db766523d8..1701660ca5 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -4,61 +4,57 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jl") +@ObfuscatedName("je") @Implements("IterableDualNodeQueueIterator") public class IterableDualNodeQueueIterator implements Iterator { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljh;" ) @Export("queue") IterableDualNodeQueue queue; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgs;" ) @Export("head") DualNode head; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgf;" + descriptor = "Lgs;" ) @Export("last") DualNode last; @ObfuscatedSignature( - descriptor = "(Ljq;)V" + descriptor = "(Ljh;)V" ) IterableDualNodeQueueIterator(IterableDualNodeQueue var1) { - this.last = null; - this.queue = var1; - this.head = this.queue.sentinel.previousDual; - this.last = null; + this.last = null; // L: 9 + this.queue = var1; // L: 12 + this.head = this.queue.sentinel.previousDual; // L: 13 + this.last = null; // L: 14 + } // L: 15 + + public void remove() { + this.last.removeDual(); // L: 34 + this.last = null; // L: 35 + } // L: 36 + + public Object next() { + DualNode var1 = this.head; // L: 18 + if (var1 == this.queue.sentinel) { // L: 19 + var1 = null; // L: 20 + this.head = null; // L: 21 + } else { + this.head = var1.previousDual; // L: 23 + } + + this.last = var1; // L: 24 + return var1; // L: 25 } public boolean hasNext() { - return this.queue.sentinel != this.head; - } - - public void remove() { - if (this.last == null) { - throw new IllegalStateException(); - } else { - this.last.removeDual(); - this.last = null; - } - } - - public Object next() { - DualNode var1 = this.head; - if (var1 == this.queue.sentinel) { - var1 = null; - this.head = null; - } else { - this.head = var1.previousDual; - } - - this.last = var1; - return var1; + return this.queue.sentinel != this.head; // L: 29 } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index fd94b6306d..e51271c71c 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -5,233 +5,233 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jx") +@ObfuscatedName("jv") @Implements("IterableNodeDeque") public class IterableNodeDeque implements Iterable, Collection { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("sentinel") Node sentinel; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) - Node field3565; + Node field3554; public IterableNodeDeque() { - this.sentinel = new Node(); - this.sentinel.previous = this.sentinel; - this.sentinel.next = this.sentinel; - } + this.sentinel = new Node(); // L: 7 + this.sentinel.previous = this.sentinel; // L: 11 + this.sentinel.next = this.sentinel; // L: 12 + } // L: 13 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("rsClear") public void rsClear() { - while (this.sentinel.previous != this.sentinel) { - this.sentinel.previous.remove(); + while (this.sentinel.previous != this.sentinel) { // L: 16 + this.sentinel.previous.remove(); // L: 17 } - } + } // L: 19 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lgr;)V" + descriptor = "(Lgw;)V" ) @Export("addFirst") public void addFirst(Node var1) { - if (var1.next != null) { + if (var1.next != null) { // L: 22 var1.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; - } + var1.next = this.sentinel.next; // L: 23 + var1.previous = this.sentinel; // L: 24 + var1.next.previous = var1; // L: 25 + var1.previous.next = var1; // L: 26 + } // L: 27 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lgr;)V" + descriptor = "(Lgw;)V" ) @Export("addLast") public void addLast(Node var1) { - if (var1.next != null) { + if (var1.next != null) { // L: 30 var1.remove(); } - var1.next = this.sentinel; - var1.previous = this.sentinel.previous; - var1.next.previous = var1; - var1.previous.next = var1; - } + var1.next = this.sentinel; // L: 31 + var1.previous = this.sentinel.previous; // L: 32 + var1.next.previous = var1; // L: 33 + var1.previous.next = var1; // L: 34 + } // L: 35 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "()Lgw;" ) @Export("last") public Node last() { - return this.method5064((Node)null); + return this.method4946((Node)null); // L: 46 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lgw;)Lgw;" + ) + Node method4946(Node var1) { + Node var2; + if (var1 == null) { // L: 51 + var2 = this.sentinel.previous; + } else { + var2 = var1; // L: 52 + } + + if (var2 == this.sentinel) { // L: 53 + this.field3554 = null; // L: 54 + return null; // L: 55 + } else { + this.field3554 = var2.previous; // L: 57 + return var2; // L: 58 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "()Lgw;" + ) + @Export("previous") + public Node previous() { + Node var1 = this.field3554; // L: 62 + if (var1 == this.sentinel) { // L: 63 + this.field3554 = null; // L: 64 + return null; // L: 65 + } else { + this.field3554 = var1.previous; // L: 67 + return var1; // L: 68 + } + } + + @ObfuscatedName("w") + int method4944() { + int var1 = 0; // L: 72 + + for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { // L: 73 74 76 + ++var1; // L: 75 + } + + return var1; // L: 78 } @ObfuscatedName("g") + public boolean method4945() { + return this.sentinel.previous == this.sentinel; // L: 82 + } + + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Lgr;)Lgr;" + descriptor = "()[Lgw;" ) - Node method5064(Node var1) { - Node var2; - if (var1 == null) { - var2 = this.sentinel.previous; - } else { - var2 = var1; + Node[] method4996() { + Node[] var1 = new Node[this.method4944()]; // L: 86 + int var2 = 0; // L: 87 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 88 89 91 + var1[var2++] = var3; // L: 90 } - if (var2 == this.sentinel) { - this.field3565 = null; - return null; - } else { - this.field3565 = var2.previous; - return var2; - } + return var1; // L: 93 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "(Lgw;)Z" ) - @Export("previous") - public Node previous() { - Node var1 = this.field3565; - if (var1 == this.sentinel) { - this.field3565 = null; - return null; - } else { - this.field3565 = var1.previous; - return var1; - } - } - - @ObfuscatedName("u") - int method5008() { - int var1 = 0; - - for (Node var2 = this.sentinel.previous; var2 != this.sentinel; var2 = var2.previous) { - ++var1; - } - - return var1; - } - - @ObfuscatedName("a") - public boolean method5014() { - return this.sentinel.previous == this.sentinel; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "()[Lgr;" - ) - Node[] method5010() { - Node[] var1 = new Node[this.method5008()]; - int var2 = 0; - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { - var1[var2++] = var3; - } - - return var1; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(Lgr;)Z" - ) - boolean method5012(Node var1) { - this.addFirst(var1); - return true; - } - - public Iterator iterator() { - return new IterableNodeDequeDescendingIterator(this); - } - - public int size() { - return this.method5008(); - } - - public boolean isEmpty() { - return this.method5014(); - } - - public boolean contains(Object var1) { - throw new RuntimeException(); - } - - public Object[] toArray(Object[] var1) { - int var2 = 0; - - for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { - var1[var2++] = var3; - } - - return var1; - } - - public boolean remove(Object var1) { - throw new RuntimeException(); + boolean method4951(Node var1) { + this.addFirst(var1); // L: 127 + return true; // L: 128 } public boolean addAll(Collection var1) { - throw new RuntimeException(); + throw new RuntimeException(); // L: 140 } - public boolean removeAll(Collection var1) { - throw new RuntimeException(); + public int size() { + return this.method4944(); // L: 101 } - public boolean retainAll(Collection var1) { - throw new RuntimeException(); - } - - public boolean add(Object var1) { - return this.method5012((Node)var1); - } - - public int hashCode() { - return super.hashCode(); + public boolean contains(Object var1) { + throw new RuntimeException(); // L: 109 } public boolean containsAll(Collection var1) { - throw new RuntimeException(); + throw new RuntimeException(); // L: 136 + } + + public boolean removeAll(Collection var1) { + throw new RuntimeException(); // L: 144 + } + + public boolean retainAll(Collection var1) { + throw new RuntimeException(); // L: 148 } public void clear() { - this.rsClear(); + this.rsClear(); // L: 152 + } // L: 153 + + public boolean equals(Object var1) { + return super.equals(var1); // L: 160 + } + + public int hashCode() { + return super.hashCode(); // L: 164 + } + + public boolean isEmpty() { + return this.method4945(); // L: 105 + } + + public boolean remove(Object var1) { + throw new RuntimeException(); // L: 132 + } + + public Iterator iterator() { + return new IterableNodeDequeDescendingIterator(this); // L: 97 + } + + public boolean add(Object var1) { + return this.method4951((Node)var1); // L: 156 } public Object[] toArray() { - return this.method5010(); + return this.method4996(); // L: 113 } - public boolean equals(Object var1) { - return super.equals(var1); + public Object[] toArray(Object[] var1) { + int var2 = 0; // L: 117 + + for (Node var3 = this.sentinel.previous; var3 != this.sentinel; var3 = var3.previous) { // L: 118 119 121 + var1[var2++] = var3; // L: 120 + } + + return var1; // L: 123 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lgr;Lgr;)V" + descriptor = "(Lgw;Lgw;)V" ) @Export("IterableNodeDeque_addBefore") public static void IterableNodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { + if (var0.next != null) { // L: 38 var0.remove(); } - var0.next = var1; - var0.previous = var1.previous; - var0.next.previous = var0; - var0.previous.next = var0; - } + var0.next = var1; // L: 39 + var0.previous = var1.previous; // L: 40 + var0.next.previous = var0; // L: 41 + var0.previous.next = var0; // L: 42 + } // L: 43 } diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index b9389e96e9..7dd525b14c 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -4,71 +4,75 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ju") +@ObfuscatedName("jo") @Implements("IterableNodeDequeDescendingIterator") public class IterableNodeDequeDescendingIterator implements Iterator { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Ljv;" ) @Export("deque") IterableNodeDeque deque; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) - Node field3573; - @ObfuscatedName("q") + Node field3562; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Ljx;)V" + descriptor = "(Ljv;)V" ) IterableNodeDequeDescendingIterator(IterableNodeDeque var1) { - this.last = null; - this.setDeque(var1); - } + this.last = null; // L: 9 + this.setDeque(var1); // L: 12 + } // L: 13 - @ObfuscatedName("g") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljx;)V" + descriptor = "(Ljv;)V" ) @Export("setDeque") void setDeque(IterableNodeDeque var1) { - this.deque = var1; - this.start(); - } + this.deque = var1; // L: 16 + this.start(); // L: 17 + } // L: 18 - @ObfuscatedName("n") + @ObfuscatedName("w") @Export("start") void start() { - this.field3573 = this.deque != null ? this.deque.sentinel.previous : null; - this.last = null; + this.field3562 = this.deque != null ? this.deque.sentinel.previous : null; // L: 21 + this.last = null; // L: 22 + } // L: 23 + + public Object next() { + Node var1 = this.field3562; // L: 26 + if (var1 == this.deque.sentinel) { // L: 27 + var1 = null; // L: 28 + this.field3562 = null; // L: 29 + } else { + this.field3562 = var1.previous; // L: 31 + } + + this.last = var1; // L: 32 + return var1; // L: 33 } public boolean hasNext() { - return this.deque.sentinel != this.field3573; - } - - public Object next() { - Node var1 = this.field3573; - if (var1 == this.deque.sentinel) { - var1 = null; - this.field3573 = null; - } else { - this.field3573 = var1.previous; - } - - this.last = var1; - return var1; + return this.deque.sentinel != this.field3562; // L: 37 } public void remove() { - this.last.remove(); - this.last = null; - } + if (this.last == null) { // L: 41 + throw new IllegalStateException(); + } else { + this.last.remove(); // L: 42 + this.last = null; // L: 43 + } + } // L: 44 } diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index ea59fbb89e..9be41dfe7b 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -4,141 +4,141 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lf") +@ObfuscatedName("lq") @Implements("IterableNodeHashTable") public final class IterableNodeHashTable implements Iterable { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("size") int size; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lgr;" + descriptor = "[Lgw;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("current") Node current; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("index") int index; public IterableNodeHashTable(int var1) { - this.index = 0; - this.size = var1; - this.buckets = new Node[var1]; + this.index = 0; // L: 11 + this.size = var1; // L: 14 + this.buckets = new Node[var1]; // L: 15 - for (int var2 = 0; var2 < var1; ++var2) { - Node var3 = this.buckets[var2] = new Node(); - var3.previous = var3; - var3.next = var3; + for (int var2 = 0; var2 < var1; ++var2) { // L: 16 + Node var3 = this.buckets[var2] = new Node(); // L: 17 + var3.previous = var3; // L: 18 + var3.next = var3; // L: 19 } - } + } // L: 21 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(J)Lgr;" + descriptor = "(J)Lgw;" ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 24 - for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { - if (this.currentGet.key == var1) { - Node var4 = this.currentGet; - this.currentGet = this.currentGet.previous; - return var4; + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 25 26 32 + if (this.currentGet.key == var1) { // L: 27 + Node var4 = this.currentGet; // L: 28 + this.currentGet = this.currentGet.previous; // L: 29 + return var4; // L: 30 } } - this.currentGet = null; - return null; + this.currentGet = null; // L: 34 + return null; // L: 35 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lgr;J)V" + descriptor = "(Lgw;J)V" ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { + if (var1.next != null) { // L: 39 var1.remove(); } - Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; - var1.next = var4.next; - var1.previous = var4; - var1.next.previous = var1; - var1.previous.next = var1; - var1.key = var2; - } + Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 40 + var1.next = var4.next; // L: 41 + var1.previous = var4; // L: 42 + var1.next.previous = var1; // L: 43 + var1.previous.next = var1; // L: 44 + var1.key = var2; // L: 45 + } // L: 46 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("clear") public void clear() { - for (int var1 = 0; var1 < this.size; ++var1) { - Node var2 = this.buckets[var1]; + for (int var1 = 0; var1 < this.size; ++var1) { // L: 49 + Node var2 = this.buckets[var1]; // L: 50 while (true) { - Node var3 = var2.previous; - if (var3 == var2) { + Node var3 = var2.previous; // L: 52 + if (var3 == var2) { // L: 53 break; } - var3.remove(); + var3.remove(); // L: 54 } } - this.currentGet = null; - this.current = null; - } + this.currentGet = null; // L: 57 + this.current = null; // L: 58 + } // L: 59 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "()Lgw;" ) @Export("first") public Node first() { - this.index = 0; - return this.next(); + this.index = 0; // L: 62 + return this.next(); // L: 63 } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "()Lgw;" ) @Export("next") public Node next() { Node var1; - if (this.index > 0 && this.buckets[this.index - 1] != this.current) { - var1 = this.current; - this.current = var1.previous; - return var1; + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 67 + var1 = this.current; // L: 68 + this.current = var1.previous; // L: 69 + return var1; // L: 70 } else { do { - if (this.index >= this.size) { - return null; + if (this.index >= this.size) { // L: 72 + return null; // L: 79 } - var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); + var1 = this.buckets[this.index++].previous; // L: 73 + } while(var1 == this.buckets[this.index - 1]); // L: 74 - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 75 + return var1; // L: 76 } } public Iterator iterator() { - return new IterableNodeHashTableIterator(this); + return new IterableNodeHashTableIterator(this); // L: 83 } } diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 86071aefe5..cd25ea1697 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -4,93 +4,93 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ln") +@ObfuscatedName("lo") @Implements("IterableNodeHashTableIterator") public class IterableNodeHashTableIterator implements Iterator { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llq;" ) @Export("hashTable") IterableNodeHashTable hashTable; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("head") Node head; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("index") int index; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("last") Node last; @ObfuscatedSignature( - descriptor = "(Llf;)V" + descriptor = "(Llq;)V" ) IterableNodeHashTableIterator(IterableNodeHashTable var1) { - this.last = null; - this.hashTable = var1; - this.start(); - } + this.last = null; // L: 10 + this.hashTable = var1; // L: 13 + this.start(); // L: 14 + } // L: 15 - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("start") void start() { - this.head = this.hashTable.buckets[0].previous; - this.index = 1; - this.last = null; - } + this.head = this.hashTable.buckets[0].previous; // L: 18 + this.index = 1; // L: 19 + this.last = null; // L: 20 + } // L: 21 public boolean hasNext() { - if (this.hashTable.buckets[this.index - 1] != this.head) { + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 42 return true; } else { - while (this.index < this.hashTable.size) { - if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { - this.head = this.hashTable.buckets[this.index - 1].previous; - return true; + while (this.index < this.hashTable.size) { // L: 43 + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { // L: 44 + this.head = this.hashTable.buckets[this.index - 1].previous; // L: 45 + return true; // L: 46 } - this.head = this.hashTable.buckets[this.index - 1]; + this.head = this.hashTable.buckets[this.index - 1]; // L: 49 } - return false; + return false; // L: 52 } } public void remove() { - if (this.last == null) { + if (this.last == null) { // L: 56 throw new IllegalStateException(); } else { - this.last.remove(); - this.last = null; + this.last.remove(); // L: 57 + this.last = null; // L: 58 } - } + } // L: 59 public Object next() { Node var1; - if (this.hashTable.buckets[this.index - 1] != this.head) { - var1 = this.head; - this.head = var1.previous; - this.last = var1; - return var1; + if (this.hashTable.buckets[this.index - 1] != this.head) { // L: 24 + var1 = this.head; // L: 25 + this.head = var1.previous; // L: 26 + this.last = var1; // L: 27 + return var1; // L: 28 } else { do { - if (this.index >= this.hashTable.size) { - return null; + if (this.index >= this.hashTable.size) { // L: 30 + return null; // L: 38 } - var1 = this.hashTable.buckets[this.index++].previous; - } while(var1 == this.hashTable.buckets[this.index - 1]); + var1 = this.hashTable.buckets[this.index++].previous; // L: 31 + } while(var1 == this.hashTable.buckets[this.index - 1]); // L: 32 - this.head = var1.previous; - this.last = var1; - return var1; + this.head = var1.previous; // L: 33 + this.last = var1; // L: 34 + return var1; // L: 35 } } } diff --git a/runescape-client/src/main/java/JagexCache.java b/runescape-client/src/main/java/JagexCache.java index e9d22d0719..869993e3b9 100644 --- a/runescape-client/src/main/java/JagexCache.java +++ b/runescape-client/src/main/java/JagexCache.java @@ -4,120 +4,264 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fj") +@ObfuscatedName("fn") @Implements("JagexCache") public class JagexCache { - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("JagexCache_locationFile") static File JagexCache_locationFile; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("cacheDir") static File cacheDir; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmz;" ) @Export("JagexCache_randomDat") public static BufferedFile JagexCache_randomDat; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmz;" ) @Export("JagexCache_dat2File") public static BufferedFile JagexCache_dat2File; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lmn;" + descriptor = "Lmz;" ) @Export("JagexCache_idx255File") public static BufferedFile JagexCache_idx255File; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Lmn;" + descriptor = "[Lmz;" ) @Export("JagexCache_idxFiles") public static BufferedFile[] JagexCache_idxFiles; - @ObfuscatedName("l") - public static String field2077; + @ObfuscatedName("r") + public static String field2094; static { - JagexCache_randomDat = null; - JagexCache_dat2File = null; - JagexCache_idx255File = null; + JagexCache_randomDat = null; // L: 22 + JagexCache_dat2File = null; // L: 23 + JagexCache_idx255File = null; // L: 24 } - @ObfuscatedName("fn") + @ObfuscatedName("iz") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "201331676" + descriptor = "(IIIII)V", + garbageValue = "1010534169" ) - static final void method3625() { - if (Client.field937 != TileItemPile.Client_plane) { - Client.field937 = TileItemPile.Client_plane; - int var0 = TileItemPile.Client_plane; - int[] var1 = class3.sceneMinimapSprite.pixels; - int var2 = var1.length; + @Export("addSceneMenuOptions") + static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { + if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 8289 + StructDefinition.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 8290 + } - int var3; - for (var3 = 0; var3 < var2; ++var3) { - var1[var3] = 0; - } + long var4 = -1L; // L: 8293 + long var6 = -1L; // L: 8294 + int var8 = 0; - int var4; - int var5; - for (var3 = 1; var3 < 103; ++var3) { - var4 = (103 - var3) * 2048 + 24628; - - for (var5 = 1; var5 < 103; ++var5) { - if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) { - UserComparator3.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3); - } - - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) { - UserComparator3.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3); - } - - var4 += 4; + while (true) { + int var10 = ViewportMouse.ViewportMouse_entityCount; // L: 8299 + if (var8 >= var10) { // L: 8301 + if (var4 != -1L) { // L: 8444 + var8 = TileItem.Entity_unpackSceneX(var4); // L: 8445 + int var9 = (int)(var4 >>> 7 & 127L); // L: 8448 + Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 8451 + VarpDefinition.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 8452 } + + return; // L: 8454 } - var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10); - var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16; - class3.sceneMinimapSprite.setRaster(); + long var27 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 8304 + if (var6 != var27) { // L: 8307 + label326: { + var6 = var27; // L: 8308 + int var15 = WorldMapIcon_1.getSceneXForObjectUnderMouse(var8); // L: 8309 + long var18 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 8313 + int var17 = (int)(var18 >>> 7 & 127L); // L: 8315 + var17 = var17; // L: 8319 + long var20 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 8323 + int var19 = (int)(var20 >>> 14 & 3L); // L: 8325 + int var30 = Frames.getEntityIdUnderMouse(var8); // L: 8330 + if (var19 == 2 && ScriptEvent.scene.getObjectFlags(Huffman.Client_plane, var15, var17, var27) >= 0) { // L: 8331 8332 + ObjectDefinition var21 = MidiPcmStream.getObjectDefinition(var30); // L: 8333 + if (var21.transforms != null) { // L: 8334 + var21 = var21.transform(); + } - int var6; - for (var5 = 1; var5 < 103; ++var5) { - for (var6 = 1; var6 < 103; ++var6) { - if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) { - class307.drawObject(var0, var6, var5, var3, var4); + if (var21 == null) { // L: 8335 + break label326; + } + + if (Client.isItemSelected == 1) { // L: 8336 + StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(65535) + var21.name, 1, var30, var15, var17); // L: 8337 + } else if (Client.isSpellSelected) { // L: 8340 + if ((UserComparator8.selectedSpellFlags & 4) == 4) { // L: 8341 + StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(65535) + var21.name, 2, var30, var15, var17); // L: 8342 + } + } else { + String[] var22 = var21.actions; // L: 8347 + if (var22 != null) { // L: 8348 + for (int var23 = 4; var23 >= 0; --var23) { // L: 8349 + if (var22[var23] != null) { // L: 8350 + short var24 = 0; // L: 8351 + if (var23 == 0) { // L: 8352 + var24 = 3; + } + + if (var23 == 1) { // L: 8353 + var24 = 4; + } + + if (var23 == 2) { // L: 8354 + var24 = 5; + } + + if (var23 == 3) { // L: 8355 + var24 = 6; + } + + if (var23 == 4) { // L: 8356 + var24 = 1001; + } + + StructDefinition.insertMenuItemNoShift(var22[var23], WorldMapAreaData.colorStartTag(65535) + var21.name, var24, var30, var15, var17); // L: 8357 + } + } + } + + StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(65535) + var21.name, 1002, var21.id, var15, var17); // L: 8362 + } } - if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) { - class307.drawObject(var0 + 1, var6, var5, var3, var4); + Player var25; + int var31; + NPC var32; + int var39; + int[] var40; + if (var19 == 1) { // L: 8367 + NPC var35 = Client.npcs[var30]; // L: 8368 + if (var35 == null) { // L: 8369 + break label326; + } + + if (var35.definition.size == 1 && (var35.x & 127) == 64 && (var35.y & 127) == 64) { // L: 8370 + for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 8371 + var32 = Client.npcs[Client.npcIndices[var31]]; // L: 8372 + if (var32 != null && var35 != var32 && var32.definition.size == 1 && var35.x == var32.x && var35.y == var32.y) { // L: 8373 + GrandExchangeEvents.addNpcToMenu(var32.definition, Client.npcIndices[var31], var15, var17); + } + } + + var31 = Players.Players_count; // L: 8375 + var40 = Players.Players_indices; // L: 8376 + + for (var39 = 0; var39 < var31; ++var39) { // L: 8377 + var25 = Client.players[var40[var39]]; // L: 8378 + if (var25 != null && var35.x == var25.x && var25.y == var35.y) { // L: 8379 + VarpDefinition.addPlayerToMenu(var25, var40[var39], var15, var17); + } + } + } + + GrandExchangeEvents.addNpcToMenu(var35.definition, var30, var15, var17); // L: 8382 } - } - } - Client.mapIconCount = 0; + if (var19 == 0) { // L: 8384 + Player var36 = Client.players[var30]; // L: 8385 + if (var36 == null) { // L: 8386 + break label326; + } - for (var5 = 0; var5 < 104; ++var5) { - for (var6 = 0; var6 < 104; ++var6) { - long var7 = UserComparator3.scene.getFloorDecorationTag(TileItemPile.Client_plane, var5, var6); - if (0L != var7) { - int var9 = Language.Entity_unpackID(var7); - int var10 = Canvas.getObjectDefinition(var9).mapIconId; - if (var10 >= 0) { - Client.mapIcons[Client.mapIconCount] = Client.WorldMapElement_get(var10).getSpriteBool(false); - Client.mapIconXs[Client.mapIconCount] = var5; - Client.mapIconYs[Client.mapIconCount] = var6; - ++Client.mapIconCount; + if ((var36.x & 127) == 64 && (var36.y & 127) == 64) { // L: 8387 + for (var31 = 0; var31 < Client.npcCount; ++var31) { // L: 8388 + var32 = Client.npcs[Client.npcIndices[var31]]; // L: 8389 + if (var32 != null && var32.definition.size == 1 && var32.x == var36.x && var36.y == var32.y) { // L: 8390 + GrandExchangeEvents.addNpcToMenu(var32.definition, Client.npcIndices[var31], var15, var17); + } + } + + var31 = Players.Players_count; // L: 8392 + var40 = Players.Players_indices; // L: 8393 + + for (var39 = 0; var39 < var31; ++var39) { // L: 8394 + var25 = Client.players[var40[var39]]; // L: 8395 + if (var25 != null && var36 != var25 && var25.x == var36.x && var36.y == var25.y) { // L: 8396 + VarpDefinition.addPlayerToMenu(var25, var40[var39], var15, var17); + } + } + } + + if (var30 != Client.combatTargetPlayerIndex) { // L: 8399 + VarpDefinition.addPlayerToMenu(var36, var30, var15, var17); + } else { + var4 = var27; // L: 8400 + } + } + + if (var19 == 3) { // L: 8402 + NodeDeque var38 = Client.groundItems[Huffman.Client_plane][var15][var17]; // L: 8403 + if (var38 != null) { // L: 8404 + for (TileItem var37 = (TileItem)var38.first(); var37 != null; var37 = (TileItem)var38.next()) { // L: 8405 8406 8439 + ItemDefinition var41 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var37.id); // L: 8407 + if (Client.isItemSelected == 1) { // L: 8408 + StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16748608) + var41.name, 16, var37.id, var15, var17); // L: 8409 + } else if (Client.isSpellSelected) { // L: 8412 + if ((UserComparator8.selectedSpellFlags & 1) == 1) { // L: 8413 + StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16748608) + var41.name, 17, var37.id, var15, var17); // L: 8414 + } + } else { + String[] var33 = var41.groundActions; // L: 8419 + + for (int var34 = 4; var34 >= 0; --var34) { // L: 8420 + if (var33 != null && var33[var34] != null) { // L: 8421 + byte var26 = 0; // L: 8422 + if (var34 == 0) { // L: 8423 + var26 = 18; + } + + if (var34 == 1) { // L: 8424 + var26 = 19; + } + + if (var34 == 2) { // L: 8425 + var26 = 20; + } + + if (var34 == 3) { // L: 8426 + var26 = 21; + } + + if (var34 == 4) { // L: 8427 + var26 = 22; + } + + StructDefinition.insertMenuItemNoShift(var33[var34], WorldMapAreaData.colorStartTag(16748608) + var41.name, var26, var37.id, var15, var17); // L: 8428 + } else if (var34 == 2) { // L: 8431 + StructDefinition.insertMenuItemNoShift("Take", WorldMapAreaData.colorStartTag(16748608) + var41.name, 20, var37.id, var15, var17); // L: 8432 + } + } + + StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(16748608) + var41.name, 1004, var37.id, var15, var17); // L: 8436 + } + } } } } } - ArchiveLoader.rasterProvider.apply(); + ++var8; // L: 8295 } + } + @ObfuscatedName("kd") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "68" + ) + public static boolean method3576() { + return Client.staffModLevel >= 2; // L: 10872 } } diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java index 97a6338101..67b3d14683 100644 --- a/runescape-client/src/main/java/KeyHandler.java +++ b/runescape-client/src/main/java/KeyHandler.java @@ -7,658 +7,298 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bg") +@ObfuscatedName("bz") @Implements("KeyHandler") public final class KeyHandler implements KeyListener, FocusListener { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lbg;" + descriptor = "Lbz;" ) @Export("KeyHandler_instance") - static KeyHandler KeyHandler_instance; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhd;" - ) - static Widget field407; - @ObfuscatedName("ck") + public static KeyHandler KeyHandler_instance; + @ObfuscatedName("cu") @Export("KeyHandler_pressedKeys") public static boolean[] KeyHandler_pressedKeys; - @ObfuscatedName("ci") - static int[] field409; - @ObfuscatedName("cu") - @ObfuscatedGetter( - intValue = 1257927323 - ) - static int field414; - @ObfuscatedName("cq") - @ObfuscatedGetter( - intValue = 535895155 - ) - static int field411; - @ObfuscatedName("co") - static char[] field415; - @ObfuscatedName("ca") - static int[] field413; - @ObfuscatedName("cm") - public static int[] field429; + @ObfuscatedName("cc") + public static int[] field409; @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 244616371 + intValue = 1174776797 ) - public static int field425; - @ObfuscatedName("ct") + public static int field417; + @ObfuscatedName("cj") @ObfuscatedGetter( - intValue = -564210989 + intValue = -1365142337 ) - static int field416; + public static int field418; @ObfuscatedName("cd") - @ObfuscatedGetter( - intValue = 1367616829 - ) - static int field417; - @ObfuscatedName("cy") - @ObfuscatedGetter( - intValue = -1700039391 - ) - static int field421; + static char[] field419; @ObfuscatedName("cx") + static int[] field420; + @ObfuscatedName("cp") + public static int[] field421; + @ObfuscatedName("ch") @ObfuscatedGetter( - intValue = 448116129 + intValue = 371324485 + ) + public static int field422; + @ObfuscatedName("cs") + @ObfuscatedGetter( + intValue = -1473086325 + ) + public static int field423; + @ObfuscatedName("ck") + @ObfuscatedGetter( + intValue = 2078161479 + ) + public static int field424; + @ObfuscatedName("co") + @ObfuscatedGetter( + intValue = -1475693687 + ) + public static int field399; + @ObfuscatedName("cz") + @ObfuscatedGetter( + intValue = -2101231775 ) @Export("KeyHandler_idleCycles") public static volatile int KeyHandler_idleCycles; - @ObfuscatedName("cs") + @ObfuscatedName("cy") @Export("KeyHandler_keyCodes") static int[] KeyHandler_keyCodes; - @ObfuscatedName("gw") - @ObfuscatedSignature( - descriptor = "[Llz;" + @ObfuscatedName("dr") + @ObfuscatedGetter( + longValue = -5651230833669824683L ) - @Export("headIconPrayerSprites") - static Sprite[] headIconPrayerSprites; - @ObfuscatedName("ju") - @ObfuscatedSignature( - descriptor = "Lhd;" - ) - @Export("dragInventoryWidget") - static Widget dragInventoryWidget; + static long field428; static { - KeyHandler_instance = new KeyHandler(); - KeyHandler_pressedKeys = new boolean[112]; - field409 = new int[128]; - field414 = 0; - field411 = 0; - field415 = new char[128]; - field413 = new int[128]; - field429 = new int[128]; - field425 = 0; - field416 = 0; - field417 = 0; - field421 = 0; - KeyHandler_idleCycles = 0; - KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; + KeyHandler_instance = new KeyHandler(); // L: 13 + KeyHandler_pressedKeys = new boolean[112]; // L: 100 + field409 = new int[128]; // L: 103 + field417 = 0; // L: 104 + field418 = 0; // L: 105 + field419 = new char[128]; // L: 106 + field420 = new int[128]; // L: 107 + field421 = new int[128]; // L: 108 + field422 = 0; // L: 109 + field423 = 0; // L: 110 + field424 = 0; // L: 111 + field399 = 0; // L: 112 + KeyHandler_idleCycles = 0; // L: 113 + KeyHandler_keyCodes = new int[]{-1, -1, -1, -1, -1, -1, -1, -1, 85, 80, 84, -1, 91, -1, -1, -1, 81, 82, 86, -1, -1, -1, -1, -1, -1, -1, -1, 13, -1, -1, -1, -1, 83, 104, 105, 103, 102, 96, 98, 97, 99, -1, -1, -1, -1, -1, -1, -1, 25, 16, 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 48, 68, 66, 50, 34, 51, 52, 53, 39, 54, 55, 56, 70, 69, 40, 41, 32, 35, 49, 36, 38, 67, 33, 65, 37, 64, -1, -1, -1, -1, -1, 228, 231, 227, 233, 224, 219, 225, 230, 226, 232, 89, 87, -1, 88, 229, 90, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, -1, 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; // L: 114 } KeyHandler() { - } - - public final synchronized void keyReleased(KeyEvent var1) { - if (KeyHandler_instance != null) { - int var2 = var1.getKeyCode(); - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { - var2 = KeyHandler_keyCodes[var2] & -129; - } else { - var2 = -1; - } - - if (field411 >= 0 && var2 >= 0) { - field409[field411] = ~var2; - field411 = field411 + 1 & 127; - if (field414 == field411) { - field411 = -1; - } - } - } - - var1.consume(); - } - - public final void keyTyped(KeyEvent var1) { - if (KeyHandler_instance != null) { - char var2 = var1.getKeyChar(); - if (var2 != 0 && var2 != '\uffff' && GrandExchangeEvents.method148(var2)) { - int var3 = field417 + 1 & 127; - if (var3 != field416) { - field413[field417] = -1; - field415[field417] = var2; - field417 = var3; - } - } - } - - var1.consume(); - } - - public final synchronized void focusLost(FocusEvent var1) { - if (KeyHandler_instance != null) { - field411 = -1; - } - - } - - public final void focusGained(FocusEvent var1) { - } + } // L: 116 public final synchronized void keyPressed(KeyEvent var1) { - if (KeyHandler_instance != null) { - int var2 = var1.getKeyCode(); - if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { - var2 = KeyHandler_keyCodes[var2]; - if ((var2 & 128) != 0) { + if (KeyHandler_instance != null) { // L: 178 + int var2 = var1.getKeyCode(); // L: 179 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 180 + var2 = KeyHandler_keyCodes[var2]; // L: 181 + if ((var2 & 128) != 0) { // L: 182 var2 = -1; } } else { - var2 = -1; + var2 = -1; // L: 184 } - if (field411 >= 0 && var2 >= 0) { - field409[field411] = var2; - field411 = field411 + 1 & 127; - if (field411 == field414) { - field411 = -1; + if (field418 >= 0 && var2 >= 0) { // L: 185 + field409[field418] = var2; // L: 186 + field418 = field418 + 1 & 127; // L: 187 + if (field418 == field417) { // L: 188 + field418 = -1; } } int var3; - if (var2 >= 0) { - var3 = field417 + 1 & 127; - if (var3 != field416) { - field413[field417] = var2; - field415[field417] = 0; - field417 = var3; + if (var2 >= 0) { // L: 190 + var3 = field424 + 1 & 127; // L: 191 + if (var3 != field423) { // L: 192 + field420[field424] = var2; // L: 193 + field419[field424] = 0; // L: 194 + field424 = var3; // L: 195 } } - var3 = var1.getModifiers(); - if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { - var1.consume(); + var3 = var1.getModifiers(); // L: 198 + if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) { // L: 199 + var1.consume(); // L: 200 } } - } + } // L: 203 - @ObfuscatedName("fz") + public final synchronized void keyReleased(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 206 + int var2 = var1.getKeyCode(); // L: 207 + if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) { // L: 208 + var2 = KeyHandler_keyCodes[var2] & -129; + } else { + var2 = -1; // L: 209 + } + + if (field418 >= 0 && var2 >= 0) { // L: 210 + field409[field418] = ~var2; // L: 211 + field418 = field418 + 1 & 127; // L: 212 + if (field417 == field418) { // L: 213 + field418 = -1; + } + } + } + + var1.consume(); // L: 216 + } // L: 217 + + public final void keyTyped(KeyEvent var1) { + if (KeyHandler_instance != null) { // L: 220 + char var2 = var1.getKeyChar(); // L: 221 + if (var2 != 0 && var2 != '\uffff' && ClanMate.method5146(var2)) { // L: 222 + int var3 = field424 + 1 & 127; // L: 223 + if (var3 != field423) { // L: 224 + field420[field424] = -1; // L: 225 + field419[field424] = var2; // L: 226 + field424 = var3; // L: 227 + } + } + } + + var1.consume(); // L: 231 + } // L: 232 + + public final void focusGained(FocusEvent var1) { + } // L: 234 + + public final synchronized void focusLost(FocusEvent var1) { + if (KeyHandler_instance != null) { // L: 237 + field418 = -1; // L: 238 + } + + } // L: 240 + + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "98" + descriptor = "(ILcy;ZS)I", + garbageValue = "20933" ) - @Export("drawEntities") - static final void drawEntities(int var0, int var1, int var2, int var3) { - ++Client.viewportDrawCount; - Canvas.method925(); - UserComparator6.method3564(); - WorldMapScaleHandler.method812(); - WorldMapIcon_0.addNpcsToScene(true); - ScriptFrame.method1201(); - WorldMapIcon_0.addNpcsToScene(false); - - int var6; - for (Projectile var4 = (Projectile)Client.projectiles.last(); var4 != null; var4 = (Projectile)Client.projectiles.previous()) { - if (var4.plane == TileItemPile.Client_plane && Client.cycle <= var4.cycleEnd) { - if (Client.cycle >= var4.cycleStart) { - if (var4.targetIndex > 0) { - NPC var29 = Client.npcs[var4.targetIndex - 1]; - if (var29 != null && var29.x >= 0 && var29.x < 13312 && var29.y >= 0 && var29.y < 13312) { - var4.setDestination(var29.x, var29.y, Language.getTileHeight(var29.x, var29.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - if (var4.targetIndex < 0) { - var6 = -var4.targetIndex - 1; - Player var34; - if (var6 == Client.localPlayerIndex) { - var34 = class60.localPlayer; - } else { - var34 = Client.players[var6]; - } - - if (var34 != null && var34.x >= 0 && var34.x < 13312 && var34.y >= 0 && var34.y < 13312) { - var4.setDestination(var34.x, var34.y, Language.getTileHeight(var34.x, var34.y, var4.plane) - var4.endHeight, Client.cycle); - } - } - - var4.advance(Client.field747); - UserComparator3.scene.drawEntity(TileItemPile.Client_plane, (int)var4.x, (int)var4.y, (int)var4.z, 60, var4, var4.yaw, -1L, false); - } - } else { - var4.remove(); - } - } - - for (GraphicsObject var32 = (GraphicsObject)Client.graphicsObjects.last(); var32 != null; var32 = (GraphicsObject)Client.graphicsObjects.previous()) { - if (var32.plane == TileItemPile.Client_plane && !var32.isFinished) { - if (Client.cycle >= var32.cycleStart) { - var32.advance(Client.field747); - if (var32.isFinished) { - var32.remove(); - } else { - UserComparator3.scene.drawEntity(var32.plane, var32.x, var32.y, var32.height, 60, var32, 0, -1L, false); - } - } - } else { - var32.remove(); - } - } - - WorldMapID.setViewportShape(var0, var1, var2, var3, true); - var0 = Client.viewportOffsetX; - var1 = Client.viewportOffsetY; - var2 = Client.viewportWidth; - var3 = Client.viewportHeight; - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - int var5; - int var7; - int var8; - int var11; - int var28; - if (!Client.isCameraLocked) { - var28 = Client.camAngleX; - if (Client.field881 / 256 > var28) { - var28 = Client.field881 / 256; - } - - if (Client.field918[4] && Client.field775[4] + 128 > var28) { - var28 = Client.field775[4] + 128; - } - - var5 = Client.camAngleY & 2047; - var6 = class225.oculusOrbFocalPointX; - var7 = WorldMapDecoration.field234; - var8 = HealthBarDefinition.oculusOrbFocalPointY; - var11 = var28 * 3 + 600; - GrandExchangeOfferAgeComparator.method224(var6, var7, var8, var28, var5, var11, var3); - } - - int var9; - int var10; - int var12; - int var13; - int var14; - if (!Client.isCameraLocked) { - if (NetSocket.clientPreferences.roofsHidden) { - var5 = TileItemPile.Client_plane; - } else { - label668: { - var6 = 3; - if (TilePaint.cameraPitch < 310) { - if (Client.oculusOrbState == 1) { - var7 = class225.oculusOrbFocalPointX >> 7; - var8 = HealthBarDefinition.oculusOrbFocalPointY >> 7; - } else { - var7 = class60.localPlayer.x >> 7; - var8 = class60.localPlayer.y >> 7; - } - - var9 = MouseHandler.cameraX >> 7; - var10 = ObjectSound.cameraZ >> 7; - if (var9 < 0 || var10 < 0 || var9 >= 104 || var10 >= 104) { - var5 = TileItemPile.Client_plane; - break label668; - } - - if (var7 < 0 || var8 < 0 || var7 >= 104 || var8 >= 104) { - var5 = TileItemPile.Client_plane; - break label668; - } - - if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][var9][var10] & 4) != 0) { - var6 = TileItemPile.Client_plane; - } - - if (var7 > var9) { - var11 = var7 - var9; - } else { - var11 = var9 - var7; - } - - if (var8 > var10) { - var12 = var8 - var10; - } else { - var12 = var10 - var8; - } - - if (var11 > var12) { - var13 = var12 * 65536 / var11; - var14 = 32768; - - while (var9 != var7) { - if (var9 < var7) { - ++var9; - } else if (var9 > var7) { - --var9; - } - - if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][var9][var10] & 4) != 0) { - var6 = TileItemPile.Client_plane; - } - - var14 += var13; - if (var14 >= 65536) { - var14 -= 65536; - if (var10 < var8) { - ++var10; - } else if (var10 > var8) { - --var10; - } - - if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][var9][var10] & 4) != 0) { - var6 = TileItemPile.Client_plane; - } - } - } - } else if (var12 > 0) { - var13 = var11 * 65536 / var12; - var14 = 32768; - - while (var10 != var8) { - if (var10 < var8) { - ++var10; - } else if (var10 > var8) { - --var10; - } - - if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][var9][var10] & 4) != 0) { - var6 = TileItemPile.Client_plane; - } - - var14 += var13; - if (var14 >= 65536) { - var14 -= 65536; - if (var9 < var7) { - ++var9; - } else if (var9 > var7) { - --var9; - } - - if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][var9][var10] & 4) != 0) { - var6 = TileItemPile.Client_plane; - } - } - } - } - } - - if (class60.localPlayer.x >= 0 && class60.localPlayer.y >= 0 && class60.localPlayer.x < 13312 && class60.localPlayer.y < 13312) { - if ((Tiles.Tiles_renderFlags[TileItemPile.Client_plane][class60.localPlayer.x >> 7][class60.localPlayer.y >> 7] & 4) != 0) { - var6 = TileItemPile.Client_plane; - } - - var5 = var6; - } else { - var5 = TileItemPile.Client_plane; - } - } - } - - var28 = var5; + static int method888(int var0, Script var1, boolean var2) { + Widget var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1165 + if (var0 == ScriptOpcodes.IF_GETX) { // L: 1166 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.x; // L: 1167 + return 1; // L: 1168 + } else if (var0 == ScriptOpcodes.IF_GETY) { // L: 1170 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.y; // L: 1171 + return 1; // L: 1172 + } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { // L: 1174 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.width; // L: 1175 + return 1; // L: 1176 + } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { // L: 1178 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.height; // L: 1179 + return 1; // L: 1180 + } else if (var0 == ScriptOpcodes.IF_GETHIDE) { // L: 1182 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1183 + return 1; // L: 1184 + } else if (var0 == ScriptOpcodes.IF_GETLAYER) { // L: 1186 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.parentId; // L: 1187 + return 1; // L: 1188 } else { - var28 = AbstractArchive.method4411(); + return 2; // L: 1190 } - - var5 = MouseHandler.cameraX; - var6 = WorldMapSection3.cameraY; - var7 = ObjectSound.cameraZ; - var8 = TilePaint.cameraPitch; - var9 = Canvas.cameraYaw; - - for (var10 = 0; var10 < 5; ++var10) { - if (Client.field918[var10]) { - var11 = (int)(Math.random() * (double)(Client.field919[var10] * 2 + 1) - (double)Client.field919[var10] + Math.sin((double)Client.field922[var10] * ((double)Client.field778[var10] / 100.0D)) * (double)Client.field775[var10]); - if (var10 == 0) { - MouseHandler.cameraX += var11; - } - - if (var10 == 1) { - WorldMapSection3.cameraY += var11; - } - - if (var10 == 2) { - ObjectSound.cameraZ += var11; - } - - if (var10 == 3) { - Canvas.cameraYaw = var11 + Canvas.cameraYaw & 2047; - } - - if (var10 == 4) { - TilePaint.cameraPitch += var11; - if (TilePaint.cameraPitch < 128) { - TilePaint.cameraPitch = 128; - } - - if (TilePaint.cameraPitch > 383) { - TilePaint.cameraPitch = 383; - } - } - } - } - - var10 = MouseHandler.MouseHandler_x; - var11 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var10 = MouseHandler.MouseHandler_lastPressedX; - var11 = MouseHandler.MouseHandler_lastPressedY; - } - - if (var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) { - var12 = var10 - var0; - var13 = var11 - var1; - ViewportMouse.ViewportMouse_x = var12; - ViewportMouse.ViewportMouse_y = var13; - ViewportMouse.ViewportMouse_isInViewport = true; - ViewportMouse.ViewportMouse_entityCount = 0; - ViewportMouse.ViewportMouse_false0 = false; - } else { - WorldMapSection0.method299(); - } - - Timer.playPcmPlayers(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - Timer.playPcmPlayers(); - var12 = Rasterizer3D.Rasterizer3D_zoom; - Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom; - UserComparator3.scene.draw(MouseHandler.cameraX, WorldMapSection3.cameraY, ObjectSound.cameraZ, TilePaint.cameraPitch, Canvas.cameraYaw, var28); - Rasterizer3D.Rasterizer3D_zoom = var12; - Timer.playPcmPlayers(); - UserComparator3.scene.clearTempGameObjects(); - Client.overheadTextCount = 0; - boolean var33 = false; - var14 = -1; - int var15 = -1; - int var16 = Players.Players_count; - int[] var17 = Players.Players_indices; - - int var18; - for (var18 = 0; var18 < var16 + Client.npcCount; ++var18) { - Object var19; - if (var18 < var16) { - var19 = Client.players[var17[var18]]; - if (var17[var18] == Client.combatTargetPlayerIndex) { - var33 = true; - var14 = var18; - continue; - } - - if (var19 == class60.localPlayer) { - var15 = var18; - continue; - } - } else { - var19 = Client.npcs[Client.npcIndices[var18 - var16]]; - } - - Timer.drawActor2d((Actor)var19, var18, var0, var1, var2, var3); - } - - if (Client.renderSelf && var15 != -1) { - Timer.drawActor2d(class60.localPlayer, var15, var0, var1, var2, var3); - } - - if (var33) { - Timer.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var14, var0, var1, var2, var3); - } - - for (var18 = 0; var18 < Client.overheadTextCount; ++var18) { - int var30 = Client.overheadTextXs[var18]; - int var20 = Client.overheadTextYs[var18]; - int var21 = Client.overheadTextXOffsets[var18]; - int var22 = Client.overheadTextAscents[var18]; - boolean var23 = true; - - while (var23) { - var23 = false; - - for (int var24 = 0; var24 < var18; ++var24) { - if (var20 + 2 > Client.overheadTextYs[var24] - Client.overheadTextAscents[var24] && var20 - var22 < Client.overheadTextYs[var24] + 2 && var30 - var21 < Client.overheadTextXOffsets[var24] + Client.overheadTextXs[var24] && var30 + var21 > Client.overheadTextXs[var24] - Client.overheadTextXOffsets[var24] && Client.overheadTextYs[var24] - Client.overheadTextAscents[var24] < var20) { - var20 = Client.overheadTextYs[var24] - Client.overheadTextAscents[var24]; - var23 = true; - } - } - } - - Client.viewportTempX = Client.overheadTextXs[var18]; - Client.viewportTempY = Client.overheadTextYs[var18] = var20; - String var31 = Client.overheadText[var18]; - if (Client.chatEffects == 0) { - int var25 = 16776960; - if (Client.overheadTextColors[var18] < 6) { - var25 = Client.field888[Client.overheadTextColors[var18]]; - } - - if (Client.overheadTextColors[var18] == 6) { - var25 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; - } - - if (Client.overheadTextColors[var18] == 7) { - var25 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; - } - - if (Client.overheadTextColors[var18] == 8) { - var25 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; - } - - int var26; - if (Client.overheadTextColors[var18] == 9) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 1280 + 16711680; - } else if (var26 < 100) { - var25 = 16776960 - (var26 - 50) * 327680; - } else if (var26 < 150) { - var25 = (var26 - 100) * 5 + 65280; - } - } - - if (Client.overheadTextColors[var18] == 10) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = var26 * 5 + 16711680; - } else if (var26 < 100) { - var25 = 16711935 - (var26 - 50) * 327680; - } else if (var26 < 150) { - var25 = (var26 - 100) * 327680 + 255 - (var26 - 100) * 5; - } - } - - if (Client.overheadTextColors[var18] == 11) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - if (var26 < 50) { - var25 = 16777215 - var26 * 327685; - } else if (var26 < 100) { - var25 = (var26 - 50) * 327685 + 65280; - } else if (var26 < 150) { - var25 = 16777215 - (var26 - 100) * 327680; - } - } - - if (Client.overheadTextEffects[var18] == 0) { - GrandExchangeOfferNameComparator.fontBold12.drawCentered(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0); - } - - if (Client.overheadTextEffects[var18] == 1) { - GrandExchangeOfferNameComparator.fontBold12.drawCenteredWave(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 2) { - GrandExchangeOfferNameComparator.fontBold12.drawCenteredWave2(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount); - } - - if (Client.overheadTextEffects[var18] == 3) { - GrandExchangeOfferNameComparator.fontBold12.drawCenteredShake(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, var25, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var18]); - } - - if (Client.overheadTextEffects[var18] == 4) { - var26 = (150 - Client.overheadTextCyclesRemaining[var18]) * (GrandExchangeOfferNameComparator.fontBold12.stringWidth(var31) + 100) / 150; - Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); - GrandExchangeOfferNameComparator.fontBold12.draw(var31, var0 + Client.viewportTempX + 50 - var26, Client.viewportTempY + var1, var25, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - - if (Client.overheadTextEffects[var18] == 5) { - var26 = 150 - Client.overheadTextCyclesRemaining[var18]; - int var27 = 0; - if (var26 < 25) { - var27 = var26 - 25; - } else if (var26 > 125) { - var27 = var26 - 125; - } - - Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - GrandExchangeOfferNameComparator.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); - GrandExchangeOfferNameComparator.fontBold12.drawCentered(var31, var0 + Client.viewportTempX, var27 + Client.viewportTempY + var1, var25, 0); - Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); - } - } else { - GrandExchangeOfferNameComparator.fontBold12.drawCentered(var31, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); - } - } - - if (Client.hintArrowType == 2) { - HealthBar.worldToScreen((Client.hintArrowX - class182.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - SecureRandomFuture.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2); - if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) { - SoundSystem.headIconHintSprites[0].drawTransBgAt(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28); - } - } - - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field747); - UrlRequest.method3432(var0, var1, var2, var3); - MouseHandler.cameraX = var5; - WorldMapSection3.cameraY = var6; - ObjectSound.cameraZ = var7; - TilePaint.cameraPitch = var8; - Canvas.cameraYaw = var9; - if (Client.isLoading && ModeWhere.method3809(true, false) == 0) { - Client.isLoading = false; - } - - if (Client.isLoading) { - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0); - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", false); - } - } - @ObfuscatedName("ki") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(Lhd;I)I", - garbageValue = "-1756984804" + descriptor = "(ILcy;ZI)I", + garbageValue = "-2116995396" ) - @Export("getWidgetFlags") - static int getWidgetFlags(Widget var0) { - IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); - return var1 != null ? var1.integer : var0.flags; + static int method890(int var0, Script var1, boolean var2) { + Widget var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1194 + if (var0 == ScriptOpcodes.IF_GETSCROLLX) { // L: 1195 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1196 + return 1; // L: 1197 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { // L: 1199 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1200 + return 1; // L: 1201 + } else if (var0 == ScriptOpcodes.IF_GETTEXT) { // L: 1203 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.text; // L: 1204 + return 1; // L: 1205 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { // L: 1207 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1208 + return 1; // L: 1209 + } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { // L: 1211 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1212 + return 1; // L: 1213 + } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { // L: 1215 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1216 + return 1; // L: 1217 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { // L: 1219 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1220 + return 1; // L: 1221 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { // L: 1223 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1224 + return 1; // L: 1225 + } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { // L: 1227 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1228 + return 1; // L: 1229 + } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { // L: 1231 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1232 + return 1; // L: 1233 + } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { // L: 1235 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1236 + return 1; // L: 1237 + } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { // L: 1239 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1240 + return 1; // L: 1241 + } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { // L: 1243 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1244 + return 1; // L: 1245 + } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { // L: 1247 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1248 + return 1; // L: 1249 + } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { // L: 1251 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1252 + return 1; // L: 1253 + } else { + return 2; // L: 1255 + } } + + @ObfuscatedName("ii") + @ObfuscatedSignature( + descriptor = "([Lhq;IIIZI)V", + garbageValue = "102322570" + ) + @Export("resizeInterface") + static void resizeInterface(Widget[] var0, int var1, int var2, int var3, boolean var4) { + for (int var5 = 0; var5 < var0.length; ++var5) { // L: 9227 + Widget var6 = var0[var5]; // L: 9228 + if (var6 != null && var6.parentId == var1) { // L: 9229 9230 + MouseRecorder.alignWidgetSize(var6, var2, var3, var4); // L: 9231 + DirectByteArrayCopier.alignWidgetPosition(var6, var2, var3); // L: 9232 + if (var6.scrollX > var6.scrollWidth - var6.width) { // L: 9233 + var6.scrollX = var6.scrollWidth - var6.width; + } + + if (var6.scrollX < 0) { // L: 9234 + var6.scrollX = 0; + } + + if (var6.scrollY > var6.scrollHeight - var6.height) { // L: 9235 + var6.scrollY = var6.scrollHeight - var6.height; + } + + if (var6.scrollY < 0) { // L: 9236 + var6.scrollY = 0; + } + + if (var6.type == 0) { // L: 9237 + class4.revalidateWidgetScroll(var0, var6, var4); + } + } + } + + } // L: 9239 } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index f9d8dac8f4..fde5f3fc95 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -4,395 +4,257 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ir") +@ObfuscatedName("ie") @Implements("KitDefinition") public class KitDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("KitDefinition_archive") static AbstractArchive KitDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("KitDefinition_modelsArchive") static AbstractArchive KitDefinition_modelsArchive; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -413504447 + intValue = 12947469 ) @Export("KitDefinition_fileCount") public static int KitDefinition_fileCount; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("KitDefinition_cached") - static EvictingDualNodeHashTable KitDefinition_cached; + public static EvictingDualNodeHashTable KitDefinition_cached; @ObfuscatedName("i") - @Export("BZip2Decompressor_block") - static int[] BZip2Decompressor_block; - @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1201846847 + intValue = -346028961 ) @Export("bodypartID") public int bodypartID; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("models2") int[] models2; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("models") int[] models; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("nonSelectable") public boolean nonSelectable; static { - KitDefinition_cached = new EvictingDualNodeHashTable(64); + KitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 } KitDefinition() { - this.bodypartID = -1; - this.models = new int[]{-1, -1, -1, -1, -1}; - this.nonSelectable = false; - } + this.bodypartID = -1; // L: 15 + this.models = new int[]{-1, -1, -1, -1, -1}; // L: 21 + this.nonSelectable = false; // L: 22 + } // L: 24 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "856121726" + descriptor = "(Lkf;I)V", + garbageValue = "-861511508" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 44 + if (var2 == 0) { // L: 45 + return; // L: 48 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 46 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;IB)V", - garbageValue = "-72" + descriptor = "(Lkf;IB)V", + garbageValue = "36" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { + if (var2 == 1) { // L: 51 this.bodypartID = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 2) { - var3 = var1.readUnsignedByte(); - this.models2 = new int[var3]; + if (var2 == 2) { // L: 52 + var3 = var1.readUnsignedByte(); // L: 53 + this.models2 = new int[var3]; // L: 54 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 55 this.models2[var4] = var1.readUnsignedShort(); } - } else if (var2 == 3) { + } else if (var2 == 3) { // L: 57 this.nonSelectable = true; - } else if (var2 == 40) { - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + } else if (var2 == 40) { // L: 58 + var3 = var1.readUnsignedByte(); // L: 59 + this.recolorFrom = new short[var3]; // L: 60 + this.recolorTo = new short[var3]; // L: 61 - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 62 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 67 + var3 = var1.readUnsignedByte(); // L: 68 + this.retextureFrom = new short[var3]; // L: 69 + this.retextureTo = new short[var3]; // L: 70 - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 71 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 } - } else if (var2 >= 60 && var2 < 70) { + } else if (var2 >= 60 && var2 < 70) { // L: 76 this.models[var2 - 60] = var1.readUnsignedShort(); } } - } + } // L: 78 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1376663595" + descriptor = "(B)Z", + garbageValue = "-62" ) @Export("ready") public boolean ready() { - if (this.models2 == null) { + if (this.models2 == null) { // L: 81 return true; } else { - boolean var1 = true; + boolean var1 = true; // L: 82 - for (int var2 = 0; var2 < this.models2.length; ++var2) { + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 83 if (!KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { var1 = false; } } - return var1; + return var1; // L: 84 } } - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)Lek;", - garbageValue = "-730489630" - ) - @Export("getModelData") - public ModelData getModelData() { - if (this.models2 == null) { - return null; - } else { - ModelData[] var1 = new ModelData[this.models2.length]; - - for (int var2 = 0; var2 < this.models2.length; ++var2) { - var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); - } - - ModelData var4; - if (var1.length == 1) { - var4 = var1[0]; - } else { - var4 = new ModelData(var1, var1.length); - } - - int var3; - if (this.recolorFrom != null) { - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); - } - } - - if (this.retextureFrom != null) { - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); - } - } - - return var4; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1413999109" - ) - public boolean method4636() { - boolean var1 = true; - - for (int var2 = 0; var2 < 5; ++var2) { - if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { - var1 = false; - } - } - - return var1; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(B)Lek;", - garbageValue = "-127" - ) - @Export("getKitDefinitionModels") - public ModelData getKitDefinitionModels() { - ModelData[] var1 = new ModelData[5]; - int var2 = 0; - - for (int var3 = 0; var3 < 5; ++var3) { - if (this.models[var3] != -1) { - var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); - } - } - - ModelData var5 = new ModelData(var1, var2); - int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); - } - } - - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); - } - } - - return var5; - } - @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Ljo;", - garbageValue = "1649830223" + descriptor = "(I)Lee;", + garbageValue = "-1978614087" ) - @Export("ItemDefinition_get") - public static ItemDefinition ItemDefinition_get(int var0) { - ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + @Export("getModelData") + public ModelData getModelData() { + if (this.models2 == null) { // L: 88 + return null; } else { - byte[] var2 = VarcInt.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); + ModelData[] var1 = new ModelData[this.models2.length]; // L: 89 + + for (int var2 = 0; var2 < this.models2.length; ++var2) { // L: 90 + var1[var2] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models2[var2], 0); } - var1.post(); - if (var1.noteTemplate != -1) { - var1.genCert(ItemDefinition_get(var1.noteTemplate), ItemDefinition_get(var1.note)); + ModelData var4; + if (var1.length == 1) { // L: 92 + var4 = var1[0]; + } else { + var4 = new ModelData(var1, var1.length); // L: 93 } - if (var1.notedId != -1) { - var1.genBought(ItemDefinition_get(var1.notedId), ItemDefinition_get(var1.unnotedId)); - } - - if (var1.placeholderTemplate != -1) { - var1.genPlaceholder(ItemDefinition_get(var1.placeholderTemplate), ItemDefinition_get(var1.placeholder)); - } - - if (!SoundCache.ItemDefinition_inMembersWorld && var1.isMembersOnly) { - var1.name = "Members object"; - var1.isTradable = false; - var1.groundActions = null; - var1.inventoryActions = null; - var1.shiftClickIndex = -1; - var1.team = 0; - if (var1.params != null) { - boolean var3 = false; - - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamDefinition var5 = VarbitDefinition.getParamDefinition((int)var4.key); - if (var5.autoDisable) { - var4.remove(); - } else { - var3 = true; - } - } - - if (!var3) { - var1.params = null; - } + int var3; + if (this.recolorFrom != null) { // L: 94 + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { // L: 95 + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); // L: 96 } } - ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); - return var1; + if (this.retextureFrom != null) { // L: 99 + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { // L: 100 + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); // L: 101 + } + } + + return var4; // L: 104 } } - @ObfuscatedName("q") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(CB)C", - garbageValue = "0" + descriptor = "(B)Z", + garbageValue = "-57" ) - static char method4650(char var0) { - switch(var0) { - case ' ': - case '-': - case '_': - case ' ': - return '_'; - case '#': - case '[': - case ']': - return var0; - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - return 'a'; - case 'Ç': - case 'ç': - return 'c'; - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - return 'e'; - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - return 'i'; - case 'Ñ': - case 'ñ': - return 'n'; - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - return 'o'; - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - return 'u'; - case 'ß': - return 'b'; - case 'ÿ': - case 'Ÿ': - return 'y'; - default: - return Character.toLowerCase(var0); + public boolean method4543() { + boolean var1 = true; // L: 108 + + for (int var2 = 0; var2 < 5; ++var2) { // L: 109 + if (this.models[var2] != -1 && !KitDefinition_modelsArchive.tryLoadFile(this.models[var2], 0)) { // L: 110 + var1 = false; + } } + + return var1; // L: 112 } - @ObfuscatedName("q") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1137606481" + descriptor = "(B)Lee;", + garbageValue = "16" ) - public static void method4624() { - VarbitDefinition.VarbitDefinition_cached.clear(); + @Export("getKitDefinitionModels") + public ModelData getKitDefinitionModels() { + ModelData[] var1 = new ModelData[5]; // L: 116 + int var2 = 0; // L: 117 + + for (int var3 = 0; var3 < 5; ++var3) { // L: 118 + if (this.models[var3] != -1) { // L: 119 + var1[var2++] = ModelData.ModelData_get(KitDefinition_modelsArchive, this.models[var3], 0); + } + } + + ModelData var5 = new ModelData(var1, var2); // L: 121 + int var4; + if (this.recolorFrom != null) { // L: 122 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 123 + var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 124 + } + } + + if (this.retextureFrom != null) { // L: 127 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 128 + var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 129 + } + } + + return var5; // L: 132 } + + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "(S)V", + garbageValue = "1024" + ) + @Export("FriendSystem_invalidateIgnoreds") + static final void FriendSystem_invalidateIgnoreds() { + UserComparator8.method3497(); // L: 10675 + if (Entity.clanChat != null) { // L: 10676 + Entity.clanChat.invalidateIgnoreds(); // L: 10677 + } + + } // L: 10679 } diff --git a/runescape-client/src/main/java/Language.java b/runescape-client/src/main/java/Language.java index fed715c5d2..09412b985c 100644 --- a/runescape-client/src/main/java/Language.java +++ b/runescape-client/src/main/java/Language.java @@ -5,462 +5,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gz") +@ObfuscatedName("gn") @Implements("Language") public class Language implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lgn;" ) @Export("Language_EN") public static final Language Language_EN; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lgn;" ) @Export("Language_DE") static final Language Language_DE; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lgn;" ) @Export("Language_FR") public static final Language Language_FR; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lgn;" ) @Export("Language_PT") static final Language Language_PT; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lgn;" ) @Export("Language_NL") static final Language Language_NL; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lgn;" ) @Export("Language_ES") public static final Language Language_ES; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lgz;" + descriptor = "Lgn;" ) @Export("Language_ES_MX") static final Language Language_ES_MX; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "[Lgz;" + descriptor = "[Lgn;" ) @Export("Language_valuesOrdered") - static final Language[] Language_valuesOrdered; - @ObfuscatedName("u") - final String field2396; - @ObfuscatedName("a") + public static final Language[] Language_valuesOrdered; + @ObfuscatedName("w") + final String field2387; + @ObfuscatedName("g") @Export("language") final String language; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1862658961 + intValue = 2011360821 ) @Export("id") final int id; static { - Language_EN = new Language("EN", "en", "English", ModeWhere.field2412, 0, "GB"); - Language_DE = new Language("DE", "de", "German", ModeWhere.field2412, 1, "DE"); - Language_FR = new Language("FR", "fr", "French", ModeWhere.field2412, 2, "FR"); - Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field2412, 3, "BR"); - Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field2405, 4, "NL"); - Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field2405, 5, "ES"); - Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field2412, 6, "MX"); - Language[] var0 = method3783(); - Language_valuesOrdered = new Language[var0.length]; - Language[] var1 = var0; + Language_EN = new Language("EN", "en", "English", ModeWhere.field2413, 0, "GB"); // L: 10 + Language_DE = new Language("DE", "de", "German", ModeWhere.field2413, 1, "DE"); // L: 11 + Language_FR = new Language("FR", "fr", "French", ModeWhere.field2413, 2, "FR"); // L: 12 + Language_PT = new Language("PT", "pt", "Portuguese", ModeWhere.field2413, 3, "BR"); // L: 13 + Language_NL = new Language("NL", "nl", "Dutch", ModeWhere.field2407, 4, "NL"); // L: 14 + Language_ES = new Language("ES", "es", "Spanish", ModeWhere.field2407, 5, "ES"); // L: 15 + Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", ModeWhere.field2413, 6, "MX"); // L: 16 + Language[] var0 = new Language[]{Language_NL, Language_PT, Language_FR, Language_ES_MX, Language_ES, Language_DE, Language_EN}; // L: 25 + Language_valuesOrdered = new Language[var0.length]; // L: 28 + Language[] var2 = var0; // L: 30 - for (int var2 = 0; var2 < var1.length; ++var2) { - Language var3 = var1[var2]; - if (Language_valuesOrdered[var3.id] != null) { - throw new IllegalStateException(); + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 31 + Language var4 = var2[var3]; // L: 32 + if (Language_valuesOrdered[var4.id] != null) { // L: 34 + throw new IllegalStateException(); // L: 35 } - Language_valuesOrdered[var3.id] = var3; + Language_valuesOrdered[var4.id] = var4; // L: 37 } - } + } // L: 41 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lge;ILjava/lang/String;)V" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgy;ILjava/lang/String;)V" ) Language(String var1, String var2, String var3, ModeWhere var4, int var5, String var6) { - this.field2396 = var1; - this.language = var2; - this.id = var5; - if (var6 != null) { - new Locale(var2.substring(0, 2), var6); + this.field2387 = var1; // L: 44 + this.language = var2; // L: 45 + this.id = var5; // L: 46 + if (var6 != null) { // L: 47 + new Locale(var2.substring(0, 2), var6); // L: 48 } else { - new Locale(var2.substring(0, 2)); + new Locale(var2.substring(0, 2)); // L: 51 } - } + } // L: 53 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-995092303" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "-15" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "1763794440" ) @Export("getLanguage") String getLanguage() { - return this.language; + return this.language; // L: 56 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "385513888" + ) + @Export("rsOrdinal") + public int rsOrdinal() { + return this.id; // L: 60 } public String toString() { - return this.getLanguage().toLowerCase(Locale.ENGLISH); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Llf;III)I", - garbageValue = "924911925" - ) - static int method3801(IterableNodeHashTable var0, int var1, int var2) { - if (var0 == null) { - return var2; - } else { - IntegerNode var3 = (IntegerNode)var0.get((long)var1); - return var3 == null ? var2 : var3.integer; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)[Lgz;", - garbageValue = "1898345943" - ) - static Language[] method3783() { - return new Language[]{Language_EN, Language_DE, Language_ES, Language_ES_MX, Language_PT, Language_FR, Language_NL}; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IB)Lbr;", - garbageValue = "-87" - ) - @Export("Messages_getMessage") - static Message Messages_getMessage(int var0) { - return (Message)Messages.Messages_hashTable.get((long)var0); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IB)Lgz;", - garbageValue = "-67" - ) - @Export("Language_get") - public static Language Language_get(int var0) { - return var0 >= 0 && var0 < Language_valuesOrdered.length ? Language_valuesOrdered[var0] : null; - } - - @ObfuscatedName("u") - @Export("Entity_unpackID") - public static int Entity_unpackID(long var0) { - return (int)(var0 >>> 17 & 4294967295L); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Lko;Lko;I)V", - garbageValue = "916076858" - ) - static void method3786(Font var0, Font var1) { - int var4; - int var5; - if (class90.worldSelectBackSprites == null) { - Archive var3 = GrandExchangeEvent.archive8; - var4 = var3.getGroupId("sl_back"); - var5 = var3.getFileId(var4, ""); - Sprite[] var2 = class217.method4091(var3, var4, var5); - class90.worldSelectBackSprites = var2; - } - - if (SpotAnimationDefinition.worldSelectFlagSprites == null) { - SpotAnimationDefinition.worldSelectFlagSprites = PendingSpawn.method1806(GrandExchangeEvent.archive8, "sl_flags", ""); - } - - if (GrandExchangeEvent.worldSelectArrows == null) { - GrandExchangeEvent.worldSelectArrows = PendingSpawn.method1806(GrandExchangeEvent.archive8, "sl_arrows", ""); - } - - if (class228.worldSelectStars == null) { - class228.worldSelectStars = PendingSpawn.method1806(GrandExchangeEvent.archive8, "sl_stars", ""); - } - - if (class13.worldSelectLeftSprite == null) { - class13.worldSelectLeftSprite = class329.SpriteBuffer_getIndexedSpriteByName(GrandExchangeEvent.archive8, "leftarrow", ""); - } - - if (ClientPreferences.worldSelectRightSprite == null) { - ClientPreferences.worldSelectRightSprite = class329.SpriteBuffer_getIndexedSpriteByName(GrandExchangeEvent.archive8, "rightarrow", ""); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624); - Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513); - var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1); - if (class228.worldSelectStars != null) { - class228.worldSelectStars[1].drawAt(Login.xPadding + 140, 1); - var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1); - class228.worldSelectStars[0].drawAt(Login.xPadding + 140, 12); - var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1); - } - - if (GrandExchangeEvent.worldSelectArrows != null) { - int var22 = Login.xPadding + 280; - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 0) { - GrandExchangeEvent.worldSelectArrows[2].drawAt(var22, 4); - } else { - GrandExchangeEvent.worldSelectArrows[0].drawAt(var22, 4); - } - - if (World.World_sortOption1[0] == 0 && World.World_sortOption2[0] == 1) { - GrandExchangeEvent.worldSelectArrows[3].drawAt(var22 + 15, 4); - } else { - GrandExchangeEvent.worldSelectArrows[1].drawAt(var22 + 15, 4); - } - - var0.draw("World", var22 + 32, 17, 16777215, -1); - int var23 = Login.xPadding + 390; - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 0) { - GrandExchangeEvent.worldSelectArrows[2].drawAt(var23, 4); - } else { - GrandExchangeEvent.worldSelectArrows[0].drawAt(var23, 4); - } - - if (World.World_sortOption1[0] == 1 && World.World_sortOption2[0] == 1) { - GrandExchangeEvent.worldSelectArrows[3].drawAt(var23 + 15, 4); - } else { - GrandExchangeEvent.worldSelectArrows[1].drawAt(var23 + 15, 4); - } - - var0.draw("Players", var23 + 32, 17, 16777215, -1); - var4 = Login.xPadding + 500; - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 0) { - GrandExchangeEvent.worldSelectArrows[2].drawAt(var4, 4); - } else { - GrandExchangeEvent.worldSelectArrows[0].drawAt(var4, 4); - } - - if (World.World_sortOption1[0] == 2 && World.World_sortOption2[0] == 1) { - GrandExchangeEvent.worldSelectArrows[3].drawAt(var4 + 15, 4); - } else { - GrandExchangeEvent.worldSelectArrows[1].drawAt(var4 + 15, 4); - } - - var0.draw("Location", var4 + 32, 17, 16777215, -1); - var5 = Login.xPadding + 610; - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 0) { - GrandExchangeEvent.worldSelectArrows[2].drawAt(var5, 4); - } else { - GrandExchangeEvent.worldSelectArrows[0].drawAt(var5, 4); - } - - if (World.World_sortOption1[0] == 3 && World.World_sortOption2[0] == 1) { - GrandExchangeEvent.worldSelectArrows[3].drawAt(var5 + 15, 4); - } else { - GrandExchangeEvent.worldSelectArrows[1].drawAt(var5 + 15, 4); - } - - var0.draw("Type", var5 + 32, 17, 16777215, -1); - } - - Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0); - var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1); - Login.hoveredWorldIndex = -1; - if (class90.worldSelectBackSprites != null) { - byte var26 = 88; - byte var27 = 19; - var4 = 765 / (var26 + 1) - 1; - var5 = 480 / (var27 + 1); - - int var6; - int var7; - do { - var6 = var5; - var7 = var4; - if (var5 * (var4 - 1) >= World.World_count) { - --var4; - } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - - if (var4 * (var5 - 1) >= World.World_count) { - --var5; - } - } while(var6 != var5 || var7 != var4); - - var6 = (765 - var4 * var26) / (var4 + 1); - if (var6 > 5) { - var6 = 5; - } - - var7 = (480 - var27 * var5) / (var5 + 1); - if (var7 > 5) { - var7 = 5; - } - - int var8 = (765 - var26 * var4 - var6 * (var4 - 1)) / 2; - int var9 = (480 - var5 * var27 - var7 * (var5 - 1)) / 2; - int var10 = (var5 + World.World_count - 1) / var5; - Login.worldSelectPagesCount = var10 - var4; - if (class13.worldSelectLeftSprite != null && Login.worldSelectPage > 0) { - class13.worldSelectLeftSprite.drawAt(8, class52.canvasHeight / 2 - class13.worldSelectLeftSprite.subHeight / 2); - } - - if (ClientPreferences.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) { - ClientPreferences.worldSelectRightSprite.drawAt(Varcs.canvasWidth - ClientPreferences.worldSelectRightSprite.subWidth - 8, class52.canvasHeight / 2 - ClientPreferences.worldSelectRightSprite.subHeight / 2); - } - - int var11 = var9 + 23; - int var12 = var8 + Login.xPadding; - int var13 = 0; - boolean var14 = false; - int var15 = Login.worldSelectPage; - - int var16; - for (var16 = var15 * var5; var16 < World.World_count && var15 - Login.worldSelectPage < var4; ++var16) { - World var24 = class13.World_worlds[var16]; - boolean var18 = true; - String var19 = Integer.toString(var24.population); - if (var24.population == -1) { - var19 = "OFF"; - var18 = false; - } else if (var24.population > 1980) { - var19 = "FULL"; - var18 = false; - } - - int var21 = 0; - byte var20; - if (var24.isBeta()) { - if (var24.isMembersOnly()) { - var20 = 7; - } else { - var20 = 6; - } - } else if (var24.isDeadman()) { - var21 = 16711680; - if (var24.isMembersOnly()) { - var20 = 5; - } else { - var20 = 4; - } - } else if (var24.method1835()) { - if (var24.isMembersOnly()) { - var20 = 9; - } else { - var20 = 8; - } - } else if (var24.isPvp()) { - if (var24.isMembersOnly()) { - var20 = 3; - } else { - var20 = 2; - } - } else if (var24.isMembersOnly()) { - var20 = 1; - } else { - var20 = 0; - } - - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var11 && MouseHandler.MouseHandler_x < var12 + var26 && MouseHandler.MouseHandler_y < var27 + var11 && var18) { - Login.hoveredWorldIndex = var16; - class90.worldSelectBackSprites[var20].drawTransOverlayAt(var12, var11, 128, 16777215); - var14 = true; - } else { - class90.worldSelectBackSprites[var20].drawAt(var12, var11); - } - - if (SpotAnimationDefinition.worldSelectFlagSprites != null) { - SpotAnimationDefinition.worldSelectFlagSprites[(var24.isMembersOnly() ? 8 : 0) + var24.location].drawAt(var12 + 29, var11); - } - - var0.drawCentered(Integer.toString(var24.id), var12 + 15, var27 / 2 + var11 + 5, var21, -1); - var1.drawCentered(var19, var12 + 60, var27 / 2 + var11 + 5, 268435455, -1); - var11 = var11 + var27 + var7; - ++var13; - if (var13 >= var5) { - var11 = var9 + 23; - var12 = var12 + var6 + var26; - var13 = 0; - ++var15; - } - } - - if (var14) { - var16 = var1.stringWidth(class13.World_worlds[Login.hoveredWorldIndex].activity) + 6; - int var17 = var1.ascent + 8; - int var25 = MouseHandler.MouseHandler_y + 25; - if (var17 + var25 > 480) { - var25 = MouseHandler.MouseHandler_y - 25 - var17; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var17, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var16 / 2, var25, var16, var17, 0); - var1.drawCentered(class13.World_worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var25 + var1.ascent + 4, 0, -1); - } - } - - ArchiveLoader.rasterProvider.drawFull(0, 0); - } - - @ObfuscatedName("gj") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "179125696" - ) - @Export("getTileHeight") - static final int getTileHeight(int var0, int var1, int var2) { - int var3 = var0 >> 7; - int var4 = var1 >> 7; - if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) { - int var5 = var2; - if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) { - var5 = var2 + 1; - } - - int var6 = var0 & 127; - int var7 = var1 & 127; - int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4] >> 7; - int var9 = Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) + var6 * Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] >> 7; - return var9 * var7 + var8 * (128 - var7) >> 7; - } else { - return 0; - } - } - - @ObfuscatedName("jg") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1826045916" - ) - @Export("runIntfCloseListeners") - static final void runIntfCloseListeners(int var0, int var1) { - if (UserComparator4.loadInterface(var0)) { - Skeleton.runComponentCloseListeners(Widget.Widget_interfaceComponents[var0], var1); - } + return this.getLanguage().toLowerCase(Locale.ENGLISH); // L: 64 } } diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java index bf655d36ed..cc126ea103 100644 --- a/runescape-client/src/main/java/Link.java +++ b/runescape-client/src/main/java/Link.java @@ -3,30 +3,30 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gd") +@ObfuscatedName("gr") @Implements("Link") public class Link { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgr;" ) @Export("previous") public Link previous; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgr;" ) @Export("next") public Link next; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("remove") public void remove() { - if (this.next != null) { - this.next.previous = this.previous; - this.previous.next = this.next; - this.previous = null; - this.next = null; + if (this.next != null) { // L: 8 + this.next.previous = this.previous; // L: 9 + this.previous.next = this.next; // L: 10 + this.previous = null; // L: 11 + this.next = null; // L: 12 } - } + } // L: 13 } diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 56b284714a..3f49c2f38c 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -3,73 +3,73 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jn") +@ObfuscatedName("jb") @Implements("LinkDeque") public class LinkDeque { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgr;" ) @Export("sentinel") Link sentinel; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgd;" + descriptor = "Lgr;" ) @Export("current") Link current; public LinkDeque() { - this.sentinel = new Link(); - this.sentinel.previous = this.sentinel; - this.sentinel.next = this.sentinel; - } + this.sentinel = new Link(); // L: 6 + this.sentinel.previous = this.sentinel; // L: 10 + this.sentinel.next = this.sentinel; // L: 11 + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lgd;)V" + descriptor = "(Lgr;)V" ) @Export("addFirst") public void addFirst(Link var1) { - if (var1.next != null) { + if (var1.next != null) { // L: 15 var1.remove(); } - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; - } + var1.next = this.sentinel.next; // L: 16 + var1.previous = this.sentinel; // L: 17 + var1.next.previous = var1; // L: 18 + var1.previous.next = var1; // L: 19 + } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Lgd;" + descriptor = "()Lgr;" ) @Export("last") public Link last() { - Link var1 = this.sentinel.previous; - if (var1 == this.sentinel) { - this.current = null; - return null; + Link var1 = this.sentinel.previous; // L: 23 + if (var1 == this.sentinel) { // L: 24 + this.current = null; // L: 25 + return null; // L: 26 } else { - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 28 + return var1; // L: 29 } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lgd;" + descriptor = "()Lgr;" ) @Export("previous") public Link previous() { - Link var1 = this.current; - if (var1 == this.sentinel) { - this.current = null; - return null; + Link var1 = this.current; // L: 33 + if (var1 == this.sentinel) { // L: 34 + this.current = null; // L: 35 + return null; // L: 36 } else { - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 38 + return var1; // L: 39 } } } diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java index 1295833d13..3ce78be73b 100644 --- a/runescape-client/src/main/java/Login.java +++ b/runescape-client/src/main/java/Login.java @@ -5,393 +5,193 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ca") +@ObfuscatedName("cx") @Implements("Login") public class Login { - @ObfuscatedName("q") + @ObfuscatedName("k") + @Export("clearLoginScreen") + static boolean clearLoginScreen; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -708549225 + intValue = -1062905543 ) @Export("xPadding") static int xPadding; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "[Llh;" - ) - @Export("runesSprite") - static IndexedSprite[] runesSprite; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Llz;" - ) - @Export("leftTitleSprite") - static Sprite leftTitleSprite; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Llh;" - ) - @Export("logoSprite") - static IndexedSprite logoSprite; @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Llp;" ) - @Export("options_buttons_0Sprite") - static IndexedSprite options_buttons_0Sprite; - @ObfuscatedName("k") + @Export("rightTitleSprite") + static Sprite rightTitleSprite; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lcw;" + descriptor = "Lls;" ) - @Export("loginScreenRunesAnimation") - static LoginScreenAnimation loginScreenRunesAnimation; - @ObfuscatedName("e") + static IndexedSprite field1221; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -104867267 + intValue = -760884959 ) @Export("loginBoxX") static int loginBoxX; - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -332178951 - ) - @Export("loginBoxCenter") - static int loginBoxCenter; - @ObfuscatedName("t") - @ObfuscatedGetter( - intValue = -910177377 + intValue = 496089237 ) @Export("Login_loadingPercent") static int Login_loadingPercent; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("Login_loadingText") static String Login_loadingText; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1417433861 + intValue = -1163892197 ) - static int field1212; - @ObfuscatedName("ab") + static int field1210; + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 641478857 + intValue = -608933825 ) static int field1213; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = 1431585767 + intValue = 662808535 ) @Export("loginIndex") static int loginIndex; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("Login_response0") static String Login_response0; - @ObfuscatedName("ap") + @ObfuscatedName("al") @Export("Login_response1") static String Login_response1; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("Login_response2") static String Login_response2; - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("Login_response3") static String Login_response3; - @ObfuscatedName("ac") + @ObfuscatedName("ax") @Export("Login_username") static String Login_username; - @ObfuscatedName("av") + @ObfuscatedName("as") @Export("Login_password") static String Login_password; - @ObfuscatedName("ay") - static boolean field1209; - @ObfuscatedName("au") - static boolean field1231; - @ObfuscatedName("bh") + @ObfuscatedName("af") + static boolean field1224; + @ObfuscatedName("ak") + static boolean field1201; + @ObfuscatedName("bc") static boolean field1223; - @ObfuscatedName("bg") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 543223437 + intValue = -189383965 ) @Export("currentLoginField") static int currentLoginField; - @ObfuscatedName("bd") + @ObfuscatedName("bg") @Export("worldSelectOpen") static boolean worldSelectOpen; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "[Lls;" + ) + @Export("worldSelectStars") + static IndexedSprite[] worldSelectStars; @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -2023703181 + intValue = -322396857 ) @Export("hoveredWorldIndex") static int hoveredWorldIndex; - @ObfuscatedName("bl") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 1751937613 + intValue = -1129392139 ) @Export("worldSelectPage") static int worldSelectPage; - @ObfuscatedName("bv") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 212340177 + intValue = 1846745523 ) @Export("worldSelectPagesCount") static int worldSelectPagesCount; - @ObfuscatedName("bz") + @ObfuscatedName("bq") @ObfuscatedGetter( - longValue = -3011856150050162759L + longValue = -4736688833894642183L ) - static long field1204; - @ObfuscatedName("bu") + static long field1232; + @ObfuscatedName("by") @ObfuscatedGetter( - longValue = -7097171070724115481L + longValue = -2848820817006551463L ) - static long field1211; + static long field1233; static { - xPadding = 0; - loginBoxX = xPadding + 202; - Login_loadingPercent = 10; - Login_loadingText = ""; - field1212 = -1; - field1213 = 1; - loginIndex = 0; - Login_response0 = ""; - Login_response1 = ""; - Login_response2 = ""; - Login_response3 = ""; - Login_username = ""; - Login_password = ""; - field1209 = false; - field1231 = false; - field1223 = true; - currentLoginField = 0; - worldSelectOpen = false; - hoveredWorldIndex = -1; - worldSelectPage = 0; - worldSelectPagesCount = 0; - new DecimalFormat("##0.00"); + xPadding = 0; // L: 38 + loginBoxX = xPadding + 202; // L: 55 + Login_loadingPercent = 10; // L: 57 + Login_loadingText = ""; // L: 58 + field1210 = -1; // L: 65 + field1213 = 1; // L: 68 + loginIndex = 0; // L: 72 + Login_response0 = ""; // L: 73 + Login_response1 = ""; // L: 74 + Login_response2 = ""; // L: 75 + Login_response3 = ""; // L: 76 + Login_username = ""; // L: 77 + Login_password = ""; // L: 78 + field1224 = false; // L: 85 + field1201 = false; // L: 86 + field1223 = true; // L: 89 + currentLoginField = 0; // L: 90 + worldSelectOpen = false; // L: 94 + hoveredWorldIndex = -1; // L: 102 + worldSelectPage = 0; // L: 103 + worldSelectPagesCount = 0; // L: 104 + new DecimalFormat("##0.00"); // L: 107 new class171(); - field1204 = -1L; - field1211 = -1L; + field1232 = -1L; // L: 115 + field1233 = -1L; // L: 116 } - @ObfuscatedName("m") + @ObfuscatedName("gm") @ObfuscatedSignature( - descriptor = "(IIILga;Lfz;Z[I[IB)I", - garbageValue = "0" + descriptor = "(I)V", + garbageValue = "942552334" ) - public static int method2235(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { - int var9; - for (int var8 = 0; var8 < 128; ++var8) { - for (var9 = 0; var9 < 128; ++var9) { - class182.directions[var8][var9] = 0; - class182.distances[var8][var9] = 99999999; - } - } - - boolean var27; - if (var2 == 1) { - var27 = Interpreter.method2112(var0, var1, var3, var4); - } else if (var2 == 2) { - var27 = method2234(var0, var1, var3, var4); - } else { - var27 = World.method1856(var0, var1, var2, var3, var4); - } - - var9 = var0 - 64; - int var10 = var1 - 64; - int var11 = class182.field2132; - int var12 = GrandExchangeOfferOwnWorldComparator.field666; - int var13; - int var14; - int var16; - if (!var27) { - var13 = Integer.MAX_VALUE; - var14 = Integer.MAX_VALUE; - byte var15 = 10; - var16 = var3.approxDestinationX; - int var17 = var3.approxDestinationY; - int var18 = var3.approxDestinationSizeX; - int var19 = var3.approxDestinationSizeY; - - for (int var20 = var16 - var15; var20 <= var16 + var15; ++var20) { - for (int var21 = var17 - var15; var21 <= var17 + var15; ++var21) { - int var22 = var20 - var9; - int var23 = var21 - var10; - if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class182.distances[var22][var23] < 100) { - int var24 = 0; - if (var20 < var16) { - var24 = var16 - var20; - } else if (var20 > var18 + var16 - 1) { - var24 = var20 - (var16 + var18 - 1); - } - - int var25 = 0; - if (var21 < var17) { - var25 = var17 - var21; - } else if (var21 > var19 + var17 - 1) { - var25 = var21 - (var19 + var17 - 1); - } - - int var26 = var24 * var24 + var25 * var25; - if (var26 < var13 || var13 == var26 && class182.distances[var22][var23] < var14) { - var13 = var26; - var14 = class182.distances[var22][var23]; - var11 = var20; - var12 = var21; + static final void method2160() { + for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) { // L: 4308 4309 4326 + if (var0.plane == Huffman.Client_plane && Client.cycle <= var0.cycleEnd) { // L: 4310 + if (Client.cycle >= var0.cycleStart) { // L: 4311 + if (var0.targetIndex > 0) { // L: 4312 + NPC var1 = Client.npcs[var0.targetIndex - 1]; // L: 4313 + if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) { // L: 4314 + var0.setDestination(var1.x, var1.y, ArchiveLoader.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle); } } - } - } - if (var13 == Integer.MAX_VALUE) { - return -1; + if (var0.targetIndex < 0) { // L: 4316 + int var2 = -var0.targetIndex - 1; // L: 4318 + Player var3; + if (var2 == Client.localPlayerIndex) { // L: 4319 + var3 = WorldMapLabelSize.localPlayer; + } else { + var3 = Client.players[var2]; // L: 4320 + } + + if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) { + var0.setDestination(var3.x, var3.y, ArchiveLoader.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle); // L: 4321 + } + } + + var0.advance(Client.field737); // L: 4323 + ScriptEvent.scene.drawEntity(Huffman.Client_plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false); // L: 4324 + } + } else { + var0.remove(); } } - if (var0 == var11 && var12 == var1) { - return 0; - } else { - byte var28 = 0; - class182.bufferX[var28] = var11; - var13 = var28 + 1; - class182.bufferY[var28] = var12; - - int var29; - for (var14 = var29 = class182.directions[var11 - var9][var12 - var10]; var0 != var11 || var12 != var1; var14 = class182.directions[var11 - var9][var12 - var10]) { - if (var14 != var29) { - var29 = var14; - class182.bufferX[var13] = var11; - class182.bufferY[var13++] = var12; - } - - if ((var14 & 2) != 0) { - ++var11; - } else if ((var14 & 8) != 0) { - --var11; - } - - if ((var14 & 1) != 0) { - ++var12; - } else if ((var14 & 4) != 0) { - --var12; - } - } - - var16 = 0; - - while (var13-- > 0) { - var6[var16] = class182.bufferX[var13]; - var7[var16++] = class182.bufferY[var13]; - if (var16 >= var6.length) { - break; - } - } - - return var16; - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IILga;Lfz;I)Z", - garbageValue = "783701635" - ) - static final boolean method2234(int var0, int var1, RouteStrategy var2, CollisionMap var3) { - int var4 = var0; - int var5 = var1; - byte var6 = 64; - byte var7 = 64; - int var8 = var0 - var6; - int var9 = var1 - var7; - class182.directions[var6][var7] = 99; - class182.distances[var6][var7] = 0; - byte var10 = 0; - int var11 = 0; - class182.bufferX[var10] = var0; - byte var10001 = var10; - int var18 = var10 + 1; - class182.bufferY[var10001] = var1; - int[][] var12 = var3.flags; - - while (var11 != var18) { - var4 = class182.bufferX[var11]; - var5 = class182.bufferY[var11]; - var11 = var11 + 1 & 4095; - int var16 = var4 - var8; - int var17 = var5 - var9; - int var13 = var4 - var3.xInset; - int var14 = var5 - var3.yInset; - if (var2.hasArrived(2, var4, var5, var3)) { - class182.field2132 = var4; - GrandExchangeOfferOwnWorldComparator.field666 = var5; - return true; - } - - int var15 = class182.distances[var16][var17] + 1; - if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { - class182.bufferX[var18] = var4 - 1; - class182.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class182.directions[var16 - 1][var17] = 2; - class182.distances[var16 - 1][var17] = var15; - } - - if (var16 < 126 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { - class182.bufferX[var18] = var4 + 1; - class182.bufferY[var18] = var5; - var18 = var18 + 1 & 4095; - class182.directions[var16 + 1][var17] = 8; - class182.distances[var16 + 1][var17] = var15; - } - - if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { - class182.bufferX[var18] = var4; - class182.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class182.directions[var16][var17 - 1] = 1; - class182.distances[var16][var17 - 1] = var15; - } - - if (var17 < 126 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { - class182.bufferX[var18] = var4; - class182.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class182.directions[var16][var17 + 1] = 4; - class182.distances[var16][var17 + 1] = var15; - } - - if (var16 > 0 && var17 > 0 && class182.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { - class182.bufferX[var18] = var4 - 1; - class182.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class182.directions[var16 - 1][var17 - 1] = 3; - class182.distances[var16 - 1][var17 - 1] = var15; - } - - if (var16 < 126 && var17 > 0 && class182.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { - class182.bufferX[var18] = var4 + 1; - class182.bufferY[var18] = var5 - 1; - var18 = var18 + 1 & 4095; - class182.directions[var16 + 1][var17 - 1] = 9; - class182.distances[var16 + 1][var17 - 1] = var15; - } - - if (var16 > 0 && var17 < 126 && class182.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { - class182.bufferX[var18] = var4 - 1; - class182.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class182.directions[var16 - 1][var17 + 1] = 6; - class182.distances[var16 - 1][var17 + 1] = var15; - } - - if (var16 < 126 && var17 < 126 && class182.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { - class182.bufferX[var18] = var4 + 1; - class182.bufferY[var18] = var5 + 1; - var18 = var18 + 1 & 4095; - class182.directions[var16 + 1][var17 + 1] = 12; - class182.distances[var16 + 1][var17 + 1] = var15; - } - } - - class182.field2132 = var4; - GrandExchangeOfferOwnWorldComparator.field666 = var5; - return false; - } + } // L: 4328 } diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java index 844337a44c..4cf99c9397 100644 --- a/runescape-client/src/main/java/LoginPacket.java +++ b/runescape-client/src/main/java/LoginPacket.java @@ -4,94 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gx") +@ObfuscatedName("gc") @Implements("LoginPacket") public class LoginPacket implements class190 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lgc;" ) - public static final LoginPacket field2352; - @ObfuscatedName("o") + public static final LoginPacket field2360; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lgc;" ) static final LoginPacket field2350; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lgc;" ) - public static final LoginPacket field2347; - @ObfuscatedName("j") + public static final LoginPacket field2351; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lgc;" ) - public static final LoginPacket field2348; - @ObfuscatedName("p") + public static final LoginPacket field2352; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lgc;" ) - public static final LoginPacket field2345; - @ObfuscatedName("g") + public static final LoginPacket field2353; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgx;" + descriptor = "Lgc;" ) - static final LoginPacket field2346; - @ObfuscatedName("u") + static final LoginPacket field2354; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lgx;" + descriptor = "[Lgc;" ) @Export("LoginPacket_indexedValues") static final LoginPacket[] LoginPacket_indexedValues; - @ObfuscatedName("n") + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("compass") + static Sprite compass; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -444496991 + intValue = -176591909 ) @Export("id") public final int id; static { - field2352 = new LoginPacket(14, 0); - field2350 = new LoginPacket(15, 4); - field2347 = new LoginPacket(16, -2); - field2348 = new LoginPacket(18, -2); - field2345 = new LoginPacket(19, -2); - field2346 = new LoginPacket(27, 0); - LoginPacket_indexedValues = new LoginPacket[32]; - LoginPacket[] var0 = UserComparator9.method3512(); + field2360 = new LoginPacket(14, 0); // L: 5 + field2350 = new LoginPacket(15, 4); // L: 6 + field2351 = new LoginPacket(16, -2); // L: 7 + field2352 = new LoginPacket(18, -2); // L: 8 + field2353 = new LoginPacket(19, -2); // L: 9 + field2354 = new LoginPacket(27, 0); // L: 10 + LoginPacket_indexedValues = new LoginPacket[32]; // L: 12 + LoginPacket[] var0 = new LoginPacket[]{field2353, field2352, field2360, field2354, field2351, field2350}; // L: 17 + LoginPacket[] var1 = var0; // L: 19 - for (int var1 = 0; var1 < var0.length; ++var1) { - LoginPacket_indexedValues[var0[var1].id] = var0[var1]; + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 20 + LoginPacket_indexedValues[var1[var2].id] = var1[var2]; // L: 21 } - } + } // L: 23 @ObfuscatedSignature( descriptor = "(II)V", garbageValue = "0" ) LoginPacket(int var1, int var2) { - this.id = var1; - } + this.id = var1; // L: 26 + } // L: 27 - @ObfuscatedName("m") + @ObfuscatedName("gw") @ObfuscatedSignature( - descriptor = "(II)Lik;", - garbageValue = "-729077438" + descriptor = "(I)Z", + garbageValue = "1633158926" ) - public static HealthBarDefinition method3745(int var0) { - HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); - var1 = new HealthBarDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); - return var1; - } + static boolean method3707() { + return (Client.drawPlayerNames & 4) != 0; // L: 4401 } } diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java index 607f755499..f3c1821a82 100644 --- a/runescape-client/src/main/java/LoginScreenAnimation.java +++ b/runescape-client/src/main/java/LoginScreenAnimation.java @@ -3,266 +3,269 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("cw") +@ObfuscatedName("cv") @Implements("LoginScreenAnimation") public class LoginScreenAnimation { - @ObfuscatedName("mc") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = -1226274359 + intValue = -1927847537 ) - @Export("selectedItemSlot") - static int selectedItemSlot; - @ObfuscatedName("m") + static int field1070; + @ObfuscatedName("et") + @ObfuscatedGetter( + intValue = -2129317287 + ) + static int field1076; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[Llh;" + descriptor = "[Lls;" ) @Export("sprites") IndexedSprite[] sprites; - @ObfuscatedName("n") + @ObfuscatedName("x") int[] field1075; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1093888655 - ) - int field1070; - @ObfuscatedName("a") - int[] field1062; - @ObfuscatedName("z") - int[] field1063; @ObfuscatedName("w") - int[] field1061; - @ObfuscatedName("y") - int[] field1065; - @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1116180601 + intValue = -1085104337 ) - int field1066; + int field1062; + @ObfuscatedName("g") + int[] field1063; + @ObfuscatedName("m") + int[] field1064; + @ObfuscatedName("n") + int[] field1065; + @ObfuscatedName("d") + int[] field1069; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 2041048793 + intValue = -1554150183 ) - int field1064; - @ObfuscatedName("k") - int[] field1056; - @ObfuscatedName("r") - int[] field1069; - @ObfuscatedName("s") - int[] field1067; - @ObfuscatedName("v") - int[] field1071; - @ObfuscatedName("d") + int field1060; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1998997321 + intValue = -1740894799 ) int field1068; - @ObfuscatedName("e") + @ObfuscatedName("q") + int[] field1058; + @ObfuscatedName("c") + int[] field1066; + @ObfuscatedName("f") + int[] field1071; + @ObfuscatedName("y") + int[] field1072; + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -2027294175 + intValue = 1648829389 ) int field1073; - @ObfuscatedName("l") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1633825307 + intValue = -1867891509 ) int field1074; + @ObfuscatedName("r") + @ObfuscatedGetter( + intValue = -554680455 + ) + int field1077; @ObfuscatedSignature( - descriptor = "([Llh;)V" + descriptor = "([Lls;)V" ) LoginScreenAnimation(IndexedSprite[] var1) { - this.field1075 = new int[256]; - this.field1070 = 0; - this.field1066 = 0; - this.field1064 = 0; - this.field1068 = 0; - this.field1073 = 0; - this.field1074 = 0; - this.sprites = var1; - this.initColors(); - } + this.field1075 = new int[256]; // L: 13 + this.field1062 = 0; // L: 14 + this.field1060 = 0; // L: 19 + this.field1068 = 0; // L: 20 + this.field1073 = 0; // L: 25 + this.field1074 = 0; // L: 26 + this.field1077 = 0; // L: 27 + this.sprites = var1; // L: 30 + this.initColors(); // L: 31 + } // L: 32 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-16" + garbageValue = "87" ) @Export("initColors") void initColors() { - this.field1063 = new int[256]; + this.field1064 = new int[256]; // L: 35 int var1; - for (var1 = 0; var1 < 64; ++var1) { - this.field1063[var1] = var1 * 262144; + for (var1 = 0; var1 < 64; ++var1) { // L: 36 + this.field1064[var1] = var1 * 262144; } - for (var1 = 0; var1 < 64; ++var1) { - this.field1063[var1 + 64] = var1 * 1024 + 16711680; + for (var1 = 0; var1 < 64; ++var1) { // L: 37 + this.field1064[var1 + 64] = var1 * 1024 + 16711680; } - for (var1 = 0; var1 < 64; ++var1) { - this.field1063[var1 + 128] = var1 * 4 + 16776960; + for (var1 = 0; var1 < 64; ++var1) { // L: 38 + this.field1064[var1 + 128] = var1 * 4 + 16776960; } - for (var1 = 0; var1 < 64; ++var1) { - this.field1063[var1 + 192] = 16777215; + for (var1 = 0; var1 < 64; ++var1) { // L: 39 + this.field1064[var1 + 192] = 16777215; } - this.field1061 = new int[256]; + this.field1065 = new int[256]; // L: 40 - for (var1 = 0; var1 < 64; ++var1) { - this.field1061[var1] = var1 * 1024; + for (var1 = 0; var1 < 64; ++var1) { // L: 41 + this.field1065[var1] = var1 * 1024; } - for (var1 = 0; var1 < 64; ++var1) { - this.field1061[var1 + 64] = var1 * 4 + 65280; + for (var1 = 0; var1 < 64; ++var1) { // L: 42 + this.field1065[var1 + 64] = var1 * 4 + 65280; } - for (var1 = 0; var1 < 64; ++var1) { - this.field1061[var1 + 128] = var1 * 262144 + 65535; + for (var1 = 0; var1 < 64; ++var1) { // L: 43 + this.field1065[var1 + 128] = var1 * 262144 + 65535; } - for (var1 = 0; var1 < 64; ++var1) { - this.field1061[var1 + 192] = 16777215; - } - - this.field1065 = new int[256]; - - for (var1 = 0; var1 < 64; ++var1) { - this.field1065[var1] = var1 * 4; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1065[var1 + 64] = var1 * 262144 + 255; - } - - for (var1 = 0; var1 < 64; ++var1) { - this.field1065[var1 + 128] = var1 * 1024 + 16711935; - } - - for (var1 = 0; var1 < 64; ++var1) { + for (var1 = 0; var1 < 64; ++var1) { // L: 44 this.field1065[var1 + 192] = 16777215; } - this.field1062 = new int[256]; - this.field1068 = 0; - this.field1067 = new int[32768]; - this.field1071 = new int[32768]; - this.method1885((IndexedSprite)null); - this.field1056 = new int[32768]; - this.field1069 = new int[32768]; - } + this.field1069 = new int[256]; // L: 45 - @ObfuscatedName("o") + for (var1 = 0; var1 < 64; ++var1) { // L: 46 + this.field1069[var1] = var1 * 4; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 47 + this.field1069[var1 + 64] = var1 * 262144 + 255; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 48 + this.field1069[var1 + 128] = var1 * 1024 + 16711935; + } + + for (var1 = 0; var1 < 64; ++var1) { // L: 49 + this.field1069[var1 + 192] = 16777215; + } + + this.field1063 = new int[256]; // L: 50 + this.field1073 = 0; // L: 51 + this.field1071 = new int[32768]; // L: 52 + this.field1072 = new int[32768]; // L: 53 + this.method1881((IndexedSprite)null); // L: 54 + this.field1058 = new int[32768]; // L: 55 + this.field1066 = new int[32768]; // L: 56 + } // L: 57 + + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2116735890" + garbageValue = "268957642" ) - void method1878() { - this.field1063 = null; - this.field1061 = null; - this.field1065 = null; - this.field1062 = null; - this.field1067 = null; - this.field1071 = null; - this.field1056 = null; - this.field1069 = null; - this.field1068 = 0; - this.field1073 = 0; - } + void method1904() { + this.field1064 = null; // L: 60 + this.field1065 = null; // L: 61 + this.field1069 = null; // L: 62 + this.field1063 = null; // L: 63 + this.field1071 = null; // L: 64 + this.field1072 = null; // L: 65 + this.field1058 = null; // L: 66 + this.field1066 = null; // L: 67 + this.field1073 = 0; // L: 68 + this.field1074 = 0; // L: 69 + } // L: 70 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1329214185" + descriptor = "(IIB)V", + garbageValue = "0" ) @Export("draw") void draw(int var1, int var2) { - if (this.field1056 == null) { - this.initColors(); + if (this.field1058 == null) { // L: 73 + this.initColors(); // L: 74 } - if (this.field1074 == 0) { - this.field1074 = var2; + if (this.field1077 == 0) { // L: 76 + this.field1077 = var2; // L: 77 } - int var3 = var2 - this.field1074; - if (var3 >= 256) { + int var3 = var2 - this.field1077; // L: 79 + if (var3 >= 256) { // L: 80 var3 = 0; } - this.field1074 = var2; - if (var3 > 0) { - this.method1880(var3); + this.field1077 = var2; // L: 81 + if (var3 > 0) { // L: 82 + this.method1877(var3); // L: 83 } - this.method1882(var1); - } + this.method1880(var1); // L: 85 + } // L: 86 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-305399146" + garbageValue = "-1223871781" ) - final void method1880(int var1) { - this.field1068 += 128 * var1; + final void method1877(int var1) { + this.field1073 += 128 * var1; // L: 89 int var2; - if (this.field1068 > this.field1067.length) { - this.field1068 -= this.field1067.length; - var2 = (int)(Math.random() * 12.0D); - this.method1885(this.sprites[var2]); + if (this.field1073 > this.field1071.length) { // L: 90 + this.field1073 -= this.field1071.length; // L: 91 + var2 = (int)(Math.random() * 12.0D); // L: 92 + this.method1881(this.sprites[var2]); // L: 93 } - var2 = 0; - int var3 = var1 * 128; - int var4 = (256 - var1) * 128; + var2 = 0; // L: 95 + int var3 = var1 * 128; // L: 96 + int var4 = (256 - var1) * 128; // L: 97 int var6; - for (int var5 = 0; var5 < var4; ++var5) { - var6 = this.field1056[var3 + var2] - this.field1067[var2 + this.field1068 & this.field1067.length - 1] * var1 / 6; - if (var6 < 0) { + for (int var5 = 0; var5 < var4; ++var5) { // L: 98 + var6 = this.field1058[var2 + var3] - this.field1071[var2 + this.field1073 & this.field1071.length - 1] * var1 / 6; // L: 99 + if (var6 < 0) { // L: 100 var6 = 0; } - this.field1056[var2++] = var6; + this.field1058[var2++] = var6; // L: 101 } - byte var15 = 10; - var6 = 128 - var15; + byte var15 = 10; // L: 103 + var6 = 128 - var15; // L: 104 int var7; int var10; - for (var7 = 256 - var1; var7 < 256; ++var7) { - int var8 = var7 * 128; + for (var7 = 256 - var1; var7 < 256; ++var7) { // L: 105 + int var8 = var7 * 128; // L: 106 - for (int var9 = 0; var9 < 128; ++var9) { - var10 = (int)(Math.random() * 100.0D); - if (var10 < 50 && var9 > var15 && var9 < var6) { - this.field1056[var8 + var9] = 255; + for (int var9 = 0; var9 < 128; ++var9) { // L: 107 + var10 = (int)(Math.random() * 100.0D); // L: 108 + if (var10 < 50 && var9 > var15 && var9 < var6) { // L: 109 + this.field1058[var8 + var9] = 255; } else { - this.field1056[var9 + var8] = 0; + this.field1058[var8 + var9] = 0; // L: 110 } } } - if (this.field1066 > 0) { - this.field1066 -= var1 * 4; + if (this.field1060 > 0) { // L: 113 + this.field1060 -= var1 * 4; } - if (this.field1064 > 0) { - this.field1064 -= var1 * 4; + if (this.field1068 > 0) { // L: 114 + this.field1068 -= var1 * 4; } - if (this.field1066 == 0 && this.field1064 == 0) { - var7 = (int)(Math.random() * (double)(2000 / var1)); - if (var7 == 0) { - this.field1066 = 1024; + if (this.field1060 == 0 && this.field1068 == 0) { // L: 115 + var7 = (int)(Math.random() * (double)(2000 / var1)); // L: 116 + if (var7 == 0) { // L: 117 + this.field1060 = 1024; } - if (var7 == 1) { - this.field1064 = 1024; + if (var7 == 1) { // L: 118 + this.field1068 = 1024; } } @@ -271,481 +274,238 @@ public class LoginScreenAnimation { } for (var7 = 256 - var1; var7 < 256; ++var7) { - this.field1075[var7] = (int)(Math.sin((double)this.field1070 / 14.0D) * 16.0D + Math.sin((double)this.field1070 / 15.0D) * 14.0D + Math.sin((double)this.field1070 / 16.0D) * 12.0D); - ++this.field1070; + this.field1075[var7] = (int)(Math.sin((double)this.field1062 / 14.0D) * 16.0D + Math.sin((double)this.field1062 / 15.0D) * 14.0D + Math.sin((double)this.field1062 / 16.0D) * 12.0D); + ++this.field1062; } - this.field1073 += var1; - var7 = ((Client.cycle & 1) + var1) / 2; - if (var7 > 0) { - short var16 = 128; - byte var17 = 2; - var10 = 128 - var17 - var17; + this.field1074 += var1; // L: 125 + var7 = ((Client.cycle & 1) + var1) / 2; // L: 126 + if (var7 > 0) { // L: 127 + short var16 = 128; // L: 128 + byte var17 = 2; // L: 129 + var10 = 128 - var17 - var17; // L: 130 int var11; int var12; int var13; - for (var11 = 0; var11 < this.field1073 * 100; ++var11) { - var12 = (int)(Math.random() * (double)var10) + var17; - var13 = (int)(Math.random() * (double)var16) + var16; - this.field1056[var12 + (var13 << 7)] = 192; + for (var11 = 0; var11 < this.field1074 * 100; ++var11) { // L: 131 + var12 = (int)(Math.random() * (double)var10) + var17; // L: 132 + var13 = (int)(Math.random() * (double)var16) + var16; // L: 133 + this.field1058[var12 + (var13 << 7)] = 192; // L: 134 } - this.field1073 = 0; + this.field1074 = 0; // L: 136 int var14; - for (var11 = 0; var11 < 256; ++var11) { - var12 = 0; - var13 = var11 * 128; + for (var11 = 0; var11 < 256; ++var11) { // L: 137 + var12 = 0; // L: 138 + var13 = var11 * 128; // L: 139 - for (var14 = -var7; var14 < 128; ++var14) { - if (var14 + var7 < 128) { - var12 += this.field1056[var7 + var13 + var14]; + for (var14 = -var7; var14 < 128; ++var14) { // L: 140 + if (var7 + var14 < 128) { // L: 141 + var12 += this.field1058[var7 + var14 + var13]; } - if (var14 - (var7 + 1) >= 0) { - var12 -= this.field1056[var13 + var14 - (var7 + 1)]; + if (var14 - (var7 + 1) >= 0) { // L: 142 + var12 -= this.field1058[var13 + var14 - (var7 + 1)]; } - if (var14 >= 0) { - this.field1069[var13 + var14] = var12 / (var7 * 2 + 1); + if (var14 >= 0) { // L: 143 + this.field1066[var14 + var13] = var12 / (var7 * 2 + 1); } } } - for (var11 = 0; var11 < 128; ++var11) { - var12 = 0; + for (var11 = 0; var11 < 128; ++var11) { // L: 146 + var12 = 0; // L: 147 - for (var13 = -var7; var13 < 256; ++var13) { - var14 = var13 * 128; - if (var13 + var7 < 256) { - var12 += this.field1069[var7 * 128 + var14 + var11]; + for (var13 = -var7; var13 < 256; ++var13) { // L: 148 + var14 = var13 * 128; // L: 149 + if (var7 + var13 < 256) { // L: 150 + var12 += this.field1066[var14 + var11 + var7 * 128]; } - if (var13 - (var7 + 1) >= 0) { - var12 -= this.field1069[var11 + var14 - (var7 + 1) * 128]; + if (var13 - (var7 + 1) >= 0) { // L: 151 + var12 -= this.field1066[var14 + var11 - (var7 + 1) * 128]; } - if (var13 >= 0) { - this.field1056[var11 + var14] = var12 / (var7 * 2 + 1); + if (var13 >= 0) { // L: 152 + this.field1058[var11 + var14] = var12 / (var7 * 2 + 1); } } } } - } + } // L: 156 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIII)I", - garbageValue = "353428721" + garbageValue = "-1180038945" ) - final int method1891(int var1, int var2, int var3) { - int var4 = 256 - var3; - return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var3 * (var2 & 16711935) + var4 * (var1 & 16711935) & -16711936) >> 8; + final int method1878(int var1, int var2, int var3) { + int var4 = 256 - var3; // L: 159 + return (var3 * (var2 & 65280) + var4 * (var1 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8; // L: 160 } + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "714944672" + ) + final void method1880(int var1) { + int var2 = this.field1063.length; // L: 164 + if (this.field1060 > 0) { // L: 165 + this.method1903(this.field1060, this.field1065); // L: 166 + } else if (this.field1068 > 0) { // L: 168 + this.method1903(this.field1068, this.field1069); // L: 169 + } else { + for (int var3 = 0; var3 < var2; ++var3) { // L: 172 + this.field1063[var3] = this.field1064[var3]; + } + } + + this.method1896(var1); // L: 174 + } // L: 175 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I[II)V", + garbageValue = "-563057357" + ) + final void method1903(int var1, int[] var2) { + int var3 = this.field1063.length; // L: 178 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 179 + if (var1 > 768) { // L: 180 + this.field1063[var4] = this.method1878(this.field1064[var4], var2[var4], 1024 - var1); + } else if (var1 > 256) { + this.field1063[var4] = var2[var4]; // L: 181 + } else { + this.field1063[var4] = this.method1878(var2[var4], this.field1064[var4], 256 - var1); // L: 182 + } + } + + } // L: 184 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IS)V", + garbageValue = "19083" + ) + final void method1896(int var1) { + int var2 = 0; // L: 187 + + for (int var3 = 1; var3 < 255; ++var3) { // L: 188 + int var4 = (256 - var3) * this.field1075[var3] / 256; // L: 189 + int var5 = var4 + var1; // L: 190 + int var6 = 0; // L: 191 + int var7 = 128; // L: 192 + if (var5 < 0) { // L: 193 + var6 = -var5; // L: 194 + var5 = 0; // L: 195 + } + + if (var5 + 128 >= WorldMapSprite.rasterProvider.width) { // L: 197 + var7 = WorldMapSprite.rasterProvider.width - var5; // L: 198 + } + + int var8 = var5 + (var3 + 8) * WorldMapSprite.rasterProvider.width; // L: 200 + var2 += var6; // L: 201 + + for (int var9 = var6; var9 < var7; ++var9) { // L: 202 + int var10 = this.field1058[var2++]; // L: 203 + int var11 = var8 % Rasterizer2D.Rasterizer2D_width; // L: 204 + if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 205 + int var12 = var10; // L: 206 + int var13 = 256 - var10; // L: 207 + var10 = this.field1063[var10]; // L: 208 + int var14 = WorldMapSprite.rasterProvider.pixels[var8]; // L: 209 + WorldMapSprite.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) >> 8; // L: 210 + } else { + ++var8; // L: 212 + } + } + + var2 += 128 - var7; // L: 214 + } + + } // L: 216 + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "40685678" + descriptor = "(Lls;I)V", + garbageValue = "-1439965330" ) - final void method1882(int var1) { - int var2 = this.field1062.length; - if (this.field1066 > 0) { - this.method1886(this.field1066, this.field1061); - } else if (this.field1064 > 0) { - this.method1886(this.field1064, this.field1065); - } else { - for (int var3 = 0; var3 < var2; ++var3) { - this.field1062[var3] = this.field1063[var3]; - } - } - - this.method1884(var1); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I[IB)V", - garbageValue = "41" - ) - final void method1886(int var1, int[] var2) { - int var3 = this.field1062.length; - - for (int var4 = 0; var4 < var3; ++var4) { - if (var1 > 768) { - this.field1062[var4] = this.method1891(this.field1063[var4], var2[var4], 1024 - var1); - } else if (var1 > 256) { - this.field1062[var4] = var2[var4]; - } else { - this.field1062[var4] = this.method1891(var2[var4], this.field1063[var4], 256 - var1); - } - } - - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "15252473" - ) - final void method1884(int var1) { - int var2 = 0; - - for (int var3 = 1; var3 < 255; ++var3) { - int var4 = (256 - var3) * this.field1075[var3] / 256; - int var5 = var4 + var1; - int var6 = 0; - int var7 = 128; - if (var5 < 0) { - var6 = -var5; - var5 = 0; - } - - if (var5 + 128 >= ArchiveLoader.rasterProvider.width) { - var7 = ArchiveLoader.rasterProvider.width - var5; - } - - int var8 = var5 + (var3 + 8) * ArchiveLoader.rasterProvider.width; - var2 += var6; - - for (int var9 = var6; var9 < var7; ++var9) { - int var10 = this.field1056[var2++]; - int var11 = var8 % Rasterizer2D.Rasterizer2D_width; - if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) { - int var12 = var10; - int var13 = 256 - var10; - var10 = this.field1062[var10]; - int var14 = ArchiveLoader.rasterProvider.pixels[var8]; - ArchiveLoader.rasterProvider.pixels[var8++] = -16777216 | (var13 * (var14 & 65280) + var12 * (var10 & 65280) & 16711680) + ((var14 & 16711935) * var13 + (var10 & 16711935) * var12 & -16711936) >> 8; - } else { - ++var8; - } - } - - var2 += 128 - var7; - } - - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Llh;I)V", - garbageValue = "-760749522" - ) - final void method1885(IndexedSprite var1) { + final void method1881(IndexedSprite var1) { int var2; - for (var2 = 0; var2 < this.field1067.length; ++var2) { - this.field1067[var2] = 0; + for (var2 = 0; var2 < this.field1071.length; ++var2) { // L: 219 + this.field1071[var2] = 0; } int var3; - for (var2 = 0; var2 < 5000; ++var2) { - var3 = (int)(Math.random() * 128.0D * 256.0D); - this.field1067[var3] = (int)(Math.random() * 256.0D); + for (var2 = 0; var2 < 5000; ++var2) { // L: 220 + var3 = (int)(Math.random() * 128.0D * 256.0D); // L: 221 + this.field1071[var3] = (int)(Math.random() * 256.0D); // L: 222 } int var4; int var5; - for (var2 = 0; var2 < 20; ++var2) { - for (var3 = 1; var3 < 255; ++var3) { - for (var4 = 1; var4 < 127; ++var4) { - var5 = var4 + (var3 << 7); - this.field1071[var5] = (this.field1067[var5 + 128] + this.field1067[var5 - 128] + this.field1067[var5 + 1] + this.field1067[var5 - 1]) / 4; + for (var2 = 0; var2 < 20; ++var2) { // L: 224 + for (var3 = 1; var3 < 255; ++var3) { // L: 225 + for (var4 = 1; var4 < 127; ++var4) { // L: 226 + var5 = var4 + (var3 << 7); // L: 227 + this.field1072[var5] = (this.field1071[var5 + 1] + this.field1071[var5 - 128] + this.field1071[var5 + 128] + this.field1071[var5 - 1]) / 4; // L: 228 } } - int[] var8 = this.field1067; - this.field1067 = this.field1071; - this.field1071 = var8; + int[] var8 = this.field1071; // L: 231 + this.field1071 = this.field1072; // L: 232 + this.field1072 = var8; // L: 233 } - if (var1 != null) { - var2 = 0; + if (var1 != null) { // L: 235 + var2 = 0; // L: 236 - for (var3 = 0; var3 < var1.subHeight; ++var3) { - for (var4 = 0; var4 < var1.subWidth; ++var4) { - if (var1.pixels[var2++] != 0) { - var5 = var4 + var1.xOffset + 16; - int var6 = var3 + var1.yOffset + 16; - int var7 = var5 + (var6 << 7); - this.field1067[var7] = 0; + for (var3 = 0; var3 < var1.subHeight; ++var3) { // L: 237 + for (var4 = 0; var4 < var1.subWidth; ++var4) { // L: 238 + if (var1.pixels[var2++] != 0) { // L: 239 + var5 = var4 + var1.xOffset + 16; // L: 240 + int var6 = var3 + var1.yOffset + 16; // L: 241 + int var7 = var5 + (var6 << 7); // L: 242 + this.field1071[var7] = 0; // L: 243 } } } } - } + } // L: 248 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([BIIIIIII[Lfz;I)V", - garbageValue = "66216788" + descriptor = "(CB)C", + garbageValue = "29" ) - static final void method1879(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) { - int var10; - for (int var9 = 0; var9 < 8; ++var9) { - for (var10 = 0; var10 < 8; ++var10) { - if (var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) { - int[] var10000 = var8[var1].flags[var9 + var2]; - var10000[var10 + var3] &= -16777217; - } - } - } - - Buffer var21 = new Buffer(var0); - - for (var10 = 0; var10 < 4; ++var10) { - for (int var11 = 0; var11 < 64; ++var11) { - for (int var12 = 0; var12 < 64; ++var12) { - if (var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) { - int var15 = var2 + TilePaint.method3187(var11 & 7, var12 & 7, var7); - int var18 = var11 & 7; - int var19 = var12 & 7; - int var20 = var7 & 3; - int var17; - if (var20 == 0) { - var17 = var19; - } else if (var20 == 1) { - var17 = 7 - var18; - } else if (var20 == 2) { - var17 = 7 - var19; - } else { - var17 = var18; - } - - AbstractArchive.loadTerrain(var21, var1, var15, var17 + var3, 0, 0, var7); - } else { - AbstractArchive.loadTerrain(var21, 0, -1, -1, 0, 0, 0); - } - } - } - } - - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "-83" - ) - static void method1908(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - var1.remove(); - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-49" - ) - static void method1906() { - Messages.Messages_channels.clear(); - Messages.Messages_hashTable.clear(); - Messages.Messages_queue.clear(); - Messages.Messages_count = 0; - } - - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "-1332294124" - ) - static int method1883(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection3.loadWorlds() ? 1 : 0; - return 1; + static char method1879(char var0) { + if (var0 == 198) { // L: 119 + return 'E'; + } else if (var0 == 230) { // L: 120 + return 'e'; + } else if (var0 == 223) { + return 's'; // L: 121 + } else if (var0 == 338) { // L: 122 + return 'E'; } else { - World var3; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var3 = FontName.worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var3 = class3.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else { - World var4; - int var5; - int var7; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var4 = null; - - for (var5 = 0; var5 < World.World_count; ++var5) { - if (var7 == class13.World_worlds[var5].id) { - var4 = class13.World_worlds[var5]; - break; - } - } - - if (var4 != null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - UrlRequester.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3] == 1; - WorldMapSection1.sortWorldList(var7, var10, var5, var6); - return 1; - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else { - int var8; - ParamDefinition var9; - if (var0 == ScriptOpcodes.NC_PARAM) { - UrlRequester.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var9 = VarbitDefinition.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = StudioGame.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = StudioGame.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.LC_PARAM) { - UrlRequester.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var9 = VarbitDefinition.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = Canvas.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Canvas.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_PARAM) { - UrlRequester.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var9 = VarbitDefinition.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = KitDefinition.ItemDefinition_get(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = KitDefinition.ItemDefinition_get(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { - UrlRequester.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var9 = VarbitDefinition.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = class224.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class224.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.clientType & 3; - return 1; - } else if (var0 == 6520) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { - return 1; - } else if (var0 == 6522) { - --WorldMapEvent.Interpreter_stringStackSize; - --UrlRequester.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --WorldMapEvent.Interpreter_stringStackSize; - --UrlRequester.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; - return 1; - } else { - return 2; - } - } - } else { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.World_count) { - var4 = class13.World_worlds[var7]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } - } + return (char)(var0 == 339 ? 'e' : '\u0000'); // L: 123 124 } } + + @ObfuscatedName("hy") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "-1831741176" + ) + static boolean method1905(int var0) { + return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30; // L: 8279 + } } diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java index f316c2f340..5e736eeb97 100644 --- a/runescape-client/src/main/java/LoginType.java +++ b/runescape-client/src/main/java/LoginType.java @@ -4,89 +4,89 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mo") +@ObfuscatedName("mu") @Implements("LoginType") public class LoginType { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) @Export("oldscape") public static final LoginType oldscape; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) - static final LoginType field4052; - @ObfuscatedName("q") + static final LoginType field4059; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) static final LoginType field4056; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) - static final LoginType field4054; - @ObfuscatedName("p") + static final LoginType field4057; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) static final LoginType field4058; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" + ) + static final LoginType field4064; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lmu;" ) static final LoginType field4055; - @ObfuscatedName("n") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lmo;" - ) - static final LoginType field4053; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) static final LoginType field4061; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "Lmu;" ) - public static final LoginType field4059; - @ObfuscatedName("z") + public static final LoginType field4062; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -138904115 + intValue = -430747297 ) - final int field4060; - @ObfuscatedName("w") - final String field4051; + final int field4063; + @ObfuscatedName("n") + final String field4054; static { - oldscape = new LoginType(7, 0, "", ""); - field4052 = new LoginType(2, 1, "", ""); - field4056 = new LoginType(6, 2, "", ""); - field4054 = new LoginType(8, 3, "", ""); - field4058 = new LoginType(1, 4, "", ""); - field4055 = new LoginType(4, 5, "", ""); - field4053 = new LoginType(0, 6, "", ""); - field4061 = new LoginType(3, 7, "", ""); - field4059 = new LoginType(5, -1, "", "", true, new LoginType[]{oldscape, field4052, field4056, field4058, field4054}); + oldscape = new LoginType(1, 0, "", ""); // L: 5 + field4059 = new LoginType(8, 1, "", ""); // L: 6 + field4056 = new LoginType(3, 2, "", ""); // L: 7 + field4057 = new LoginType(4, 3, "", ""); // L: 8 + field4058 = new LoginType(6, 4, "", ""); // L: 9 + field4064 = new LoginType(7, 5, "", ""); // L: 10 + field4055 = new LoginType(5, 6, "", ""); // L: 11 + field4061 = new LoginType(0, 7, "", ""); // L: 12 + field4062 = new LoginType(2, -1, "", "", true, new LoginType[]{oldscape, field4059, field4056, field4058, field4057}); // L: 13 } LoginType(int var1, int var2, String var3, String var4) { - this.field4060 = var1; - this.field4051 = var4; - } + this.field4063 = var1; // L: 18 + this.field4054 = var4; // L: 19 + } // L: 20 @ObfuscatedSignature( - descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lmo;)V" + descriptor = "(IILjava/lang/String;Ljava/lang/String;Z[Lmu;)V" ) LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) { - this.field4060 = var1; - this.field4051 = var4; - } + this.field4063 = var1; // L: 23 + this.field4054 = var4; // L: 24 + } // L: 25 public String toString() { - return this.field4051; + return this.field4054; // L: 28 } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 869518cc20..0bb2dbfd14 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -4,80 +4,69 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cu") +@ObfuscatedName("cf") @Implements("MenuAction") public class MenuAction { - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1178399769 + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lkf;" ) - @Export("param0") - int param0; - @ObfuscatedName("o") + @Export("NetCache_reference") + static Buffer NetCache_reference; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1300782503 - ) - @Export("param1") - int param1; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 1809063501 + intValue = -1817310685 ) @Export("opcode") int opcode; - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1681239955 + intValue = -670222051 + ) + @Export("param0") + int param0; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 1502625343 + ) + @Export("param1") + int param1; + @ObfuscatedName("t") + @Export("action") + String action; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 691220539 ) @Export("identifier") int identifier; - @ObfuscatedName("p") - @Export("action") - String action; MenuAction() { + } // L: 10944 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IIIB)J", + garbageValue = "0" + ) + static long method2139(int var0, int var1, int var2) { + return (long)(var2 << 16 | var0 << 8 | var1); // L: 38 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([BZI)Ljava/lang/Object;", - garbageValue = "1257898423" + descriptor = "([BZB)Ljava/lang/Object;", + garbageValue = "117" ) - public static Object method2169(byte[] var0, boolean var1) { - if (var0 == null) { + public static Object method2140(byte[] var0, boolean var1) { + if (var0 == null) { // L: 7 return null; - } else if (var0.length > 136) { - DirectByteArrayCopier var2 = new DirectByteArrayCopier(); - var2.set(var0); - return var2; + } else if (var0.length > 136) { // L: 8 + DirectByteArrayCopier var2 = new DirectByteArrayCopier(); // L: 10 + var2.set(var0); // L: 11 + return var2; // L: 12 } else { - return var0; + return var0; // L: 25 } } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;I)V", - garbageValue = "1591696142" - ) - public static void method2171(AbstractArchive var0, AbstractArchive var1) { - SpotAnimationDefinition.SpotAnimationDefinition_archive = var0; - NPC.SpotAnimationDefinition_modelArchive = var1; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(ILic;IIIZI)V", - garbageValue = "896837453" - ) - @Export("playMusicTrack") - public static void playMusicTrack(int var0, AbstractArchive var1, int var2, int var3, int var4, boolean var5) { - class206.field2439 = 1; - Huffman.musicTrackArchive = var1; - class206.musicTrackGroupId = var2; - MilliClock.musicTrackFileId = var3; - class206.musicTrackVolume = var4; - class336.musicTrackBoolean = var5; - class206.field2442 = var0; - } } diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java index 29465f5d34..615a7a5f90 100644 --- a/runescape-client/src/main/java/Message.java +++ b/runescape-client/src/main/java/Message.java @@ -4,363 +4,166 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("br") +@ObfuscatedName("bk") @Implements("Message") public class Message extends DualNode { - @ObfuscatedName("dg") + @ObfuscatedName("sx") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lmx;" ) - @Export("archive1") - static Archive archive1; - @ObfuscatedName("dy") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive12") - static Archive archive12; - @ObfuscatedName("m") + @Export("worldMap") + static WorldMap worldMap; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 397960109 + intValue = 771571173 ) @Export("count") int count; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2015162379 + intValue = -804370839 ) @Export("cycle") int cycle; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 195455957 + intValue = 310309169 ) @Export("type") int type; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("sender") String sender; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lku;" ) @Export("senderUsername") Username senderUsername; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkm;" ) @Export("isFromFriend0") TriBool isFromFriend0; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkm;" ) @Export("isFromIgnored0") TriBool isFromIgnored0; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("prefix") String prefix; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("text") String text; Message(int var1, String var2, String var3, String var4) { - this.isFromFriend0 = TriBool.TriBool_unknown; - this.isFromIgnored0 = TriBool.TriBool_unknown; - this.set(var1, var2, var3, var4); - } + this.isFromFriend0 = TriBool.TriBool_unknown; // L: 13 + this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 14 + this.set(var1, var2, var3, var4); // L: 19 + } // L: 20 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-427651151" + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V", + garbageValue = "28" ) @Export("set") void set(int var1, String var2, String var3, String var4) { - int var5 = ++Messages.Messages_count - 1; - this.count = var5; - this.cycle = Client.cycle; - this.type = var1; - this.sender = var2; - this.fillSenderUsername(); - this.prefix = var3; - this.text = var4; - this.clearIsFromFriend(); - this.clearIsFromIgnored(); - } + int var5 = ++Messages.Messages_count - 1; // L: 25 + this.count = var5; // L: 27 + this.cycle = Client.cycle; // L: 28 + this.type = var1; // L: 29 + this.sender = var2; // L: 30 + this.fillSenderUsername(); // L: 31 + this.prefix = var3; // L: 32 + this.text = var4; // L: 33 + this.clearIsFromFriend(); // L: 34 + this.clearIsFromIgnored(); // L: 35 + } // L: 36 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2093900647" + descriptor = "(B)V", + garbageValue = "-57" ) @Export("clearIsFromFriend") void clearIsFromFriend() { - this.isFromFriend0 = TriBool.TriBool_unknown; - } + this.isFromFriend0 = TriBool.TriBool_unknown; // L: 39 + } // L: 40 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1408976904" + descriptor = "(B)Z", + garbageValue = "-115" ) @Export("isFromFriend") final boolean isFromFriend() { - if (this.isFromFriend0 == TriBool.TriBool_unknown) { - this.fillIsFromFriend(); + if (this.isFromFriend0 == TriBool.TriBool_unknown) { // L: 43 + this.fillIsFromFriend(); // L: 44 } - return this.isFromFriend0 == TriBool.TriBool_true; + return this.isFromFriend0 == TriBool.TriBool_true; // L: 46 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "511529108" + garbageValue = "-47255168" ) @Export("fillIsFromFriend") void fillIsFromFriend() { - this.isFromFriend0 = ModeWhere.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; - } + this.isFromFriend0 = class60.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 50 + } // L: 51 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "108" + descriptor = "(I)V", + garbageValue = "1621996049" ) @Export("clearIsFromIgnored") void clearIsFromIgnored() { - this.isFromIgnored0 = TriBool.TriBool_unknown; - } + this.isFromIgnored0 = TriBool.TriBool_unknown; // L: 54 + } // L: 55 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "-124" + garbageValue = "77" ) @Export("isFromIgnored") final boolean isFromIgnored() { - if (this.isFromIgnored0 == TriBool.TriBool_unknown) { - this.fillIsFromIgnored(); + if (this.isFromIgnored0 == TriBool.TriBool_unknown) { // L: 58 + this.fillIsFromIgnored(); // L: 59 } - return this.isFromIgnored0 == TriBool.TriBool_true; + return this.isFromIgnored0 == TriBool.TriBool_true; // L: 61 } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-558597226" + garbageValue = "-556586926" ) @Export("fillIsFromIgnored") void fillIsFromIgnored() { - this.isFromIgnored0 = ModeWhere.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; - } + this.isFromIgnored0 = class60.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 65 + } // L: 66 - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1793288574" + garbageValue = "-1023738000" ) @Export("fillSenderUsername") final void fillSenderUsername() { - if (this.sender != null) { - this.senderUsername = new Username(BuddyRankComparator.method3556(this.sender), class195.loginType); + if (this.sender != null) { // L: 69 + this.senderUsername = new Username(SecureRandomCallable.method1202(this.sender), WorldMapAreaData.loginType); } else { - this.senderUsername = null; + this.senderUsername = null; // L: 70 } - } - - @ObfuscatedName("ik") - @ObfuscatedSignature( - descriptor = "(Lhd;III)V", - garbageValue = "-1019531565" - ) - @Export("Widget_addToMenu") - static final void Widget_addToMenu(Widget widget, int var1, int var2) { - if (widget.buttonType == 1) { - ScriptEvent.insertMenuItemNoShift(widget.buttonText, "", 24, 0, 0, widget.id); - } - - String var3; - if (widget.buttonType == 2 && !Client.isSpellSelected) { - var3 = WorldMapAreaData.Widget_getSpellActionName(widget); - if (var3 != null) { - ScriptEvent.insertMenuItemNoShift(var3, ItemContainer.colorStartTag(65280) + widget.spellName, 25, 0, -1, widget.id); - } - } - - if (widget.buttonType == 3) { - ScriptEvent.insertMenuItemNoShift("Close", "", 26, 0, 0, widget.id); - } - - if (widget.buttonType == 4) { - ScriptEvent.insertMenuItemNoShift(widget.buttonText, "", 28, 0, 0, widget.id); - } - - if (widget.buttonType == 5) { - ScriptEvent.insertMenuItemNoShift(widget.buttonText, "", 29, 0, 0, widget.id); - } - - if (widget.buttonType == 6 && Client.meslayerContinueWidget == null) { - ScriptEvent.insertMenuItemNoShift(widget.buttonText, "", 30, 0, -1, widget.id); - } - - int var4; - int var6; - int var7; - int var13; - if (widget.type == 2) { - var13 = 0; - - for (var4 = 0; var4 < widget.height; ++var4) { - for (int var5 = 0; var5 < widget.width; ++var5) { - var6 = (widget.paddingX + 32) * var5; - var7 = (widget.paddingY + 32) * var4; - if (var13 < 20) { - var6 += widget.inventoryXOffsets[var13]; - var7 += widget.inventoryYOffsets[var13]; - } - - if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { - Client.dragItemSlotDestination = var13; - TaskHandler.hoveredItemContainer = widget; - if (widget.itemIds[var13] > 0) { - ItemDefinition itemDef = KitDefinition.ItemDefinition_get(widget.itemIds[var13] - 1); - if (Client.isItemSelected == 1 && FloorUnderlayDefinition.Widget_isItemContainer(KeyHandler.getWidgetFlags(widget))) { - if (widget.id != AbstractUserComparator.selectedItemWidget || var13 != LoginScreenAnimation.selectedItemSlot) { - ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + itemDef.name, 31, itemDef.id, var13, widget.id); - } - } else if (Client.isSpellSelected && FloorUnderlayDefinition.Widget_isItemContainer(KeyHandler.getWidgetFlags(widget))) { - if ((WorldMapSprite.selectedSpellFlags & 16) == 16) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + itemDef.name, 32, itemDef.id, var13, widget.id); - } - } else { - String[] actionsAry = itemDef.inventoryActions; - int shiftClickIdx = -1; - if (Client.shiftClickDrop && ModelData0.shouldPrioritizeDrop()) { - shiftClickIdx = itemDef.getShiftClickIndex(); - } - - int loopIdx; - if (FloorUnderlayDefinition.Widget_isItemContainer(KeyHandler.getWidgetFlags(widget))) { - for (loopIdx = 4; loopIdx >= 3; --loopIdx) { - if (loopIdx != shiftClickIdx) { - WallDecoration.addWidgetItemMenuItem(widget, itemDef, var13, loopIdx, false); - } - } - } - - if (class198.Widget_containerHasUseOption(KeyHandler.getWidgetFlags(widget))) { - ScriptEvent.insertMenuItemNoShift("Use", ItemContainer.colorStartTag(16748608) + itemDef.name, 38, itemDef.id, var13, widget.id); - } - - if (FloorUnderlayDefinition.Widget_isItemContainer(KeyHandler.getWidgetFlags(widget))) { - for (loopIdx = 2; loopIdx >= 0; --loopIdx) { - if (loopIdx != shiftClickIdx) { - WallDecoration.addWidgetItemMenuItem(widget, itemDef, var13, loopIdx, false); - } - } - - if (shiftClickIdx >= 0) { - WallDecoration.addWidgetItemMenuItem(widget, itemDef, var13, shiftClickIdx, true); - } - } - - actionsAry = widget.itemActions; - if (actionsAry != null) { - for (loopIdx = 4; loopIdx >= 0; --loopIdx) { - if (actionsAry[loopIdx] != null) { - byte opcode = 0; - if (loopIdx == 0) { - opcode = 39; - } - - if (loopIdx == 1) { - opcode = 40; - } - - if (loopIdx == 2) { - opcode = 41; - } - - if (loopIdx == 3) { - opcode = 42; - } - - if (loopIdx == 4) { - opcode = 43; - } - - ScriptEvent.insertMenuItemNoShift(actionsAry[loopIdx], ItemContainer.colorStartTag(16748608) + itemDef.name, opcode, itemDef.id, var13, widget.id); - } - } - } - - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16748608) + itemDef.name, 1005, itemDef.id, var13, widget.id); - } - } - } - - ++var13; - } - } - } - - if (widget.isIf3) { - if (Client.isSpellSelected) { - var4 = KeyHandler.getWidgetFlags(widget); - boolean var19 = (var4 >> 21 & 1) != 0; - if (var19 && (WorldMapSprite.selectedSpellFlags & 32) == 32) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + widget.dataText, 58, 0, widget.childIndex, widget.id); - } - } else { - for (var13 = 9; var13 >= 5; --var13) { - var6 = KeyHandler.getWidgetFlags(widget); - boolean var17 = (var6 >> var13 + 1 & 1) != 0; - String var14; - if (!var17 && widget.onOp == null) { - var14 = null; - } else if (widget.actions != null && widget.actions.length > var13 && widget.actions[var13] != null && widget.actions[var13].trim().length() != 0) { - var14 = widget.actions[var13]; - } else { - var14 = null; - } - - if (var14 != null) { - ScriptEvent.insertMenuItemNoShift(var14, widget.dataText, 1007, var13 + 1, widget.childIndex, widget.id); - } - } - - var3 = WorldMapAreaData.Widget_getSpellActionName(widget); - if (var3 != null) { - ScriptEvent.insertMenuItemNoShift(var3, widget.dataText, 25, 0, widget.childIndex, widget.id); - } - - for (var4 = 4; var4 >= 0; --var4) { - var7 = KeyHandler.getWidgetFlags(widget); - boolean var18 = (var7 >> var4 + 1 & 1) != 0; - String var15; - if (!var18 && widget.onOp == null) { - var15 = null; - } else if (widget.actions != null && widget.actions.length > var4 && widget.actions[var4] != null && widget.actions[var4].trim().length() != 0) { - var15 = widget.actions[var4]; - } else { - var15 = null; - } - - if (var15 != null) { - ApproximateRouteStrategy.insertMenuItem(var15, widget.dataText, 57, var4 + 1, widget.childIndex, widget.id, widget.prioritizeMenuEntry); - } - } - - if (WorldMapLabel.Widget_hasContinueOption(KeyHandler.getWidgetFlags(widget))) { - ScriptEvent.insertMenuItemNoShift("Continue", "", 30, 0, widget.childIndex, widget.id); - } - } - } - - } + } // L: 71 } diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java index ff64939d86..8557fc5821 100644 --- a/runescape-client/src/main/java/Messages.java +++ b/runescape-client/src/main/java/Messages.java @@ -6,52 +6,64 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cx") +@ObfuscatedName("cz") @Implements("Messages") public class Messages { - @ObfuscatedName("m") + @ObfuscatedName("sb") + @Export("foundItemIds") + static short[] foundItemIds; + @ObfuscatedName("z") @Export("Messages_channels") static final Map Messages_channels; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llq;" ) @Export("Messages_hashTable") static final IterableNodeHashTable Messages_hashTable; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ljq;" + descriptor = "Ljh;" ) @Export("Messages_queue") static final IterableDualNodeQueue Messages_queue; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 205405157 + intValue = 785090077 ) @Export("Messages_count") static int Messages_count; - @ObfuscatedName("g") - @Export("PcmPlayer_stereo") - protected static boolean PcmPlayer_stereo; - @ObfuscatedName("z") - public static short[][] field1308; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + @Export("Widget_spritesArchive") + public static AbstractArchive Widget_spritesArchive; static { - Messages_channels = new HashMap(); - Messages_hashTable = new IterableNodeHashTable(1024); - Messages_queue = new IterableDualNodeQueue(); - Messages_count = 0; + Messages_channels = new HashMap(); // L: 9 + Messages_hashTable = new IterableNodeHashTable(1024); // L: 10 + Messages_queue = new IterableDualNodeQueue(); // L: 11 + Messages_count = 0; // L: 12 } - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1486803630" + descriptor = "(B)V", + garbageValue = "-80" ) - static final int method2350(int var0, int var1) { - int var2 = ClientPreferences.method1914(var0 - 1, var1 - 1) + ClientPreferences.method1914(1 + var0, var1 - 1) + ClientPreferences.method1914(var0 - 1, 1 + var1) + ClientPreferences.method1914(var0 + 1, 1 + var1); - int var3 = ClientPreferences.method1914(var0 - 1, var1) + ClientPreferences.method1914(1 + var0, var1) + ClientPreferences.method1914(var0, var1 - 1) + ClientPreferences.method1914(var0, var1 + 1); - int var4 = ClientPreferences.method1914(var0, var1); - return var2 / 16 + var3 / 8 + var4 / 4; - } + static void method2288() { + Tiles.field528 = null; // L: 64 + Tiles.field521 = null; // L: 65 + class297.field3668 = null; // L: 66 + class171.field2049 = null; // L: 67 + class204.field2421 = null; // L: 68 + class22.field122 = null; // L: 69 + class39.field282 = null; // L: 70 + Tiles.Tiles_hue = null; // L: 71 + Tiles.Tiles_saturation = null; // L: 72 + WorldMapRectangle.Tiles_lightness = null; // L: 73 + WorldMapScaleHandler.Tiles_hueMultiplier = null; // L: 74 + class60.field453 = null; // L: 75 + } // L: 76 } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 2ed56a2112..afaefbd7c9 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -3,260 +3,260 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hl") +@ObfuscatedName("hf") @Implements("MidiFileReader") public class MidiFileReader { - @ObfuscatedName("z") - static final byte[] field2509; @ObfuscatedName("m") + static final byte[] field2500; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkf;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("division") int division; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("trackStarts") int[] trackStarts; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("trackPositions") int[] trackPositions; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("trackLengths") int[] trackLengths; + @ObfuscatedName("o") + int[] field2493; + @ObfuscatedName("x") + int field2496; @ObfuscatedName("g") - int[] field2505; - @ObfuscatedName("n") - int field2506; - @ObfuscatedName("a") - long field2508; + long field2499; static { - field2509 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + field2500 = new byte[]{2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 1, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // L: 17 } MidiFileReader(byte[] var1) { this.buffer = new Buffer((byte[])null); - this.parse(var1); - } + this.parse(var1); // L: 26 + } // L: 27 MidiFileReader() { - this.buffer = new Buffer((byte[])null); - } + this.buffer = new Buffer((byte[])null); // L: 8 + } // L: 23 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("parse") void parse(byte[] var1) { - this.buffer.array = var1; - this.buffer.offset = 10; - int var2 = this.buffer.readUnsignedShort(); - this.division = this.buffer.readUnsignedShort(); - this.field2506 = 500000; - this.trackStarts = new int[var2]; + this.buffer.array = var1; // L: 30 + this.buffer.offset = 10; // L: 33 + int var2 = this.buffer.readUnsignedShort(); // L: 34 + this.division = this.buffer.readUnsignedShort(); // L: 36 + this.field2496 = 500000; // L: 37 + this.trackStarts = new int[var2]; // L: 38 Buffer var10000; int var3; int var5; - for (var3 = 0; var3 < var2; var10000.offset += var5) { - int var4 = this.buffer.readInt(); - var5 = this.buffer.readInt(); - if (var4 == 1297379947) { - this.trackStarts[var3] = this.buffer.offset; - ++var3; + for (var3 = 0; var3 < var2; var10000.offset += var5) { // L: 39 + int var4 = this.buffer.readInt(); // L: 40 + var5 = this.buffer.readInt(); // L: 41 + if (var4 == 1297379947) { // L: 42 + this.trackStarts[var3] = this.buffer.offset; // L: 43 + ++var3; // L: 44 } - var10000 = this.buffer; + var10000 = this.buffer; // L: 46 } - this.field2508 = 0L; - this.trackPositions = new int[var2]; + this.field2499 = 0L; // L: 48 + this.trackPositions = new int[var2]; // L: 49 - for (var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { // L: 50 this.trackPositions[var3] = this.trackStarts[var3]; } - this.trackLengths = new int[var2]; - this.field2505 = new int[var2]; - } + this.trackLengths = new int[var2]; // L: 51 + this.field2493 = new int[var2]; // L: 52 + } // L: 53 - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("clear") void clear() { - this.buffer.array = null; - this.trackStarts = null; - this.trackPositions = null; - this.trackLengths = null; - this.field2505 = null; - } + this.buffer.array = null; // L: 56 + this.trackStarts = null; // L: 57 + this.trackPositions = null; // L: 58 + this.trackLengths = null; // L: 59 + this.field2493 = null; // L: 60 + } // L: 61 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("isReady") boolean isReady() { - return this.buffer.array != null; + return this.buffer.array != null; // L: 64 } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("trackCount") int trackCount() { - return this.trackPositions.length; + return this.trackPositions.length; // L: 68 } - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("gotoTrack") void gotoTrack(int var1) { - this.buffer.offset = this.trackPositions[var1]; - } + this.buffer.offset = this.trackPositions[var1]; // L: 72 + } // L: 73 - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("markTrackPosition") void markTrackPosition(int var1) { - this.trackPositions[var1] = this.buffer.offset; - } + this.trackPositions[var1] = this.buffer.offset; // L: 76 + } // L: 77 - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("setTrackDone") void setTrackDone() { - this.buffer.offset = -1; - } + this.buffer.offset = -1; // L: 80 + } // L: 81 - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("readTrackLength") void readTrackLength(int var1) { - int var2 = this.buffer.readVarInt(); + int var2 = this.buffer.readVarInt(); // L: 84 int[] var10000 = this.trackLengths; - var10000[var1] += var2; - } + var10000[var1] += var2; // L: 85 + } // L: 86 - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("readMessage") int readMessage(int var1) { - int var2 = this.readMessage0(var1); - return var2; + int var2 = this.readMessage0(var1); // L: 89 + return var2; // L: 90 } - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("readMessage0") int readMessage0(int var1) { - byte var2 = this.buffer.array[this.buffer.offset]; + byte var2 = this.buffer.array[this.buffer.offset]; // L: 94 int var5; - if (var2 < 0) { - var5 = var2 & 255; - this.field2505[var1] = var5; - ++this.buffer.offset; + if (var2 < 0) { // L: 95 + var5 = var2 & 255; // L: 96 + this.field2493[var1] = var5; // L: 97 + ++this.buffer.offset; // L: 98 } else { - var5 = this.field2505[var1]; + var5 = this.field2493[var1]; // L: 101 } - if (var5 != 240 && var5 != 247) { - return this.method3982(var1, var5); + if (var5 != 240 && var5 != 247) { // L: 103 + return this.method3970(var1, var5); // L: 116 } else { - int var3 = this.buffer.readVarInt(); - if (var5 == 247 && var3 > 0) { - int var4 = this.buffer.array[this.buffer.offset] & 255; - if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { - ++this.buffer.offset; - this.field2505[var1] = var4; - return this.method3982(var1, var4); + int var3 = this.buffer.readVarInt(); // L: 104 + if (var5 == 247 && var3 > 0) { // L: 105 + int var4 = this.buffer.array[this.buffer.offset] & 255; // L: 106 + if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { // L: 107 + ++this.buffer.offset; // L: 108 + this.field2493[var1] = var4; // L: 109 + return this.method3970(var1, var4); // L: 110 } } - Buffer var10000 = this.buffer; + Buffer var10000 = this.buffer; // L: 113 var10000.offset += var3; - return 0; + return 0; // L: 114 } } - @ObfuscatedName("w") - int method3982(int var1, int var2) { + @ObfuscatedName("n") + int method3970(int var1, int var2) { int var4; - if (var2 == 255) { - int var7 = this.buffer.readUnsignedByte(); - var4 = this.buffer.readVarInt(); + if (var2 == 255) { // L: 120 + int var7 = this.buffer.readUnsignedByte(); // L: 121 + var4 = this.buffer.readVarInt(); // L: 122 Buffer var10000; - if (var7 == 47) { - var10000 = this.buffer; + if (var7 == 47) { // L: 123 + var10000 = this.buffer; // L: 124 var10000.offset += var4; - return 1; - } else if (var7 == 81) { - int var5 = this.buffer.readMedium(); - var4 -= 3; - int var6 = this.trackLengths[var1]; - this.field2508 += (long)var6 * (long)(this.field2506 - var5); - this.field2506 = var5; - var10000 = this.buffer; + return 1; // L: 125 + } else if (var7 == 81) { // L: 127 + int var5 = this.buffer.readMedium(); // L: 128 + var4 -= 3; // L: 129 + int var6 = this.trackLengths[var1]; // L: 130 + this.field2499 += (long)var6 * (long)(this.field2496 - var5); // L: 131 + this.field2496 = var5; // L: 132 + var10000 = this.buffer; // L: 133 var10000.offset += var4; - return 2; + return 2; // L: 134 } else { - var10000 = this.buffer; + var10000 = this.buffer; // L: 136 var10000.offset += var4; - return 3; + return 3; // L: 137 } } else { - byte var3 = field2509[var2 - 128]; - var4 = var2; - if (var3 >= 1) { + byte var3 = field2500[var2 - 128]; // L: 139 + var4 = var2; // L: 140 + if (var3 >= 1) { // L: 141 var4 = var2 | this.buffer.readUnsignedByte() << 8; } - if (var3 >= 2) { + if (var3 >= 2) { // L: 142 var4 |= this.buffer.readUnsignedByte() << 16; } - return var4; + return var4; // L: 143 } } - @ObfuscatedName("y") - long method3985(int var1) { - return this.field2508 + (long)var1 * (long)this.field2506; - } - - @ObfuscatedName("c") - @Export("getPrioritizedTrack") - int getPrioritizedTrack() { - int var1 = this.trackPositions.length; - int var2 = -1; - int var3 = Integer.MAX_VALUE; - - for (int var4 = 0; var4 < var1; ++var4) { - if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) { - var2 = var4; - var3 = this.trackLengths[var4]; - } - } - - return var2; + @ObfuscatedName("d") + long method3942(int var1) { + return this.field2499 + (long)var1 * (long)this.field2496; // L: 147 } @ObfuscatedName("h") + @Export("getPrioritizedTrack") + int getPrioritizedTrack() { + int var1 = this.trackPositions.length; // L: 151 + int var2 = -1; // L: 152 + int var3 = Integer.MAX_VALUE; // L: 153 + + for (int var4 = 0; var4 < var1; ++var4) { // L: 154 + if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) { // L: 155 156 + var2 = var4; // L: 157 + var3 = this.trackLengths[var4]; // L: 158 + } + } + + return var2; // L: 161 + } + + @ObfuscatedName("a") @Export("isDone") boolean isDone() { - int var1 = this.trackPositions.length; + int var1 = this.trackPositions.length; // L: 165 - for (int var2 = 0; var2 < var1; ++var2) { + for (int var2 = 0; var2 < var1; ++var2) { // L: 166 if (this.trackPositions[var2] >= 0) { return false; } } - return true; + return true; // L: 167 } - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("reset") void reset(long var1) { - this.field2508 = var1; - int var3 = this.trackPositions.length; + this.field2499 = var1; // L: 171 + int var3 = this.trackPositions.length; // L: 172 - for (int var4 = 0; var4 < var3; ++var4) { - this.trackLengths[var4] = 0; - this.field2505[var4] = 0; - this.buffer.offset = this.trackStarts[var4]; - this.readTrackLength(var4); - this.trackPositions[var4] = this.buffer.offset; + for (int var4 = 0; var4 < var3; ++var4) { // L: 173 + this.trackLengths[var4] = 0; // L: 174 + this.field2493[var4] = 0; // L: 175 + this.buffer.offset = this.trackStarts[var4]; // L: 176 + this.readTrackLength(var4); // L: 177 + this.trackPositions[var4] = this.buffer.offset; // L: 178 } - } + } // L: 180 } diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index 22fd88de07..d47e74b874 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -4,175 +4,189 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gw") +@ObfuscatedName("ge") @Implements("MidiPcmStream") public class MidiPcmStream extends PcmStream { - @ObfuscatedName("m") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "[Llp;" + ) + @Export("worldSelectBackSprites") + static Sprite[] worldSelectBackSprites; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Llc;" ) @Export("musicPatches") NodeHashTable musicPatches; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1861349381 + intValue = 1799517865 ) - int field2472; - @ObfuscatedName("q") + int field2458; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -11314911 + intValue = 1116172075 ) - int field2462; - @ObfuscatedName("j") - int[] field2450; - @ObfuscatedName("p") - int[] field2458; - @ObfuscatedName("g") - int[] field2452; - @ObfuscatedName("n") - int[] field2453; - @ObfuscatedName("u") - int[] field2456; - @ObfuscatedName("a") - int[] field2455; - @ObfuscatedName("z") - int[] field2448; - @ObfuscatedName("y") - int[] field2457; - @ObfuscatedName("c") - int[] field2459; - @ObfuscatedName("e") - int[] field2460; - @ObfuscatedName("l") - int[] field2461; + int field2456; @ObfuscatedName("t") - int[] field2447; - @ObfuscatedName("x") - int[] field2463; - @ObfuscatedName("b") - int[] field2464; + int[] field2449; @ObfuscatedName("i") + int[] field2445; + @ObfuscatedName("o") + int[] field2446; + @ObfuscatedName("x") + int[] field2447; + @ObfuscatedName("g") + int[] field2448; + @ObfuscatedName("m") + int[] field2465; + @ObfuscatedName("n") + int[] field2450; + @ObfuscatedName("d") + int[] field2451; + @ObfuscatedName("h") + int[] field2452; + @ObfuscatedName("j") + int[] field2453; + @ObfuscatedName("r") int[] field2454; - @ObfuscatedName("f") + @ObfuscatedName("u") + int[] field2455; + @ObfuscatedName("p") + int[] field2441; + @ObfuscatedName("b") + int[] field2457; + @ObfuscatedName("l") + int[] field2442; + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[[Lhm;" + descriptor = "[[Lhe;" ) - MusicPatchNode[][] field2466; - @ObfuscatedName("ah") + MusicPatchNode[][] field2459; + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[[Lhm;" + descriptor = "[[Lhe;" ) - MusicPatchNode[][] field2467; - @ObfuscatedName("ai") + MusicPatchNode[][] field2460; + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "Lhl;" + descriptor = "Lhf;" ) @Export("midiFile") MidiFileReader midiFile; @ObfuscatedName("ao") - boolean field2469; + boolean field2462; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -408664983 + intValue = -986851911 ) @Export("track") int track; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1241874657 + intValue = -1235186361 ) @Export("trackLength") int trackLength; - @ObfuscatedName("ag") - @ObfuscatedGetter( - longValue = 5529909508015764317L - ) - long field2465; - @ObfuscatedName("ab") - @ObfuscatedGetter( - longValue = 2344404175579983131L - ) - long field2473; @ObfuscatedName("am") + @ObfuscatedGetter( + longValue = -3470294739041308975L + ) + long field2444; + @ObfuscatedName("ap") + @ObfuscatedGetter( + longValue = 2378753574421297803L + ) + long field2466; + @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lhj;" + descriptor = "Lhb;" ) @Export("patchStream") MusicPatchPcmStream patchStream; public MidiPcmStream() { - this.field2472 = 256; - this.field2462 = 1000000; - this.field2450 = new int[16]; - this.field2458 = new int[16]; - this.field2452 = new int[16]; - this.field2453 = new int[16]; - this.field2456 = new int[16]; - this.field2455 = new int[16]; - this.field2448 = new int[16]; - this.field2457 = new int[16]; - this.field2459 = new int[16]; - this.field2460 = new int[16]; - this.field2461 = new int[16]; - this.field2447 = new int[16]; - this.field2463 = new int[16]; - this.field2464 = new int[16]; - this.field2454 = new int[16]; - this.field2466 = new MusicPatchNode[16][128]; - this.field2467 = new MusicPatchNode[16][128]; - this.midiFile = new MidiFileReader(); + this.field2458 = 256; // L: 14 + this.field2456 = 1000000; // L: 15 + this.field2449 = new int[16]; // L: 16 + this.field2445 = new int[16]; // L: 17 + this.field2446 = new int[16]; // L: 18 + this.field2447 = new int[16]; // L: 19 + this.field2448 = new int[16]; // L: 20 + this.field2465 = new int[16]; // L: 21 + this.field2450 = new int[16]; // L: 22 + this.field2451 = new int[16]; // L: 23 + this.field2452 = new int[16]; // L: 24 + this.field2453 = new int[16]; // L: 28 + this.field2454 = new int[16]; // L: 29 + this.field2455 = new int[16]; // L: 30 + this.field2441 = new int[16]; // L: 31 + this.field2457 = new int[16]; // L: 32 + this.field2442 = new int[16]; // L: 33 + this.field2459 = new MusicPatchNode[16][128]; // L: 34 + this.field2460 = new MusicPatchNode[16][128]; // L: 35 + this.midiFile = new MidiFileReader(); // L: 36 this.patchStream = new MusicPatchPcmStream(this); this.musicPatches = new NodeHashTable(128); - this.method3856(); + this.method3824(); } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1244273754" + garbageValue = "371443257" ) @Export("setPcmStreamVolume") - public synchronized void setPcmStreamVolume(int var1) { - this.field2472 = var1; + synchronized void setPcmStreamVolume(int var1) { + this.field2458 = var1; } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-988270526" + garbageValue = "1211509882" ) - public int method3837() { - return this.field2472; + int method3806() { + return this.field2458; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lhz;Lic;Ldo;II)Z", - garbageValue = "-700249158" + descriptor = "(Lhj;Lic;Lds;IB)Z", + garbageValue = "5" ) @Export("loadMusicTrack") - public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { - var1.method4057(); + synchronized boolean loadMusicTrack(MusicTrack var1, AbstractArchive var2, SoundCache var3, int var4) { + var1.method4008(); boolean var5 = true; int[] var6 = null; if (var4 > 0) { var6 = new int[]{var4}; } - for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { - int var8 = (int)var7.key; - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); - if (var9 == null) { - var9 = TileItem.method2255(var2, var8); - if (var9 == null) { + for (ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) { // L: 62 + int var8 = (int)var7.key; // L: 63 + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8); // L: 64 + if (var9 == null) { // L: 65 + byte[] var11 = var2.takeFileFlat(var8); // L: 68 + MusicPatch var10; + if (var11 == null) { // L: 69 + var10 = null; // L: 70 + } else { + var10 = new MusicPatch(var11); + } + + var9 = var10; + if (var10 == null) { var5 = false; continue; } - this.musicPatches.put(var9, (long)var8); + this.musicPatches.put(var10, (long)var8); } - if (!var9.method4027(var3, var7.byteArray, var6)) { + if (!var9.method3979(var3, var7.byteArray, var6)) { // L: 82 var5 = false; } } @@ -181,978 +195,984 @@ public class MidiPcmStream extends PcmStream { var1.clear(); } - return var5; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" - ) - @Export("clearAll") - public synchronized void clearAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { - var1.clear(); - } - - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-100699849" - ) - @Export("removeAll") - public synchronized void removeAll() { - for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { - var1.remove(); - } - - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "()Ldf;" - ) - @Export("firstSubStream") - protected synchronized PcmStream firstSubStream() { - return this.patchStream; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "()Ldf;" - ) - @Export("nextSubStream") - protected synchronized PcmStream nextSubStream() { - return null; - } - - @ObfuscatedName("u") - protected synchronized int vmethod4037() { - return 0; - } - - @ObfuscatedName("a") - @Export("fill") - protected synchronized void fill(int[] var1, int var2, int var3) { - if (this.midiFile.isReady()) { - int var4 = this.midiFile.division * this.field2462 / class237.field3113; - - do { - long var5 = (long)var3 * (long)var4 + this.field2465; - if (this.field2473 - var5 >= 0L) { - this.field2465 = var5; - break; - } - - int var7 = (int)(((long)var4 + (this.field2473 - this.field2465) - 1L) / (long)var4); - this.field2465 += (long)var4 * (long)var7; - this.patchStream.fill(var1, var2, var7); - var2 += var7; - var3 -= var7; - this.method3872(); - } while(this.midiFile.isReady()); - } - - this.patchStream.fill(var1, var2, var3); - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lhz;ZI)V", - garbageValue = "746467478" - ) - @Export("setMusicTrack") - public synchronized void setMusicTrack(MusicTrack var1, boolean var2) { - this.clear(); - this.midiFile.parse(var1.midi); - this.field2469 = var2; - this.field2465 = 0L; - int var3 = this.midiFile.trackCount(); - - for (int var4 = 0; var4 < var3; ++var4) { - this.midiFile.gotoTrack(var4); - this.midiFile.readTrackLength(var4); - this.midiFile.markTrackPosition(var4); - } - - this.track = this.midiFile.getPrioritizedTrack(); - this.trackLength = this.midiFile.trackLengths[this.track]; - this.field2473 = this.midiFile.method3985(this.trackLength); - } - - @ObfuscatedName("w") - @Export("skip") - protected synchronized void skip(int var1) { - if (this.midiFile.isReady()) { - int var2 = this.midiFile.division * this.field2462 / class237.field3113; - - do { - long var3 = (long)var2 * (long)var1 + this.field2465; - if (this.field2473 - var3 >= 0L) { - this.field2465 = var3; - break; - } - - int var5 = (int)(((long)var2 + (this.field2473 - this.field2465) - 1L) / (long)var2); - this.field2465 += (long)var5 * (long)var2; - this.patchStream.skip(var5); - var1 -= var5; - this.method3872(); - } while(this.midiFile.isReady()); - } - - this.patchStream.skip(var1); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "106" - ) - @Export("clear") - public synchronized void clear() { - this.midiFile.clear(); - this.method3856(); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1676507703" - ) - @Export("isReady") - public synchronized boolean isReady() { - return this.midiFile.isReady(); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "0" - ) - public synchronized void method3935(int var1, int var2) { - this.method3916(var1, var2); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1377126651" - ) - void method3916(int var1, int var2) { - this.field2453[var1] = var2; - this.field2455[var1] = var2 & -128; - this.method3846(var1, var2); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "4" - ) - void method3846(int var1, int var2) { - if (var2 != this.field2456[var1]) { - this.field2456[var1] = var2; - - for (int var3 = 0; var3 < 128; ++var3) { - this.field2467[var1][var3] = null; - } - } - - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(IIIS)V", - garbageValue = "23534" - ) - void method3847(int var1, int var2, int var3) { - this.method3849(var1, var2, 64); - if ((this.field2460[var1] & 2) != 0) { - for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { - if (var4.field2479 == var1 && var4.field2490 < 0) { - this.field2466[var1][var4.field2481] = null; - this.field2466[var1][var2] = var4; - int var5 = (var4.field2491 * var4.field2485 >> 12) + var4.field2484; - var4.field2484 += var2 - var4.field2481 << 8; - var4.field2485 = var5 - var4.field2484; - var4.field2491 = 4096; - var4.field2481 = var2; - return; - } - } - } - - MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2456[var1]); - if (var9 != null) { - RawSound var8 = var9.rawSounds[var2]; - if (var8 != null) { - MusicPatchNode var6 = new MusicPatchNode(); - var6.field2479 = var1; - var6.patch = var9; - var6.rawSound = var8; - var6.field2477 = var9.field2519[var2]; - var6.field2480 = var9.field2522[var2]; - var6.field2481 = var2; - var6.field2499 = var3 * var3 * var9.field2517[var2] * var9.field2520 + 1024 >> 11; - var6.field2483 = var9.field2518[var2] & 255; - var6.field2484 = (var2 << 8) - (var9.field2521[var2] & 32767); - var6.field2496 = 0; - var6.field2488 = 0; - var6.field2489 = 0; - var6.field2490 = -1; - var6.field2493 = 0; - if (this.field2463[var1] == 0) { - var6.stream = RawPcmStream.method2674(var8, this.method3861(var6), this.method3958(var6), this.method3912(var6)); - } else { - var6.stream = RawPcmStream.method2674(var8, this.method3861(var6), 0, this.method3912(var6)); - this.method3852(var6, var9.field2521[var2] < 0); - } - - if (var9.field2521[var2] < 0) { - var6.stream.setNumLoops(-1); - } - - if (var6.field2480 >= 0) { - MusicPatchNode var7 = this.field2467[var1][var6.field2480]; - if (var7 != null && var7.field2490 < 0) { - this.field2466[var1][var7.field2481] = null; - var7.field2490 = 0; - } - - this.field2467[var1][var6.field2480] = var6; - } - - this.patchStream.queue.addFirst(var6); - this.field2466[var1][var2] = var6; - } - } - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(Lhm;ZI)V", - garbageValue = "2083616471" - ) - void method3852(MusicPatchNode var1, boolean var2) { - int var3 = var1.rawSound.samples.length; - int var4; - if (var2 && var1.rawSound.field1423) { - int var5 = var3 + var3 - var1.rawSound.start; - var4 = (int)((long)var5 * (long)this.field2463[var1.field2479] >> 6); - var3 <<= 8; - if (var4 >= var3) { - var4 = var3 + var3 - 1 - var4; - var1.stream.method2683(); - } - } else { - var4 = (int)((long)var3 * (long)this.field2463[var1.field2479] >> 6); - } - - var1.stream.method2682(var4); - } - - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "96" - ) - void method3849(int var1, int var2, int var3) { - MusicPatchNode var4 = this.field2466[var1][var2]; - if (var4 != null) { - this.field2466[var1][var2] = null; - if ((this.field2460[var1] & 2) != 0) { - for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var4.field2479 == var5.field2479 && var5.field2490 < 0 && var4 != var5) { - var4.field2490 = 0; - break; - } - } - } else { - var4.field2490 = 0; - } - - } + return var5; // L: 85 } @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "140866669" ) - void method3850(int var1, int var2, int var3) { + @Export("clearAll") + synchronized void clearAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 89 + var1.clear(); + } + + } // L: 90 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1347552645" + ) + @Export("removeAll") + synchronized void removeAll() { + for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) { // L: 93 + var1.remove(); + } + + } // L: 94 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "()Ldc;" + ) + @Export("firstSubStream") + protected synchronized PcmStream firstSubStream() { + return this.patchStream; // L: 469 } @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-70" + descriptor = "()Ldc;" ) - void method3851(int var1, int var2) { + @Export("nextSubStream") + protected synchronized PcmStream nextSubStream() { + return null; // L: 473 } - @ObfuscatedName("ah") + @ObfuscatedName("w") + protected synchronized int vmethod3987() { + return 0; // L: 477 + } + + @ObfuscatedName("g") + @Export("fill") + protected synchronized void fill(int[] var1, int var2, int var3) { + if (this.midiFile.isReady()) { // L: 481 + int var4 = this.midiFile.division * this.field2456 / PcmPlayer.field1447; // L: 482 + + do { + long var5 = this.field2444 + (long)var4 * (long)var3; // L: 484 + if (this.field2466 - var5 >= 0L) { // L: 485 + this.field2444 = var5; // L: 486 + break; + } + + int var7 = (int)((this.field2466 - this.field2444 + (long)var4 - 1L) / (long)var4); // L: 489 + this.field2444 += (long)var7 * (long)var4; // L: 490 + this.patchStream.fill(var1, var2, var7); // L: 491 + var2 += var7; // L: 492 + var3 -= var7; // L: 493 + this.method3894(); // L: 494 + } while(this.midiFile.isReady()); // L: 495 + } + + this.patchStream.fill(var1, var2, var3); // L: 498 + } // L: 499 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(Lhj;ZI)V", + garbageValue = "2052345707" + ) + @Export("setMusicTrack") + synchronized void setMusicTrack(MusicTrack var1, boolean var2) { + this.clear(); // L: 97 + this.midiFile.parse(var1.midi); // L: 98 + this.field2462 = var2; // L: 99 + this.field2444 = 0L; // L: 100 + int var3 = this.midiFile.trackCount(); // L: 101 + + for (int var4 = 0; var4 < var3; ++var4) { // L: 102 + this.midiFile.gotoTrack(var4); // L: 103 + this.midiFile.readTrackLength(var4); // L: 104 + this.midiFile.markTrackPosition(var4); // L: 105 + } + + this.track = this.midiFile.getPrioritizedTrack(); // L: 107 + this.trackLength = this.midiFile.trackLengths[this.track]; // L: 108 + this.field2466 = this.midiFile.method3942(this.trackLength); // L: 109 + } // L: 110 + + @ObfuscatedName("n") + @Export("skip") + protected synchronized void skip(int var1) { + if (this.midiFile.isReady()) { // L: 502 + int var2 = this.midiFile.division * this.field2456 / PcmPlayer.field1447; // L: 503 + + do { + long var3 = (long)var2 * (long)var1 + this.field2444; // L: 505 + if (this.field2466 - var3 >= 0L) { // L: 506 + this.field2444 = var3; // L: 507 + break; + } + + int var5 = (int)((this.field2466 - this.field2444 + (long)var2 - 1L) / (long)var2); // L: 510 + this.field2444 += (long)var2 * (long)var5; // L: 511 + this.patchStream.skip(var5); // L: 512 + var1 -= var5; // L: 513 + this.method3894(); // L: 514 + } while(this.midiFile.isReady()); // L: 515 + } + + this.patchStream.skip(var1); // L: 518 + } // L: 519 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-836752904" + ) + @Export("clear") + public synchronized void clear() { + this.midiFile.clear(); // L: 113 + this.method3824(); // L: 114 + } // L: 115 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1789477746" + ) + @Export("isReady") + synchronized boolean isReady() { + return this.midiFile.isReady(); // L: 118 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1223302618" + ) + public synchronized void method3813(int var1, int var2) { + this.method3814(var1, var2); // L: 122 + } // L: 123 + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1252013432" + ) + void method3814(int var1, int var2) { + this.field2447[var1] = var2; // L: 126 + this.field2465[var1] = var2 & -128; // L: 127 + this.method3898(var1, var2); // L: 128 + } // L: 129 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "2030467233" + ) + void method3898(int var1, int var2) { + if (var2 != this.field2448[var1]) { // L: 132 + this.field2448[var1] = var2; // L: 133 + + for (int var3 = 0; var3 < 128; ++var3) { // L: 134 + this.field2460[var1][var3] = null; + } + } + + } // L: 136 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1188319217" + ) + void method3816(int var1, int var2, int var3) { + this.method3847(var1, var2, 64); // L: 139 + if ((this.field2453[var1] & 2) != 0) { // L: 140 + for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) { // L: 141 + if (var4.field2484 == var1 && var4.field2483 < 0) { // L: 142 + this.field2459[var1][var4.field2474] = null; // L: 143 + this.field2459[var1][var2] = var4; // L: 144 + int var8 = (var4.field2487 * var4.field2479 >> 12) + var4.field2477; // L: 145 + var4.field2477 += var2 - var4.field2474 << 8; // L: 146 + var4.field2487 = var8 - var4.field2477; // L: 147 + var4.field2479 = 4096; // L: 148 + var4.field2474 = var2; // L: 149 + return; // L: 150 + } + } + } + + MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.field2448[var1]); // L: 154 + if (var9 != null) { // L: 155 + RawSound var5 = var9.rawSounds[var2]; // L: 156 + if (var5 != null) { // L: 157 + MusicPatchNode var6 = new MusicPatchNode(); // L: 158 + var6.field2484 = var1; // L: 159 + var6.patch = var9; // L: 160 + var6.rawSound = var5; // L: 161 + var6.field2472 = var9.field2506[var2]; // L: 162 + var6.field2473 = var9.field2511[var2]; // L: 163 + var6.field2474 = var2; // L: 164 + var6.field2475 = var3 * var3 * var9.field2507[var2] * var9.field2513 + 1024 >> 11; // L: 165 + var6.field2481 = var9.field2509[var2] & 255; // L: 166 + var6.field2477 = (var2 << 8) - (var9.field2510[var2] & 32767); // L: 167 + var6.field2480 = 0; // L: 168 + var6.field2478 = 0; // L: 169 + var6.field2482 = 0; // L: 170 + var6.field2483 = -1; // L: 171 + var6.field2489 = 0; // L: 172 + if (this.field2441[var1] == 0) { // L: 173 + var6.stream = RawPcmStream.method2638(var5, this.method3829(var6), this.method3830(var6), this.method3831(var6)); // L: 174 + } else { + var6.stream = RawPcmStream.method2638(var5, this.method3829(var6), 0, this.method3831(var6)); // L: 177 + this.method3817(var6, var9.field2510[var2] < 0); // L: 178 + } + + if (var9.field2510[var2] < 0) { // L: 180 + var6.stream.setNumLoops(-1); + } + + if (var6.field2473 >= 0) { // L: 181 + MusicPatchNode var7 = this.field2460[var1][var6.field2473]; // L: 182 + if (var7 != null && var7.field2483 < 0) { // L: 183 + this.field2459[var1][var7.field2474] = null; // L: 184 + var7.field2483 = 0; // L: 185 + } + + this.field2460[var1][var6.field2473] = var6; // L: 187 + } + + this.patchStream.queue.addFirst(var6); // L: 189 + this.field2459[var1][var2] = var6; // L: 190 + } + } + } // L: 191 + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Lhe;ZI)V", + garbageValue = "-457799331" + ) + void method3817(MusicPatchNode var1, boolean var2) { + int var3 = var1.rawSound.samples.length; // L: 194 + int var4; + if (var2 && var1.rawSound.field1417) { // L: 196 + int var5 = var3 + var3 - var1.rawSound.start; // L: 197 + var4 = (int)((long)this.field2441[var1.field2484] * (long)var5 >> 6); // L: 198 + var3 <<= 8; // L: 199 + if (var4 >= var3) { // L: 200 + var4 = var3 + var3 - 1 - var4; // L: 201 + var1.stream.method2777(); // L: 202 + } + } else { + var4 = (int)((long)this.field2441[var1.field2484] * (long)var3 >> 6); // L: 206 + } + + var1.stream.method2646(var4); // L: 208 + } // L: 209 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIIS)V", + garbageValue = "6369" + ) + void method3847(int var1, int var2, int var3) { + MusicPatchNode var4 = this.field2459[var1][var2]; // L: 212 + if (var4 != null) { // L: 213 + this.field2459[var1][var2] = null; // L: 214 + if ((this.field2453[var1] & 2) != 0) { // L: 215 + for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 216 + if (var5.field2484 == var4.field2484 && var5.field2483 < 0 && var4 != var5) { // L: 217 + var4.field2483 = 0; // L: 218 + break; // L: 219 + } + } + } else { + var4.field2483 = 0; // L: 224 + } + + } + } // L: 226 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1803842317" + ) + void method3818(int var1, int var2, int var3) { + } // L: 228 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1018786390" + ) + void method3856(int var1, int var2) { + } // L: 229 + + @ObfuscatedName("l") @ObfuscatedSignature( descriptor = "(IIB)V", - garbageValue = "40" + garbageValue = "0" ) - void method3961(int var1, int var2) { - this.field2448[var1] = var2; - } + void method3820(int var1, int var2) { + this.field2450[var1] = var2; // L: 232 + } // L: 233 - @ObfuscatedName("ai") + @ObfuscatedName("e") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1783640245" + garbageValue = "-1073895974" ) - void method3858(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var1 < 0 || var2.field2479 == var1) { - if (var2.stream != null) { - var2.stream.method2732(class237.field3113 / 100); - if (var2.stream.method2691()) { + void method3821(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 236 + if (var1 < 0 || var2.field2484 == var1) { // L: 237 + if (var2.stream != null) { // L: 238 + var2.stream.method2681(PcmPlayer.field1447 / 100); // L: 239 + if (var2.stream.method2655()) { // L: 240 this.patchStream.mixer.addSubStream(var2.stream); } - var2.method3963(); + var2.method3926(); // L: 241 } - if (var2.field2490 < 0) { - this.field2466[var2.field2479][var2.field2481] = null; + if (var2.field2483 < 0) { // L: 243 + this.field2459[var2.field2484][var2.field2474] = null; } - var2.remove(); + var2.remove(); // L: 244 } } - } + } // L: 247 + + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1858394144" + ) + void method3808(int var1) { + if (var1 >= 0) { // L: 250 + this.field2449[var1] = 12800; // L: 254 + this.field2445[var1] = 8192; // L: 255 + this.field2446[var1] = 16383; // L: 256 + this.field2450[var1] = 8192; // L: 257 + this.field2451[var1] = 0; // L: 258 + this.field2452[var1] = 8192; // L: 259 + this.method3834(var1); // L: 260 + this.method3888(var1); // L: 261 + this.field2453[var1] = 0; // L: 262 + this.field2454[var1] = 32767; // L: 263 + this.field2455[var1] = 256; // L: 264 + this.field2441[var1] = 0; // L: 265 + this.method3828(var1, 8192); // L: 266 + } else { + for (var1 = 0; var1 < 16; ++var1) { // L: 251 + this.method3808(var1); + } + + } + } // L: 252 267 + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-980197433" + ) + void method3826(int var1) { + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 270 + if ((var1 < 0 || var2.field2484 == var1) && var2.field2483 < 0) { // L: 271 272 + this.field2459[var2.field2484][var2.field2474] = null; // L: 273 + var2.field2483 = 0; // L: 274 + } + } + + } // L: 278 @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "183029579" + descriptor = "(B)V", + garbageValue = "3" ) - void method3952(int var1) { - if (var1 >= 0) { - this.field2450[var1] = 12800; - this.field2458[var1] = 8192; - this.field2452[var1] = 16383; - this.field2448[var1] = 8192; - this.field2457[var1] = 0; - this.field2459[var1] = 8192; - this.method3857(var1); - this.method3929(var1); - this.field2460[var1] = 0; - this.field2461[var1] = 32767; - this.field2447[var1] = 256; - this.field2463[var1] = 0; - this.method3860(var1, 8192); - } else { - for (var1 = 0; var1 < 16; ++var1) { - this.method3952(var1); - } + void method3824() { + this.method3821(-1); // L: 281 + this.method3808(-1); // L: 282 + int var1; + for (var1 = 0; var1 < 16; ++var1) { // L: 283 + this.field2448[var1] = this.field2447[var1]; } - } + + for (var1 = 0; var1 < 16; ++var1) { // L: 284 + this.field2465[var1] = this.field2447[var1] & -128; + } + + } // L: 285 @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "911673263" + garbageValue = "-290917818" ) - void method3855(int var1) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if ((var1 < 0 || var2.field2479 == var1) && var2.field2490 < 0) { - this.field2466[var2.field2479][var2.field2481] = null; - var2.field2490 = 0; + void method3834(int var1) { + if ((this.field2453[var1] & 2) != 0) { // L: 288 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 289 + if (var2.field2484 == var1 && this.field2459[var1][var2.field2474] == null && var2.field2483 < 0) { // L: 290 + var2.field2483 = 0; // L: 291 + } } } - } + } // L: 295 - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-57" - ) - void method3856() { - this.method3858(-1); - this.method3952(-1); - - int var1; - for (var1 = 0; var1 < 16; ++var1) { - this.field2456[var1] = this.field2453[var1]; - } - - for (var1 = 0; var1 < 16; ++var1) { - this.field2455[var1] = this.field2453[var1] & -128; - } - - } - - @ObfuscatedName("an") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "8" + garbageValue = "30" ) - void method3857(int var1) { - if ((this.field2460[var1] & 2) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2479 == var1 && this.field2466[var1][var2.field2481] == null && var2.field2490 < 0) { - var2.field2490 = 0; + void method3888(int var1) { + if ((this.field2453[var1] & 4) != 0) { // L: 298 + for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { // L: 299 + if (var2.field2484 == var1) { // L: 300 + var2.field2486 = 0; } } } - } + } // L: 303 - @ObfuscatedName("av") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1839659310" + garbageValue = "1286820157" ) - void method3929(int var1) { - if ((this.field2460[var1] & 4) != 0) { - for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) { - if (var2.field2479 == var1) { - var2.field2478 = 0; - } - } - } - - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1915531597" - ) - void method3845(int var1) { - int var2 = var1 & 240; + void method3827(int var1) { + int var2 = var1 & 240; // L: 306 int var3; int var4; int var5; - if (var2 == 128) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - this.method3849(var3, var4, var5); - } else if (var2 == 144) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - if (var5 > 0) { - this.method3847(var3, var4, var5); + if (var2 == 128) { // L: 307 + var3 = var1 & 15; // L: 308 + var4 = var1 >> 8 & 127; // L: 309 + var5 = var1 >> 16 & 127; // L: 310 + this.method3847(var3, var4, var5); // L: 311 + } else if (var2 == 144) { // L: 314 + var3 = var1 & 15; // L: 315 + var4 = var1 >> 8 & 127; // L: 316 + var5 = var1 >> 16 & 127; // L: 317 + if (var5 > 0) { // L: 318 + this.method3816(var3, var4, var5); } else { - this.method3849(var3, var4, 64); + this.method3847(var3, var4, 64); // L: 319 } - } else if (var2 == 160) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - this.method3850(var3, var4, var5); - } else if (var2 == 176) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - var5 = var1 >> 16 & 127; - if (var4 == 0) { - this.field2455[var3] = (var5 << 14) + (this.field2455[var3] & -2080769); + } else if (var2 == 160) { // L: 322 + var3 = var1 & 15; // L: 323 + var4 = var1 >> 8 & 127; // L: 324 + var5 = var1 >> 16 & 127; // L: 325 + this.method3818(var3, var4, var5); // L: 326 + } else if (var2 == 176) { // L: 329 + var3 = var1 & 15; // L: 330 + var4 = var1 >> 8 & 127; // L: 331 + var5 = var1 >> 16 & 127; // L: 332 + if (var4 == 0) { // L: 333 + this.field2465[var3] = (var5 << 14) + (this.field2465[var3] & -2080769); } - if (var4 == 32) { - this.field2455[var3] = (var5 << 7) + (this.field2455[var3] & -16257); + if (var4 == 32) { // L: 334 + this.field2465[var3] = (var5 << 7) + (this.field2465[var3] & -16257); } - if (var4 == 1) { - this.field2457[var3] = (var5 << 7) + (this.field2457[var3] & -16257); + if (var4 == 1) { // L: 335 + this.field2451[var3] = (var5 << 7) + (this.field2451[var3] & -16257); } - if (var4 == 33) { - this.field2457[var3] = var5 + (this.field2457[var3] & -128); + if (var4 == 33) { // L: 336 + this.field2451[var3] = var5 + (this.field2451[var3] & -128); } - if (var4 == 5) { - this.field2459[var3] = (var5 << 7) + (this.field2459[var3] & -16257); - } - - if (var4 == 37) { - this.field2459[var3] = var5 + (this.field2459[var3] & -128); - } - - if (var4 == 7) { - this.field2450[var3] = (var5 << 7) + (this.field2450[var3] & -16257); - } - - if (var4 == 39) { - this.field2450[var3] = var5 + (this.field2450[var3] & -128); - } - - if (var4 == 10) { - this.field2458[var3] = (var5 << 7) + (this.field2458[var3] & -16257); - } - - if (var4 == 42) { - this.field2458[var3] = var5 + (this.field2458[var3] & -128); - } - - if (var4 == 11) { + if (var4 == 5) { // L: 337 this.field2452[var3] = (var5 << 7) + (this.field2452[var3] & -16257); } - if (var4 == 43) { + if (var4 == 37) { // L: 338 this.field2452[var3] = var5 + (this.field2452[var3] & -128); } + if (var4 == 7) { // L: 339 + this.field2449[var3] = (var5 << 7) + (this.field2449[var3] & -16257); + } + + if (var4 == 39) { // L: 340 + this.field2449[var3] = var5 + (this.field2449[var3] & -128); + } + + if (var4 == 10) { // L: 341 + this.field2445[var3] = (var5 << 7) + (this.field2445[var3] & -16257); + } + + if (var4 == 42) { // L: 342 + this.field2445[var3] = var5 + (this.field2445[var3] & -128); + } + + if (var4 == 11) { // L: 343 + this.field2446[var3] = (var5 << 7) + (this.field2446[var3] & -16257); + } + + if (var4 == 43) { // L: 344 + this.field2446[var3] = var5 + (this.field2446[var3] & -128); + } + int[] var10000; - if (var4 == 64) { - if (var5 >= 64) { - var10000 = this.field2460; + if (var4 == 64) { // L: 345 + if (var5 >= 64) { // L: 346 + var10000 = this.field2453; var10000[var3] |= 1; } else { - var10000 = this.field2460; + var10000 = this.field2453; // L: 347 var10000[var3] &= -2; } } - if (var4 == 65) { - if (var5 >= 64) { - var10000 = this.field2460; + if (var4 == 65) { // L: 349 + if (var5 >= 64) { // L: 350 + var10000 = this.field2453; var10000[var3] |= 2; } else { - this.method3857(var3); - var10000 = this.field2460; + this.method3834(var3); // L: 352 + var10000 = this.field2453; // L: 353 var10000[var3] &= -3; } } - if (var4 == 99) { - this.field2461[var3] = (var5 << 7) + (this.field2461[var3] & 127); + if (var4 == 99) { // L: 356 + this.field2454[var3] = (var5 << 7) + (this.field2454[var3] & 127); } - if (var4 == 98) { - this.field2461[var3] = (this.field2461[var3] & 16256) + var5; + if (var4 == 98) { // L: 357 + this.field2454[var3] = (this.field2454[var3] & 16256) + var5; } - if (var4 == 101) { - this.field2461[var3] = (var5 << 7) + (this.field2461[var3] & 127) + 16384; + if (var4 == 101) { // L: 358 + this.field2454[var3] = (var5 << 7) + (this.field2454[var3] & 127) + 16384; } - if (var4 == 100) { - this.field2461[var3] = (this.field2461[var3] & 16256) + var5 + 16384; + if (var4 == 100) { // L: 359 + this.field2454[var3] = (this.field2454[var3] & 16256) + var5 + 16384; } - if (var4 == 120) { - this.method3858(var3); + if (var4 == 120) { // L: 360 + this.method3821(var3); } - if (var4 == 121) { - this.method3952(var3); + if (var4 == 121) { // L: 361 + this.method3808(var3); } - if (var4 == 123) { - this.method3855(var3); + if (var4 == 123) { // L: 362 + this.method3826(var3); } int var6; - if (var4 == 6) { - var6 = this.field2461[var3]; - if (var6 == 16384) { - this.field2447[var3] = (var5 << 7) + (this.field2447[var3] & -16257); + if (var4 == 6) { // L: 363 + var6 = this.field2454[var3]; // L: 364 + if (var6 == 16384) { // L: 365 + this.field2455[var3] = (var5 << 7) + (this.field2455[var3] & -16257); } } - if (var4 == 38) { - var6 = this.field2461[var3]; - if (var6 == 16384) { - this.field2447[var3] = var5 + (this.field2447[var3] & -128); + if (var4 == 38) { // L: 367 + var6 = this.field2454[var3]; // L: 368 + if (var6 == 16384) { // L: 369 + this.field2455[var3] = var5 + (this.field2455[var3] & -128); } } - if (var4 == 16) { - this.field2463[var3] = (var5 << 7) + (this.field2463[var3] & -16257); + if (var4 == 16) { // L: 371 + this.field2441[var3] = (var5 << 7) + (this.field2441[var3] & -16257); } - if (var4 == 48) { - this.field2463[var3] = var5 + (this.field2463[var3] & -128); + if (var4 == 48) { // L: 372 + this.field2441[var3] = var5 + (this.field2441[var3] & -128); } - if (var4 == 81) { - if (var5 >= 64) { - var10000 = this.field2460; + if (var4 == 81) { // L: 373 + if (var5 >= 64) { // L: 374 + var10000 = this.field2453; var10000[var3] |= 4; } else { - this.method3929(var3); - var10000 = this.field2460; + this.method3888(var3); // L: 376 + var10000 = this.field2453; // L: 377 var10000[var3] &= -5; } } if (var4 == 17) { - this.method3860(var3, (var5 << 7) + (this.field2464[var3] & -16257)); + this.method3828(var3, (var5 << 7) + (this.field2457[var3] & -16257)); // L: 380 } - if (var4 == 49) { - this.method3860(var3, var5 + (this.field2464[var3] & -128)); + if (var4 == 49) { // L: 381 + this.method3828(var3, var5 + (this.field2457[var3] & -128)); } - } else if (var2 == 192) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - this.method3846(var3, var4 + this.field2455[var3]); - } else if (var2 == 208) { - var3 = var1 & 15; - var4 = var1 >> 8 & 127; - this.method3851(var3, var4); - } else if (var2 == 224) { - var3 = var1 & 15; - var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); - this.method3961(var3, var4); + } else if (var2 == 192) { // L: 384 + var3 = var1 & 15; // L: 385 + var4 = var1 >> 8 & 127; // L: 386 + this.method3898(var3, var4 + this.field2465[var3]); // L: 387 + } else if (var2 == 208) { // L: 390 + var3 = var1 & 15; // L: 391 + var4 = var1 >> 8 & 127; // L: 392 + this.method3856(var3, var4); // L: 393 + } else if (var2 == 224) { // L: 396 + var3 = var1 & 15; // L: 397 + var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256); // L: 398 + this.method3820(var3, var4); // L: 399 } else { - var2 = var1 & 255; - if (var2 == 255) { - this.method3856(); + var2 = var1 & 255; // L: 402 + if (var2 == 255) { // L: 403 + this.method3824(); // L: 404 } } - } + } // L: 312 320 327 382 388 394 400 405 407 - @ObfuscatedName("aa") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1375281235" + garbageValue = "1909425318" ) - void method3860(int var1, int var2) { - this.field2464[var1] = var2; - this.field2454[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); - } + void method3828(int var1, int var2) { + this.field2457[var1] = var2; // L: 410 + this.field2442[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D); // L: 411 + } // L: 412 - @ObfuscatedName("aw") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(Lhm;I)I", - garbageValue = "2062902962" + descriptor = "(Lhe;I)I", + garbageValue = "2112020444" ) - int method3861(MusicPatchNode var1) { - int var2 = (var1.field2491 * var1.field2485 >> 12) + var1.field2484; - var2 += (this.field2448[var1.field2479] - 8192) * this.field2447[var1.field2479] >> 12; - MusicPatchNode2 var3 = var1.field2477; + int method3829(MusicPatchNode var1) { + int var2 = (var1.field2479 * var1.field2487 >> 12) + var1.field2477; // L: 415 + var2 += (this.field2450[var1.field2484] - 8192) * this.field2455[var1.field2484] >> 12; // L: 416 + MusicPatchNode2 var3 = var1.field2472; // L: 417 int var4; - if (var3.field2431 > 0 && (var3.field2430 > 0 || this.field2457[var1.field2479] > 0)) { - var4 = var3.field2430 << 2; - int var5 = var3.field2425 << 1; - if (var1.field2492 < var5) { - var4 = var4 * var1.field2492 / var5; + if (var3.field2431 > 0 && (var3.field2430 > 0 || this.field2451[var1.field2484] > 0)) { // L: 418 + var4 = var3.field2430 << 2; // L: 419 + int var5 = var3.field2432 << 1; // L: 420 + if (var1.field2485 < var5) { // L: 421 + var4 = var4 * var1.field2485 / var5; } - var4 += this.field2457[var1.field2479] >> 7; - double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2476 & 511)); - var2 += (int)((double)var4 * var6); + var4 += this.field2451[var1.field2484] >> 7; // L: 422 + double var6 = Math.sin(0.01227184630308513D * (double)(var1.field2469 & 511)); // L: 423 + var2 += (int)(var6 * (double)var4); // L: 424 } - var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, 3.255208333333333E-4D * (double)var2) / (double)class237.field3113 + 0.5D); - return var4 < 1 ? 1 : var4; + var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)PcmPlayer.field1447 + 0.5D); // L: 426 + return var4 < 1 ? 1 : var4; // L: 427 } - @ObfuscatedName("az") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "(Lhm;I)I", - garbageValue = "-352128958" + descriptor = "(Lhe;I)I", + garbageValue = "1971108645" ) - int method3958(MusicPatchNode var1) { - MusicPatchNode2 var2 = var1.field2477; - int var3 = this.field2450[var1.field2479] * this.field2452[var1.field2479] + 4096 >> 13; - var3 = var3 * var3 + 16384 >> 15; - var3 = var3 * var1.field2499 + 16384 >> 15; - var3 = var3 * this.field2472 + 128 >> 8; - if (var2.field2426 > 0) { - var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2426 * 1.953125E-5D * (double)var1.field2496) + 0.5D); + int method3830(MusicPatchNode var1) { + MusicPatchNode2 var2 = var1.field2472; // L: 431 + int var3 = this.field2449[var1.field2484] * this.field2446[var1.field2484] + 4096 >> 13; // L: 432 + var3 = var3 * var3 + 16384 >> 15; // L: 433 + var3 = var3 * var1.field2475 + 16384 >> 15; // L: 434 + var3 = var3 * this.field2458 + 128 >> 8; // L: 435 + if (var2.field2425 > 0) { // L: 436 + var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field2425 * 1.953125E-5D * (double)var1.field2480) + 0.5D); // L: 437 } int var4; int var5; int var6; int var7; - if (var2.field2424 != null) { - var4 = var1.field2488; - var5 = var2.field2424[var1.field2489 + 1]; - if (var1.field2489 < var2.field2424.length - 2) { - var6 = (var2.field2424[var1.field2489] & 255) << 8; - var7 = (var2.field2424[var1.field2489 + 2] & 255) << 8; - var5 += (var2.field2424[var1.field2489 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var2.field2426 != null) { // L: 439 + var4 = var1.field2478; // L: 440 + var5 = var2.field2426[var1.field2482 + 1]; // L: 441 + if (var1.field2482 < var2.field2426.length - 2) { // L: 442 + var6 = (var2.field2426[var1.field2482] & 255) << 8; // L: 443 + var7 = (var2.field2426[var1.field2482 + 2] & 255) << 8; // L: 444 + var5 += (var4 - var6) * (var2.field2426[var1.field2482 + 3] - var5) / (var7 - var6); // L: 445 } - var3 = var5 * var3 + 32 >> 6; + var3 = var3 * var5 + 32 >> 6; // L: 447 } - if (var1.field2490 > 0 && var2.field2429 != null) { - var4 = var1.field2490; - var5 = var2.field2429[var1.field2493 + 1]; - if (var1.field2493 < var2.field2429.length - 2) { - var6 = (var2.field2429[var1.field2493] & 255) << 8; - var7 = (var2.field2429[var1.field2493 + 2] & 255) << 8; - var5 += (var2.field2429[var1.field2493 + 3] - var5) * (var4 - var6) / (var7 - var6); + if (var1.field2483 > 0 && var2.field2433 != null) { // L: 449 + var4 = var1.field2483; // L: 450 + var5 = var2.field2433[var1.field2489 + 1]; // L: 451 + if (var1.field2489 < var2.field2433.length - 2) { // L: 452 + var6 = (var2.field2433[var1.field2489] & 255) << 8; // L: 453 + var7 = (var2.field2433[var1.field2489 + 2] & 255) << 8; // L: 454 + var5 += (var2.field2433[var1.field2489 + 3] - var5) * (var4 - var6) / (var7 - var6); // L: 455 } - var3 = var3 * var5 + 32 >> 6; + var3 = var3 * var5 + 32 >> 6; // L: 457 } - return var3; - } - - @ObfuscatedName("aq") - @ObfuscatedSignature( - descriptor = "(Lhm;B)I", - garbageValue = "0" - ) - int method3912(MusicPatchNode var1) { - int var2 = this.field2458[var1.field2479]; - return var2 < 8192 ? var2 * var1.field2483 + 32 >> 6 : 16384 - ((128 - var1.field2483) * (16384 - var2) + 32 >> 6); + return var3; // L: 459 } @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-668815738" + descriptor = "(Lhe;I)I", + garbageValue = "1180870566" ) - void method3872() { - int var1 = this.track; - int var2 = this.trackLength; - - long var3; - for (var3 = this.field2473; var2 == this.trackLength; var3 = this.midiFile.method3985(var2)) { - while (var2 == this.midiFile.trackLengths[var1]) { - this.midiFile.gotoTrack(var1); - int var5 = this.midiFile.readMessage(var1); - if (var5 == 1) { - this.midiFile.setTrackDone(); - this.midiFile.markTrackPosition(var1); - if (this.midiFile.isDone()) { - if (!this.field2469 || var2 == 0) { - this.method3856(); - this.midiFile.clear(); - return; - } - - this.midiFile.reset(var3); - } - break; - } - - if ((var5 & 128) != 0) { - this.method3845(var5); - } - - this.midiFile.readTrackLength(var1); - this.midiFile.markTrackPosition(var1); - } - - var1 = this.midiFile.getPrioritizedTrack(); - var2 = this.midiFile.trackLengths[var1]; - } - - this.track = var1; - this.trackLength = var2; - this.field2473 = var3; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(Lhm;I)Z", - garbageValue = "-1517604835" - ) - boolean method3870(MusicPatchNode var1) { - if (var1.stream == null) { - if (var1.field2490 >= 0) { - var1.remove(); - if (var1.field2480 > 0 && var1 == this.field2467[var1.field2479][var1.field2480]) { - this.field2467[var1.field2479][var1.field2480] = null; - } - } - - return true; - } else { - return false; - } + int method3831(MusicPatchNode var1) { + int var2 = this.field2445[var1.field2484]; // L: 463 + return var2 < 8192 ? var2 * var1.field2481 + 32 >> 6 : 16384 - ((128 - var1.field2481) * (16384 - var2) + 32 >> 6); // L: 464 465 } @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lhm;[IIII)Z", - garbageValue = "2001156959" + descriptor = "(I)V", + garbageValue = "1881987389" ) - boolean method3897(MusicPatchNode var1, int[] var2, int var3, int var4) { - var1.field2495 = class237.field3113 / 100; - if (var1.field2490 < 0 || var1.stream != null && !var1.stream.method2690()) { - int var5 = var1.field2491; - if (var5 > 0) { - var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field2459[var1.field2479] * 4.921259842519685E-4D) + 0.5D); - if (var5 < 0) { + void method3894() { + int var1 = this.track; // L: 522 + int var2 = this.trackLength; // L: 523 + + long var3; + for (var3 = this.field2466; var2 == this.trackLength; var3 = this.midiFile.method3942(var2)) { // L: 524 525 547 + while (var2 == this.midiFile.trackLengths[var1]) { // L: 526 + this.midiFile.gotoTrack(var1); // L: 527 + int var5 = this.midiFile.readMessage(var1); // L: 528 + if (var5 == 1) { // L: 529 + this.midiFile.setTrackDone(); // L: 530 + this.midiFile.markTrackPosition(var1); // L: 531 + if (this.midiFile.isDone()) { // L: 532 + if (!this.field2462 || var2 == 0) { // L: 533 + this.method3824(); // L: 537 + this.midiFile.clear(); // L: 538 + return; // L: 539 + } + + this.midiFile.reset(var3); // L: 534 + } + break; + } + + if ((var5 & 128) != 0) { // L: 541 + this.method3827(var5); + } + + this.midiFile.readTrackLength(var1); // L: 542 + this.midiFile.markTrackPosition(var1); // L: 543 + } + + var1 = this.midiFile.getPrioritizedTrack(); // L: 545 + var2 = this.midiFile.trackLengths[var1]; // L: 546 + } + + this.track = var1; // L: 549 + this.trackLength = var2; // L: 550 + this.field2466 = var3; // L: 551 + } // L: 552 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(Lhe;I)Z", + garbageValue = "1071340203" + ) + boolean method3838(MusicPatchNode var1) { + if (var1.stream == null) { // L: 555 + if (var1.field2483 >= 0) { // L: 556 + var1.remove(); // L: 557 + if (var1.field2473 > 0 && var1 == this.field2460[var1.field2484][var1.field2473]) { // L: 558 + this.field2460[var1.field2484][var1.field2473] = null; // L: 559 + } + } + + return true; // L: 562 + } else { + return false; // L: 564 + } + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(Lhe;[IIII)Z", + garbageValue = "648141605" + ) + boolean method3839(MusicPatchNode var1, int[] var2, int var3, int var4) { + var1.field2488 = PcmPlayer.field1447 / 100; // L: 568 + if (var1.field2483 < 0 || var1.stream != null && !var1.stream.method2654()) { // L: 569 + int var5 = var1.field2479; // L: 577 + if (var5 > 0) { // L: 578 + var5 -= (int)(16.0D * Math.pow(2.0D, 4.921259842519685E-4D * (double)this.field2452[var1.field2484]) + 0.5D); // L: 579 + if (var5 < 0) { // L: 580 var5 = 0; } - var1.field2491 = var5; + var1.field2479 = var5; // L: 581 } - var1.stream.method2688(this.method3861(var1)); - MusicPatchNode2 var6 = var1.field2477; - boolean var7 = false; - ++var1.field2492; - var1.field2476 += var6.field2431; - double var8 = 5.086263020833333E-6D * (double)((var1.field2481 - 60 << 8) + (var1.field2485 * var1.field2491 >> 12)); - if (var6.field2426 > 0) { - if (var6.field2435 > 0) { - var1.field2496 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2435) + 0.5D); + var1.stream.method2652(this.method3829(var1)); // L: 583 + MusicPatchNode2 var6 = var1.field2472; // L: 584 + boolean var7 = false; // L: 585 + ++var1.field2485; // L: 586 + var1.field2469 += var6.field2431; // L: 587 + double var8 = 5.086263020833333E-6D * (double)((var1.field2474 - 60 << 8) + (var1.field2487 * var1.field2479 >> 12)); // L: 588 + if (var6.field2425 > 0) { // L: 589 + if (var6.field2429 > 0) { // L: 590 + var1.field2480 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2429) + 0.5D); } else { - var1.field2496 += 128; + var1.field2480 += 128; // L: 591 } } - if (var6.field2424 != null) { - if (var6.field2427 > 0) { - var1.field2488 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2427 * var8) + 0.5D); + if (var6.field2426 != null) { // L: 593 + if (var6.field2427 > 0) { // L: 594 + var1.field2478 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2427 * var8) + 0.5D); } else { - var1.field2488 += 128; + var1.field2478 += 128; // L: 595 } - while (var1.field2489 < var6.field2424.length - 2 && var1.field2488 > (var6.field2424[var1.field2489 + 2] & 255) << 8) { + while (var1.field2482 < var6.field2426.length - 2 && var1.field2478 > (var6.field2426[var1.field2482 + 2] & 255) << 8) { // L: 596 + var1.field2482 += 2; + } + + if (var6.field2426.length - 2 == var1.field2482 && var6.field2426[var1.field2482 + 1] == 0) { // L: 597 + var7 = true; + } + } + + if (var1.field2483 >= 0 && var6.field2433 != null && (this.field2453[var1.field2484] & 1) == 0 && (var1.field2473 < 0 || var1 != this.field2460[var1.field2484][var1.field2473])) { // L: 599 600 + if (var6.field2428 > 0) { // L: 601 + var1.field2483 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field2428) + 0.5D); + } else { + var1.field2483 += 128; // L: 602 + } + + while (var1.field2489 < var6.field2433.length - 2 && var1.field2483 > (var6.field2433[var1.field2489 + 2] & 255) << 8) { // L: 603 var1.field2489 += 2; } - if (var6.field2424.length - 2 == var1.field2489 && var6.field2424[var1.field2489 + 1] == 0) { + if (var6.field2433.length - 2 == var1.field2489) { // L: 604 var7 = true; } } - if (var1.field2490 >= 0 && var6.field2429 != null && (this.field2460[var1.field2479] & 1) == 0 && (var1.field2480 < 0 || var1 != this.field2467[var1.field2479][var1.field2480])) { - if (var6.field2428 > 0) { - var1.field2490 += (int)(128.0D * Math.pow(2.0D, (double)var6.field2428 * var8) + 0.5D); - } else { - var1.field2490 += 128; - } - - while (var1.field2493 < var6.field2429.length - 2 && var1.field2490 > (var6.field2429[var1.field2493 + 2] & 255) << 8) { - var1.field2493 += 2; - } - - if (var6.field2429.length - 2 == var1.field2493) { - var7 = true; - } - } - - if (var7) { - var1.stream.method2732(var1.field2495); - if (var2 != null) { + if (var7) { // L: 607 + var1.stream.method2681(var1.field2488); // L: 608 + if (var2 != null) { // L: 609 var1.stream.fill(var2, var3, var4); } else { - var1.stream.skip(var4); + var1.stream.skip(var4); // L: 610 } - if (var1.stream.method2691()) { + if (var1.stream.method2655()) { // L: 611 this.patchStream.mixer.addSubStream(var1.stream); } - var1.method3963(); - if (var1.field2490 >= 0) { - var1.remove(); - if (var1.field2480 > 0 && var1 == this.field2467[var1.field2479][var1.field2480]) { - this.field2467[var1.field2479][var1.field2480] = null; + var1.method3926(); // L: 612 + if (var1.field2483 >= 0) { // L: 613 + var1.remove(); // L: 614 + if (var1.field2473 > 0 && var1 == this.field2460[var1.field2484][var1.field2473]) { // L: 615 + this.field2460[var1.field2484][var1.field2473] = null; // L: 616 } } - return true; + return true; // L: 619 } else { - var1.stream.method2775(var1.field2495, this.method3958(var1), this.method3912(var1)); - return false; + var1.stream.method2650(var1.field2488, this.method3830(var1), this.method3831(var1)); // L: 621 + return false; // L: 622 } } else { - var1.method3963(); - var1.remove(); - if (var1.field2480 > 0 && var1 == this.field2467[var1.field2479][var1.field2480]) { - this.field2467[var1.field2479][var1.field2480] = null; + var1.method3926(); // L: 570 + var1.remove(); // L: 571 + if (var1.field2473 > 0 && var1 == this.field2460[var1.field2484][var1.field2473]) { // L: 572 + this.field2460[var1.field2484][var1.field2473] = null; // L: 573 } - return true; + return true; // L: 575 } } - @ObfuscatedName("q") + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)Ljg;", + garbageValue = "-2143531135" + ) + @Export("getObjectDefinition") + public static ObjectDefinition getObjectDefinition(int var0) { + ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); // L: 72 + if (var1 != null) { // L: 73 + return var1; + } else { + byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); // L: 74 + var1 = new ObjectDefinition(); // L: 75 + var1.id = var0; // L: 76 + if (var2 != null) { // L: 77 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 78 + if (var1.isSolid) { // L: 79 + var1.interactType = 0; // L: 80 + var1.boolean1 = false; // L: 81 + } + + ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); // L: 83 + return var1; // L: 84 + } + } + + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2049415960" + garbageValue = "-1815090828" ) - public static void method3918() { - synchronized(KeyHandler.KeyHandler_instance) { - ++KeyHandler.KeyHandler_idleCycles; - KeyHandler.field416 = KeyHandler.field421; - KeyHandler.field425 = 0; - int var1; - if (KeyHandler.field411 < 0) { - for (var1 = 0; var1 < 112; ++var1) { - KeyHandler.KeyHandler_pressedKeys[var1] = false; - } + static void method3920() { + Tiles.Tiles_minPlane = 99; + Tiles.field528 = new byte[4][104][104]; + Tiles.field521 = new byte[4][104][104]; // L: 50 + class297.field3668 = new byte[4][104][104]; + class171.field2049 = new byte[4][104][104]; + class204.field2421 = new int[4][105][105]; + class22.field122 = new byte[4][105][105]; // L: 54 + class39.field282 = new int[105][105]; + Tiles.Tiles_hue = new int[104]; + Tiles.Tiles_saturation = new int[104]; // L: 57 + WorldMapRectangle.Tiles_lightness = new int[104]; + WorldMapScaleHandler.Tiles_hueMultiplier = new int[104]; + class60.field453 = new int[104]; + } // L: 61 - KeyHandler.field411 = KeyHandler.field414; - } else { - while (KeyHandler.field414 != KeyHandler.field411) { - var1 = KeyHandler.field409[KeyHandler.field414]; - KeyHandler.field414 = KeyHandler.field414 + 1 & 127; - if (var1 < 0) { - KeyHandler.KeyHandler_pressedKeys[~var1] = false; - } else { - if (!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.field425 < KeyHandler.field429.length - 1) { - KeyHandler.field429[++KeyHandler.field425 - 1] = var1; - } + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "-1830398004" + ) + @Export("itemContainerSetItem") + static void itemContainerSetItem(int var0, int var1, int var2, int var3) { + ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 39 + if (var4 == null) { // L: 40 + var4 = new ItemContainer(); // L: 41 + ItemContainer.itemContainers.put(var4, (long)var0); // L: 42 + } - KeyHandler.KeyHandler_pressedKeys[var1] = true; - } - } + if (var4.ids.length <= var1) { // L: 44 + int[] var5 = new int[var1 + 1]; // L: 45 + int[] var6 = new int[var1 + 1]; // L: 46 + + int var7; + for (var7 = 0; var7 < var4.ids.length; ++var7) { // L: 47 + var5[var7] = var4.ids[var7]; // L: 48 + var6[var7] = var4.quantities[var7]; // L: 49 } - if (KeyHandler.field425 > 0) { - KeyHandler.KeyHandler_idleCycles = 0; + for (var7 = var4.ids.length; var7 < var1; ++var7) { // L: 51 + var5[var7] = -1; // L: 52 + var6[var7] = 0; // L: 53 } - KeyHandler.field421 = KeyHandler.field417; - } - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1122474734" - ) - protected static final void method3905() { - FriendLoginUpdate.clock.mark(); - - int var0; - for (var0 = 0; var0 < 32; ++var0) { - GameShell.graphicsTickTimes[var0] = 0L; + var4.ids = var5; // L: 55 + var4.quantities = var6; // L: 56 } - for (var0 = 0; var0 < 32; ++var0) { - GameShell.clientTickTimes[var0] = 0L; - } - - GameShell.gameCyclesToDo = 0; - } - - @ObfuscatedName("fr") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1626393180" - ) - @Export("forceDisconnect") - static final void forceDisconnect(int var0) { - MouseRecorder.logOut(); - switch(var0) { - case 1: - Login.loginIndex = 24; - MusicPatchPcmStream.setLoginResponseString("", "You were disconnected from the server.", ""); - break; - case 2: - GrandExchangeOfferNameComparator.method213(); - } - - } + var4.ids[var1] = var2; // L: 58 + var4.quantities[var1] = var3; // L: 59 + } // L: 60 } diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index 851b6330a8..855bae833b 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -4,202 +4,127 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fw") +@ObfuscatedName("fu") @Implements("MilliClock") public class MilliClock extends Clock { - @ObfuscatedName("u") + @ObfuscatedName("z") + long[] field2057; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -41163463 + intValue = -886018089 ) - @Export("musicTrackFileId") - public static int musicTrackFileId; - @ObfuscatedName("ds") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive0") - static Archive archive0; - @ObfuscatedName("fx") + int field2053; + @ObfuscatedName("s") @ObfuscatedGetter( - longValue = -6195405350753601003L + intValue = -786123251 ) - static long field2046; - @ObfuscatedName("m") - long[] field2041; + int field2055; + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = 4297873508162360303L + ) + long field2056; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -981834759 + ) + int field2054; @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1698832719 + intValue = 709273215 ) - int field2044; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 402474679 - ) - int field2040; - @ObfuscatedName("j") - @ObfuscatedGetter( - longValue = -6603351747931687267L - ) - long field2042; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 830495451 - ) - int field2038; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -819539781 - ) - int field2043; + int field2058; - public MilliClock() { - this.field2041 = new long[10]; - this.field2044 = 256; - this.field2040 = 1; - this.field2038 = 0; - this.field2042 = currentTimeMillis(); + MilliClock() { + this.field2057 = new long[10]; // L: 7 + this.field2053 = 256; // L: 15 + this.field2055 = 1; // L: 16 + this.field2054 = 0; // L: 17 + this.field2056 = PacketWriter.currentTimeMillis(); // L: 18 - for (int var1 = 0; var1 < 10; ++var1) { - this.field2041[var1] = this.field2042; + for (int var1 = 0; var1 < 10; ++var1) { // L: 19 + this.field2057[var1] = this.field2056; // L: 20 } - } + } // L: 22 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1017447827" + garbageValue = "208275261" ) @Export("mark") public void mark() { - for (int var1 = 0; var1 < 10; ++var1) { - this.field2041[var1] = 0L; + for (int var1 = 0; var1 < 10; ++var1) { // L: 25 + this.field2057[var1] = 0L; // L: 26 } - } + } // L: 28 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1786752641" + garbageValue = "-16016139" ) @Export("wait") public int wait(int var1, int var2) { - int var3 = this.field2044; - int var4 = this.field2040; - this.field2044 = 300; - this.field2040 = 1; - this.field2042 = currentTimeMillis(); - if (this.field2041[this.field2043] == 0L) { - this.field2044 = var3; - this.field2040 = var4; - } else if (this.field2042 > this.field2041[this.field2043]) { - this.field2044 = (int)((long)(var1 * 2560) / (this.field2042 - this.field2041[this.field2043])); + int var3 = this.field2053; // L: 31 + int var4 = this.field2055; // L: 32 + this.field2053 = 300; // L: 33 + this.field2055 = 1; // L: 34 + this.field2056 = PacketWriter.currentTimeMillis(); // L: 35 + if (this.field2057[this.field2058] == 0L) { // L: 36 + this.field2053 = var3; // L: 37 + this.field2055 = var4; // L: 38 + } else if (this.field2056 > this.field2057[this.field2058]) { // L: 40 + this.field2053 = (int)((long)(var1 * 2560) / (this.field2056 - this.field2057[this.field2058])); } - if (this.field2044 < 25) { - this.field2044 = 25; + if (this.field2053 < 25) { // L: 41 + this.field2053 = 25; } - if (this.field2044 > 256) { - this.field2044 = 256; - this.field2040 = (int)((long)var1 - (this.field2042 - this.field2041[this.field2043]) / 10L); + if (this.field2053 > 256) { // L: 42 + this.field2053 = 256; // L: 43 + this.field2055 = (int)((long)var1 - (this.field2056 - this.field2057[this.field2058]) / 10L); // L: 44 } - if (this.field2040 > var1) { - this.field2040 = var1; + if (this.field2055 > var1) { // L: 46 + this.field2055 = var1; } - this.field2041[this.field2043] = this.field2042; - this.field2043 = (this.field2043 + 1) % 10; - if (this.field2040 > 1) { - for (int var5 = 0; var5 < 10; ++var5) { - if (0L != this.field2041[var5]) { - this.field2041[var5] += (long)this.field2040; + this.field2057[this.field2058] = this.field2056; // L: 47 + this.field2058 = (this.field2058 + 1) % 10; // L: 48 + int var5; + if (this.field2055 > 1) { // L: 49 + for (var5 = 0; var5 < 10; ++var5) { // L: 50 + if (0L != this.field2057[var5]) { // L: 51 + this.field2057[var5] += (long)this.field2055; } } } - if (this.field2040 < var2) { - this.field2040 = var2; + if (this.field2055 < var2) { // L: 54 + this.field2055 = var2; } - long var8 = (long)this.field2040; - if (var8 > 0L) { - if (var8 % 10L == 0L) { - SpriteMask.sleepExact(var8 - 1L); - SpriteMask.sleepExact(1L); - } else { - SpriteMask.sleepExact(var8); - } + class227.sleepExact((long)this.field2055); // L: 55 + + for (var5 = 0; this.field2054 < 256; this.field2054 += this.field2053) { // L: 56 57 59 + ++var5; // L: 58 } - int var7; - for (var7 = 0; this.field2038 < 256; this.field2038 += this.field2044) { - ++var7; - } - - this.field2038 &= 255; - return var7; + this.field2054 &= 255; // L: 61 + return var5; // L: 62 } - @ObfuscatedName("m") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "301883572" + descriptor = "(CI)Z", + garbageValue = "-473742756" ) - @Export("currentTimeMillis") - public static final synchronized long currentTimeMillis() { - long var0 = System.currentTimeMillis(); - if (var0 < class306.field3723) { - class306.field3726 += class306.field3723 - var0; - } - - class306.field3723 = var0; - return var0 + class306.field3726; - } - - @ObfuscatedName("jh") - @ObfuscatedSignature( - descriptor = "(Lhd;S)Z", - garbageValue = "442" - ) - static final boolean method3586(Widget var0) { - int var1 = var0.contentType; - if (var1 == 205) { - Client.logoutTimer = 250; - return true; - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.changeAppearance(var2, var3 == 1); - } - - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method4139(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.changeSex(false); - } - - if (var1 == 325) { - Client.playerAppearance.changeSex(true); - } - - if (var1 == 326) { - PacketBufferNode var4 = UserComparator4.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); - Client.playerAppearance.write(var4.packetBuffer); - Client.packetWriter.addNode(var4); - return true; - } else { - return false; - } - } + @Export("isCharAlphabetic") + public static boolean isCharAlphabetic(char var0) { + return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 142 } } diff --git a/runescape-client/src/main/java/ModeWhere.java b/runescape-client/src/main/java/ModeWhere.java index 16101d4521..3495e15cf2 100644 --- a/runescape-client/src/main/java/ModeWhere.java +++ b/runescape-client/src/main/java/ModeWhere.java @@ -6,137 +6,200 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ge") +@ObfuscatedName("gy") @Implements("ModeWhere") public enum ModeWhere implements Enumerated { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lge;" - ) - field2412("", 0, new class200[]{class200.field2399}), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lge;" - ) - field2414("", 1, new class200[]{class200.field2398, class200.field2399}), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lge;" - ) - field2404("", 2, new class200[]{class200.field2398, class200.field2400, class200.field2399}), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lge;" - ) - field2405("", 3, new class200[]{class200.field2398}), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lge;" - ) - field2403("", 4), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lge;" - ) - field2406("", 5, new class200[]{class200.field2398, class200.field2399}), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lge;" - ) - field2408("", 6, new class200[]{class200.field2399}), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lge;" - ) - field2409("", 8, new class200[]{class200.field2398, class200.field2399}), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lge;" - ) - field2402("", 9, new class200[]{class200.field2398, class200.field2400}), @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgy;" ) - field2411("", 10, new class200[]{class200.field2398}), + field2413("", 0, new class200[]{class200.field2401}), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lgy;" + ) + field2405("", 1, new class200[]{class200.field2399, class200.field2401}), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lgy;" + ) + field2406("", 2, new class200[]{class200.field2399, class200.field2402, class200.field2401}), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lgy;" + ) + field2407("", 3, new class200[]{class200.field2399}), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lgy;" + ) + field2409("", 4), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lgy;" + ) + field2416("", 5, new class200[]{class200.field2399, class200.field2401}), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lgy;" + ) + field2410("", 6, new class200[]{class200.field2401}), @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgy;" ) - field2410("", 11, new class200[]{class200.field2398}), - @ObfuscatedName("y") + field2411("", 8, new class200[]{class200.field2399, class200.field2401}), + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgy;" ) - field2413("", 12, new class200[]{class200.field2398, class200.field2399}), - @ObfuscatedName("c") + field2408("", 9, new class200[]{class200.field2399, class200.field2402}), + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lge;" + descriptor = "Lgy;" ) - field2418("", 13, new class200[]{class200.field2398}); - - @ObfuscatedName("sw") + field2404("", 10, new class200[]{class200.field2399}), + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lcg;" + descriptor = "Lgy;" ) - @Export("friendSystem") - public static FriendSystem friendSystem; + field2414("", 11, new class200[]{class200.field2399}), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lgy;" + ) + field2415("", 12, new class200[]{class200.field2399, class200.field2401}), @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lgy;" + ) + field2412("", 13, new class200[]{class200.field2399}); + + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 1475259781 + intValue = 1536594685 ) @Export("id") final int id; - @ObfuscatedName("k") - final Set field2416; + @ObfuscatedName("q") + final Set field2418; + + static { + method3771(); // L: 28 + } // L: 29 @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I[Lgi;)V" + descriptor = "(Ljava/lang/String;I[Lgl;)V" ) ModeWhere(String var3, int var4, class200[] var5) { - this.field2416 = new HashSet(); - this.id = var4; - class200[] var6 = var5; + this.field2418 = new HashSet(); + this.id = var4; // L: 43 + class200[] var6 = var5; // L: 45 - for (int var7 = 0; var7 < var6.length; ++var7) { - class200 var8 = var6[var7]; - this.field2416.add(var8); + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 46 + class200 var8 = var6[var7]; // L: 47 + this.field2418.add(var8); // L: 48 } - } + } // L: 51 ModeWhere(String var3, int var4) { - this.field2416 = new HashSet(); - this.id = var4; + this.field2418 = new HashSet(); + this.id = var4; // L: 39 } - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 54 } - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ZZI)I", - garbageValue = "57776207" + descriptor = "(I)[Lgy;", + garbageValue = "-1051683174" ) - public static int method3809(boolean var0, boolean var1) { - byte var2 = 0; - int var3 = var2 + NetCache.NetCache_pendingPriorityResponsesCount + NetCache.NetCache_pendingPriorityWritesCount; - return var3; + static ModeWhere[] method3771() { + return new ModeWhere[]{field2411, field2407, field2404, field2408, field2409, field2414, field2412, field2415, field2406, field2413, field2410, field2405, field2416}; } - @ObfuscatedName("n") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "51" + descriptor = "(I)V", + garbageValue = "166019854" ) - static boolean method3810(char var0) { - return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var0) != -1; + static void method3772() { + for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 30 + if (var0.stream1 != null) { // L: 31 + Players.pcmStreamMixer.removeSubStream(var0.stream1); // L: 32 + var0.stream1 = null; // L: 33 + } + + if (var0.stream2 != null) { // L: 35 + Players.pcmStreamMixer.removeSubStream(var0.stream2); // L: 36 + var0.stream2 = null; // L: 37 + } + } + + ObjectSound.objectSounds.clear(); // L: 40 + } // L: 41 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(I)Lfa;", + garbageValue = "-839194319" + ) + public static Clock method3761() { + try { + return new NanoClock(); // L: 8 + } catch (Throwable var1) { // L: 10 + return new MilliClock(); // L: 11 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IZI)Ljava/lang/String;", + garbageValue = "1007074370" + ) + @Export("intToString") + public static String intToString(int var0, boolean var1) { + if (var1 && var0 >= 0) { // L: 105 + int var3 = var0; // L: 107 + String var2; + if (var1 && var0 >= 0) { // L: 110 + int var4 = 2; // L: 114 + + for (int var5 = var0 / 10; var5 != 0; ++var4) { // L: 115 116 118 + var5 /= 10; // L: 117 + } + + char[] var6 = new char[var4]; // L: 120 + var6[0] = '+'; // L: 121 + + for (int var7 = var4 - 1; var7 > 0; --var7) { // L: 122 + int var8 = var3; // L: 123 + var3 /= 10; // L: 124 + int var9 = var8 - var3 * 10; // L: 125 + if (var9 >= 10) { // L: 126 + var6[var7] = (char)(var9 + 87); + } else { + var6[var7] = (char)(var9 + 48); // L: 127 + } + } + + var2 = new String(var6); // L: 129 + } else { + var2 = Integer.toString(var0, 10); // L: 111 + } + + return var2; // L: 131 + } else { + return Integer.toString(var0); + } } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 78a709ff9c..9e1748dfef 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -3,150 +3,150 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ef") +@ObfuscatedName("er") @Implements("Model") public class Model extends Entity { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Ler;" ) @Export("Model_sharedSequenceModel") static Model Model_sharedSequenceModel; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("Model_sharedSequenceModelFaceAlphas") static byte[] Model_sharedSequenceModelFaceAlphas; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Ler;" ) @Export("Model_sharedSpotAnimationModel") static Model Model_sharedSpotAnimationModel; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("Model_sharedSpotAnimationModelFaceAlphas") static byte[] Model_sharedSpotAnimationModelFaceAlphas; - @ObfuscatedName("al") - static boolean[] field1735; - @ObfuscatedName("an") - static boolean[] field1752; - @ObfuscatedName("ac") + @ObfuscatedName("ah") + static boolean[] field1747; + @ObfuscatedName("av") + static boolean[] field1734; + @ObfuscatedName("ax") @Export("modelViewportXs") static int[] modelViewportXs; - @ObfuscatedName("av") + @ObfuscatedName("as") @Export("modelViewportYs") static int[] modelViewportYs; - @ObfuscatedName("af") + @ObfuscatedName("az") + static int[] field1760; + @ObfuscatedName("ad") + static int[] field1728; + @ObfuscatedName("ai") static int[] field1739; - @ObfuscatedName("at") + @ObfuscatedName("ay") static int[] field1740; - @ObfuscatedName("aa") - static int[] field1736; @ObfuscatedName("aw") static int[] field1742; - @ObfuscatedName("aq") + @ObfuscatedName("af") + static int[][] field1743; + @ObfuscatedName("ak") static int[] field1744; - @ObfuscatedName("ay") + @ObfuscatedName("ac") static int[][] field1745; - @ObfuscatedName("au") - static int[] field1699; - @ObfuscatedName("aj") - static int[][] field1747; - @ObfuscatedName("bk") - static int[] field1698; + @ObfuscatedName("bl") + static int[] field1746; + @ObfuscatedName("bc") + static int[] field1701; + @ObfuscatedName("bz") + static int[] field1748; + @ObfuscatedName("bj") + static int[] field1749; @ObfuscatedName("bh") - static int[] field1722; - @ObfuscatedName("bg") static int[] field1750; - @ObfuscatedName("be") + @ObfuscatedName("bi") static int[] field1751; - @ObfuscatedName("bf") - static int[] field1716; - @ObfuscatedName("ba") - static int[] field1728; - @ObfuscatedName("bd") + @ObfuscatedName("bg") @Export("Model_transformTempX") static int Model_transformTempX; - @ObfuscatedName("bb") + @ObfuscatedName("br") @Export("Model_transformTempY") static int Model_transformTempY; - @ObfuscatedName("bw") + @ObfuscatedName("bp") @Export("Model_transformTempZ") static int Model_transformTempZ; - @ObfuscatedName("bq") - static boolean field1713; - @ObfuscatedName("bo") + @ObfuscatedName("bn") + static boolean field1700; + @ObfuscatedName("bu") @Export("Model_sine") static int[] Model_sine; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @Export("Model_cosine") static int[] Model_cosine; @ObfuscatedName("bm") - static int[] field1757; - @ObfuscatedName("bl") - static int[] field1763; - @ObfuscatedName("p") + static int[] field1756; + @ObfuscatedName("bd") + static int[] field1761; + @ObfuscatedName("i") @Export("verticesCount") int verticesCount; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("verticesX") int[] verticesX; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("verticesY") int[] verticesY; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("indicesCount") int indicesCount; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("indices1") int[] indices1; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("indices2") int[] indices2; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("indices3") int[] indices3; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("faceColors1") int[] faceColors1; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("faceColors2") int[] faceColors2; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("faceColors3") int[] faceColors3; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("faceAlphas") byte[] faceAlphas; + @ObfuscatedName("y") + byte[] field1757; @ObfuscatedName("v") - byte[] field1731; - @ObfuscatedName("d") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("e") - byte field1715; - @ObfuscatedName("l") - int field1730; - @ObfuscatedName("t") - int[] field1717; - @ObfuscatedName("x") - int[] field1718; + @ObfuscatedName("j") + byte field1720; + @ObfuscatedName("r") + int field1714; + @ObfuscatedName("u") + int[] field1715; + @ObfuscatedName("p") + int[] field1716; @ObfuscatedName("b") - int[] field1719; - @ObfuscatedName("i") + int[] field1717; + @ObfuscatedName("l") @Export("vertexLabels") int[][] vertexLabels; - @ObfuscatedName("f") + @ObfuscatedName("e") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @Export("isSingleTile") public boolean isSingleTile; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @Export("boundsType") int boundsType; @ObfuscatedName("ao") @@ -155,261 +155,261 @@ public class Model extends Entity { @ObfuscatedName("ae") @Export("xzRadius") int xzRadius; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("diameter") int diameter; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("radius") int radius; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @Export("xMid") int xMid; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("yMid") int yMid; - @ObfuscatedName("ak") + @ObfuscatedName("aa") @Export("zMid") int zMid; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @Export("xMidOffset") int xMidOffset; - @ObfuscatedName("as") + @ObfuscatedName("at") @Export("yMidOffset") int yMidOffset; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("zMidOffset") int zMidOffset; static { - Model_sharedSequenceModel = new Model(); - Model_sharedSequenceModelFaceAlphas = new byte[1]; - Model_sharedSpotAnimationModel = new Model(); - Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; - field1735 = new boolean[4700]; - field1752 = new boolean[4700]; - modelViewportXs = new int[4700]; - modelViewportYs = new int[4700]; - field1739 = new int[4700]; - field1740 = new int[4700]; - field1736 = new int[4700]; - field1742 = new int[4700]; - field1744 = new int[1600]; - field1745 = new int[1600][512]; - field1699 = new int[12]; - field1747 = new int[12][2000]; - field1698 = new int[2000]; - field1722 = new int[2000]; - field1750 = new int[12]; - field1751 = new int[10]; - field1716 = new int[10]; - field1728 = new int[10]; - field1713 = true; - Model_sine = Rasterizer3D.Rasterizer3D_sine; - Model_cosine = Rasterizer3D.Rasterizer3D_cosine; - field1757 = Rasterizer3D.Rasterizer3D_colorPalette; - field1763 = Rasterizer3D.field1791; + Model_sharedSequenceModel = new Model(); // L: 6 + Model_sharedSequenceModelFaceAlphas = new byte[1]; // L: 7 + Model_sharedSpotAnimationModel = new Model(); // L: 8 + Model_sharedSpotAnimationModelFaceAlphas = new byte[1]; // L: 9 + field1747 = new boolean[4700]; // L: 45 + field1734 = new boolean[4700]; // L: 46 + modelViewportXs = new int[4700]; // L: 47 + modelViewportYs = new int[4700]; // L: 48 + field1760 = new int[4700]; // L: 49 + field1728 = new int[4700]; // L: 50 + field1739 = new int[4700]; // L: 51 + field1740 = new int[4700]; // L: 52 + field1742 = new int[1600]; // L: 54 + field1743 = new int[1600][512]; // L: 55 + field1744 = new int[12]; // L: 56 + field1745 = new int[12][2000]; // L: 57 + field1746 = new int[2000]; // L: 58 + field1701 = new int[2000]; // L: 59 + field1748 = new int[12]; // L: 60 + field1749 = new int[10]; // L: 61 + field1750 = new int[10]; // L: 62 + field1751 = new int[10]; // L: 63 + field1700 = true; // L: 67 + Model_sine = Rasterizer3D.Rasterizer3D_sine; // L: 70 + Model_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 71 + field1756 = Rasterizer3D.Rasterizer3D_colorPalette; // L: 72 + field1761 = Rasterizer3D.field1809; // L: 73 } Model() { this.verticesCount = 0; this.indicesCount = 0; - this.field1715 = 0; - this.field1730 = 0; + this.field1720 = 0; + this.field1714 = 0; this.isSingleTile = false; this.xMidOffset = -1; this.yMidOffset = -1; this.zMidOffset = -1; - } + } // L: 77 @ObfuscatedSignature( - descriptor = "([Lef;I)V" + descriptor = "([Ler;I)V" ) public Model(Model[] var1, int var2) { - this.verticesCount = 0; - this.indicesCount = 0; - this.field1715 = 0; - this.field1730 = 0; - this.isSingleTile = false; - this.xMidOffset = -1; - this.yMidOffset = -1; - this.zMidOffset = -1; - boolean var3 = false; - boolean var4 = false; - boolean var5 = false; - boolean var6 = false; - this.verticesCount = 0; - this.indicesCount = 0; - this.field1730 = 0; - this.field1715 = -1; + this.verticesCount = 0; // L: 10 + this.indicesCount = 0; // L: 14 + this.field1720 = 0; // L: 25 + this.field1714 = 0; // L: 26 + this.isSingleTile = false; // L: 32 + this.xMidOffset = -1; // L: 41 + this.yMidOffset = -1; // L: 42 + this.zMidOffset = -1; // L: 43 + boolean var3 = false; // L: 80 + boolean var4 = false; // L: 81 + boolean var5 = false; // L: 82 + boolean var6 = false; // L: 83 + this.verticesCount = 0; // L: 84 + this.indicesCount = 0; // L: 85 + this.field1714 = 0; // L: 86 + this.field1720 = -1; // L: 87 int var7; Model var8; - for (var7 = 0; var7 < var2; ++var7) { - var8 = var1[var7]; - if (var8 != null) { - this.verticesCount += var8.verticesCount; - this.indicesCount += var8.indicesCount; - this.field1730 += var8.field1730; - if (var8.faceRenderPriorities != null) { + for (var7 = 0; var7 < var2; ++var7) { // L: 88 + var8 = var1[var7]; // L: 89 + if (var8 != null) { // L: 90 + this.verticesCount += var8.verticesCount; // L: 91 + this.indicesCount += var8.indicesCount; // L: 92 + this.field1714 += var8.field1714; // L: 93 + if (var8.faceRenderPriorities != null) { // L: 94 var3 = true; } else { - if (this.field1715 == -1) { - this.field1715 = var8.field1715; + if (this.field1720 == -1) { // L: 96 + this.field1720 = var8.field1720; } - if (this.field1715 != var8.field1715) { + if (this.field1720 != var8.field1720) { // L: 97 var3 = true; } } - var4 |= var8.faceAlphas != null; - var5 |= var8.faceTextures != null; - var6 |= var8.field1731 != null; + var4 |= var8.faceAlphas != null; // L: 99 + var5 |= var8.faceTextures != null; // L: 100 + var6 |= var8.field1757 != null; // L: 101 } } - this.verticesX = new int[this.verticesCount]; - this.verticesY = new int[this.verticesCount]; - this.verticesZ = new int[this.verticesCount]; - this.indices1 = new int[this.indicesCount]; - this.indices2 = new int[this.indicesCount]; - this.indices3 = new int[this.indicesCount]; - this.faceColors1 = new int[this.indicesCount]; - this.faceColors2 = new int[this.indicesCount]; - this.faceColors3 = new int[this.indicesCount]; - if (var3) { + this.verticesX = new int[this.verticesCount]; // L: 104 + this.verticesY = new int[this.verticesCount]; // L: 105 + this.verticesZ = new int[this.verticesCount]; // L: 106 + this.indices1 = new int[this.indicesCount]; // L: 107 + this.indices2 = new int[this.indicesCount]; // L: 108 + this.indices3 = new int[this.indicesCount]; // L: 109 + this.faceColors1 = new int[this.indicesCount]; // L: 110 + this.faceColors2 = new int[this.indicesCount]; // L: 111 + this.faceColors3 = new int[this.indicesCount]; // L: 112 + if (var3) { // L: 113 this.faceRenderPriorities = new byte[this.indicesCount]; } - if (var4) { + if (var4) { // L: 114 this.faceAlphas = new byte[this.indicesCount]; } - if (var5) { + if (var5) { // L: 115 this.faceTextures = new short[this.indicesCount]; } - if (var6) { - this.field1731 = new byte[this.indicesCount]; + if (var6) { // L: 116 + this.field1757 = new byte[this.indicesCount]; } - if (this.field1730 > 0) { - this.field1717 = new int[this.field1730]; - this.field1718 = new int[this.field1730]; - this.field1719 = new int[this.field1730]; + if (this.field1714 > 0) { // L: 117 + this.field1715 = new int[this.field1714]; // L: 118 + this.field1716 = new int[this.field1714]; // L: 119 + this.field1717 = new int[this.field1714]; // L: 120 } - this.verticesCount = 0; - this.indicesCount = 0; - this.field1730 = 0; + this.verticesCount = 0; // L: 122 + this.indicesCount = 0; // L: 123 + this.field1714 = 0; // L: 124 - for (var7 = 0; var7 < var2; ++var7) { - var8 = var1[var7]; - if (var8 != null) { + for (var7 = 0; var7 < var2; ++var7) { // L: 125 + var8 = var1[var7]; // L: 126 + if (var8 != null) { // L: 127 int var9; - for (var9 = 0; var9 < var8.indicesCount; ++var9) { - this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; - this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; - this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; - this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; - this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; - this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; - if (var3) { - if (var8.faceRenderPriorities != null) { + for (var9 = 0; var9 < var8.indicesCount; ++var9) { // L: 128 + this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9]; // L: 129 + this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9]; // L: 130 + this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9]; // L: 131 + this.faceColors1[this.indicesCount] = var8.faceColors1[var9]; // L: 132 + this.faceColors2[this.indicesCount] = var8.faceColors2[var9]; // L: 133 + this.faceColors3[this.indicesCount] = var8.faceColors3[var9]; // L: 134 + if (var3) { // L: 135 + if (var8.faceRenderPriorities != null) { // L: 136 this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9]; } else { - this.faceRenderPriorities[this.indicesCount] = var8.field1715; + this.faceRenderPriorities[this.indicesCount] = var8.field1720; // L: 137 } } - if (var4 && var8.faceAlphas != null) { + if (var4 && var8.faceAlphas != null) { // L: 139 140 this.faceAlphas[this.indicesCount] = var8.faceAlphas[var9]; } - if (var5) { - if (var8.faceTextures != null) { + if (var5) { // L: 142 + if (var8.faceTextures != null) { // L: 143 this.faceTextures[this.indicesCount] = var8.faceTextures[var9]; } else { - this.faceTextures[this.indicesCount] = -1; + this.faceTextures[this.indicesCount] = -1; // L: 144 } } - if (var6) { - if (var8.field1731 != null && var8.field1731[var9] != -1) { - this.field1731[this.indicesCount] = (byte)(this.field1730 + var8.field1731[var9]); + if (var6) { // L: 146 + if (var8.field1757 != null && var8.field1757[var9] != -1) { // L: 147 + this.field1757[this.indicesCount] = (byte)(this.field1714 + var8.field1757[var9]); } else { - this.field1731[this.indicesCount] = -1; + this.field1757[this.indicesCount] = -1; // L: 148 } } - ++this.indicesCount; + ++this.indicesCount; // L: 150 } - for (var9 = 0; var9 < var8.field1730; ++var9) { - this.field1717[this.field1730] = this.verticesCount + var8.field1717[var9]; - this.field1718[this.field1730] = this.verticesCount + var8.field1718[var9]; - this.field1719[this.field1730] = this.verticesCount + var8.field1719[var9]; - ++this.field1730; + for (var9 = 0; var9 < var8.field1714; ++var9) { // L: 152 + this.field1715[this.field1714] = this.verticesCount + var8.field1715[var9]; // L: 153 + this.field1716[this.field1714] = this.verticesCount + var8.field1716[var9]; // L: 154 + this.field1717[this.field1714] = this.verticesCount + var8.field1717[var9]; // L: 155 + ++this.field1714; // L: 156 } - for (var9 = 0; var9 < var8.verticesCount; ++var9) { - this.verticesX[this.verticesCount] = var8.verticesX[var9]; - this.verticesY[this.verticesCount] = var8.verticesY[var9]; - this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; - ++this.verticesCount; + for (var9 = 0; var9 < var8.verticesCount; ++var9) { // L: 158 + this.verticesX[this.verticesCount] = var8.verticesX[var9]; // L: 159 + this.verticesY[this.verticesCount] = var8.verticesY[var9]; // L: 160 + this.verticesZ[this.verticesCount] = var8.verticesZ[var9]; // L: 161 + ++this.verticesCount; // L: 162 } } } - } + } // L: 166 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lef;" + descriptor = "([[IIIIZI)Ler;" ) @Export("contourGround") public Model contourGround(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - this.calculateBoundsCylinder(); - int var7 = var2 - this.xzRadius; - int var8 = var2 + this.xzRadius; - int var9 = var4 - this.xzRadius; - int var10 = var4 + this.xzRadius; - if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { - var7 >>= 7; - var8 = var8 + 127 >> 7; - var9 >>= 7; - var10 = var10 + 127 >> 7; - if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { + this.calculateBoundsCylinder(); // L: 169 + int var7 = var2 - this.xzRadius; // L: 170 + int var8 = var2 + this.xzRadius; // L: 171 + int var9 = var4 - this.xzRadius; // L: 172 + int var10 = var4 + this.xzRadius; // L: 173 + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 174 + var7 >>= 7; // L: 175 + var8 = var8 + 127 >> 7; // L: 176 + var9 >>= 7; // L: 177 + var10 = var10 + 127 >> 7; // L: 178 + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 179 return this; } else { Model var11; - if (var5) { - var11 = new Model(); - var11.verticesCount = this.verticesCount; - var11.indicesCount = this.indicesCount; - var11.field1730 = this.field1730; - var11.verticesX = this.verticesX; - var11.verticesZ = this.verticesZ; - var11.indices1 = this.indices1; - var11.indices2 = this.indices2; - var11.indices3 = this.indices3; - var11.faceColors1 = this.faceColors1; - var11.faceColors2 = this.faceColors2; - var11.faceColors3 = this.faceColors3; - var11.faceRenderPriorities = this.faceRenderPriorities; - var11.faceAlphas = this.faceAlphas; - var11.field1731 = this.field1731; - var11.faceTextures = this.faceTextures; - var11.field1715 = this.field1715; - var11.field1717 = this.field1717; - var11.field1718 = this.field1718; - var11.field1719 = this.field1719; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.isSingleTile = this.isSingleTile; - var11.verticesY = new int[var11.verticesCount]; + if (var5) { // L: 181 + var11 = new Model(); // L: 182 + var11.verticesCount = this.verticesCount; // L: 183 + var11.indicesCount = this.indicesCount; // L: 184 + var11.field1714 = this.field1714; // L: 185 + var11.verticesX = this.verticesX; // L: 186 + var11.verticesZ = this.verticesZ; // L: 187 + var11.indices1 = this.indices1; // L: 188 + var11.indices2 = this.indices2; // L: 189 + var11.indices3 = this.indices3; // L: 190 + var11.faceColors1 = this.faceColors1; // L: 191 + var11.faceColors2 = this.faceColors2; // L: 192 + var11.faceColors3 = this.faceColors3; // L: 193 + var11.faceRenderPriorities = this.faceRenderPriorities; // L: 194 + var11.faceAlphas = this.faceAlphas; // L: 195 + var11.field1757 = this.field1757; // L: 196 + var11.faceTextures = this.faceTextures; // L: 197 + var11.field1720 = this.field1720; // L: 198 + var11.field1715 = this.field1715; // L: 199 + var11.field1716 = this.field1716; // L: 200 + var11.field1717 = this.field1717; // L: 201 + var11.vertexLabels = this.vertexLabels; // L: 202 + var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 203 + var11.isSingleTile = this.isSingleTile; // L: 204 + var11.verticesY = new int[var11.verticesCount]; // L: 205 } else { - var11 = this; + var11 = this; // L: 208 } int var12; @@ -422,495 +422,495 @@ public class Model extends Entity { int var19; int var20; int var21; - if (var6 == 0) { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = var2 + this.verticesX[var12]; - var14 = var4 + this.verticesZ[var12]; - var15 = var13 & 127; - var16 = var14 & 127; - var17 = var13 >> 7; - var18 = var14 >> 7; - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; - var21 = var19 * (128 - var16) + var20 * var16 >> 7; - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + if (var6 == 0) { // L: 210 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 211 + var13 = var2 + this.verticesX[var12]; // L: 212 + var14 = var4 + this.verticesZ[var12]; // L: 213 + var15 = var13 & 127; // L: 214 + var16 = var14 & 127; // L: 215 + var17 = var13 >> 7; // L: 216 + var18 = var14 >> 7; // L: 217 + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 218 + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 219 + var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 220 + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 221 } } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = (-this.verticesY[var12] << 16) / super.height; - if (var13 < var6) { - var14 = var2 + this.verticesX[var12]; - var15 = var4 + this.verticesZ[var12]; - var16 = var14 & 127; - var17 = var15 & 127; - var18 = var14 >> 7; - var19 = var15 >> 7; - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 225 + var13 = (-this.verticesY[var12] << 16) / super.height; // L: 226 + if (var13 < var6) { // L: 227 + var14 = var2 + this.verticesX[var12]; // L: 228 + var15 = var4 + this.verticesZ[var12]; // L: 229 + var16 = var14 & 127; // L: 230 + var17 = var15 & 127; // L: 231 + var18 = var14 >> 7; // L: 232 + var19 = var15 >> 7; // L: 233 + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 234 + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 235 + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 236 + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 237 } } } - var11.resetBounds(); - return var11; + var11.resetBounds(); // L: 241 + return var11; // L: 242 } } else { return this; } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Z)Lef;" + descriptor = "(Z)Ler;" ) @Export("toSharedSequenceModel") public Model toSharedSequenceModel(boolean var1) { - if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { + if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) { // L: 246 Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); + return this.buildSharedModel(var1, Model_sharedSequenceModel, Model_sharedSequenceModelFaceAlphas); // L: 247 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Z)Lef;" + descriptor = "(Z)Ler;" ) @Export("toSharedSpotAnimationModel") public Model toSharedSpotAnimationModel(boolean var1) { - if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { + if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) { // L: 251 Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100]; } - return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); + return this.buildSharedModel(var1, Model_sharedSpotAnimationModel, Model_sharedSpotAnimationModelFaceAlphas); // L: 252 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(ZLef;[B)Lef;" + descriptor = "(ZLer;[B)Ler;" ) @Export("buildSharedModel") Model buildSharedModel(boolean var1, Model var2, byte[] var3) { - var2.verticesCount = this.verticesCount; - var2.indicesCount = this.indicesCount; - var2.field1730 = this.field1730; - if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { - var2.verticesX = new int[this.verticesCount + 100]; - var2.verticesY = new int[this.verticesCount + 100]; - var2.verticesZ = new int[this.verticesCount + 100]; + var2.verticesCount = this.verticesCount; // L: 256 + var2.indicesCount = this.indicesCount; // L: 257 + var2.field1714 = this.field1714; // L: 258 + if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) { // L: 259 + var2.verticesX = new int[this.verticesCount + 100]; // L: 260 + var2.verticesY = new int[this.verticesCount + 100]; // L: 261 + var2.verticesZ = new int[this.verticesCount + 100]; // L: 262 } int var4; - for (var4 = 0; var4 < this.verticesCount; ++var4) { - var2.verticesX[var4] = this.verticesX[var4]; - var2.verticesY[var4] = this.verticesY[var4]; - var2.verticesZ[var4] = this.verticesZ[var4]; + for (var4 = 0; var4 < this.verticesCount; ++var4) { // L: 264 + var2.verticesX[var4] = this.verticesX[var4]; // L: 265 + var2.verticesY[var4] = this.verticesY[var4]; // L: 266 + var2.verticesZ[var4] = this.verticesZ[var4]; // L: 267 } - if (var1) { + if (var1) { // L: 269 var2.faceAlphas = this.faceAlphas; } else { - var2.faceAlphas = var3; - if (this.faceAlphas == null) { - for (var4 = 0; var4 < this.indicesCount; ++var4) { + var2.faceAlphas = var3; // L: 271 + if (this.faceAlphas == null) { // L: 272 + for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 273 var2.faceAlphas[var4] = 0; } } else { - for (var4 = 0; var4 < this.indicesCount; ++var4) { + for (var4 = 0; var4 < this.indicesCount; ++var4) { // L: 276 var2.faceAlphas[var4] = this.faceAlphas[var4]; } } } - var2.indices1 = this.indices1; - var2.indices2 = this.indices2; - var2.indices3 = this.indices3; - var2.faceColors1 = this.faceColors1; - var2.faceColors2 = this.faceColors2; - var2.faceColors3 = this.faceColors3; - var2.faceRenderPriorities = this.faceRenderPriorities; - var2.field1731 = this.field1731; - var2.faceTextures = this.faceTextures; - var2.field1715 = this.field1715; - var2.field1717 = this.field1717; - var2.field1718 = this.field1718; - var2.field1719 = this.field1719; - var2.vertexLabels = this.vertexLabels; - var2.faceLabelsAlpha = this.faceLabelsAlpha; - var2.isSingleTile = this.isSingleTile; - var2.resetBounds(); - return var2; + var2.indices1 = this.indices1; // L: 279 + var2.indices2 = this.indices2; // L: 280 + var2.indices3 = this.indices3; // L: 281 + var2.faceColors1 = this.faceColors1; // L: 282 + var2.faceColors2 = this.faceColors2; // L: 283 + var2.faceColors3 = this.faceColors3; // L: 284 + var2.faceRenderPriorities = this.faceRenderPriorities; // L: 285 + var2.field1757 = this.field1757; // L: 286 + var2.faceTextures = this.faceTextures; // L: 287 + var2.field1720 = this.field1720; // L: 288 + var2.field1715 = this.field1715; // L: 289 + var2.field1716 = this.field1716; // L: 290 + var2.field1717 = this.field1717; // L: 291 + var2.vertexLabels = this.vertexLabels; // L: 292 + var2.faceLabelsAlpha = this.faceLabelsAlpha; // L: 293 + var2.isSingleTile = this.isSingleTile; // L: 294 + var2.resetBounds(); // L: 295 + return var2; // L: 296 } - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("calculateBoundingBox") void calculateBoundingBox(int var1) { - if (this.xMidOffset == -1) { - int var2 = 0; - int var3 = 0; - int var4 = 0; - int var5 = 0; - int var6 = 0; - int var7 = 0; - int var8 = Model_cosine[var1]; - int var9 = Model_sine[var1]; + if (this.xMidOffset == -1) { // L: 300 + int var2 = 0; // L: 301 + int var3 = 0; // L: 302 + int var4 = 0; // L: 303 + int var5 = 0; // L: 304 + int var6 = 0; // L: 305 + int var7 = 0; // L: 306 + int var8 = Model_cosine[var1]; // L: 307 + int var9 = Model_sine[var1]; // L: 308 - for (int var10 = 0; var10 < this.verticesCount; ++var10) { - int var11 = Rasterizer3D.method3131(this.verticesX[var10], this.verticesZ[var10], var8, var9); - int var12 = this.verticesY[var10]; - int var13 = Rasterizer3D.method3118(this.verticesX[var10], this.verticesZ[var10], var8, var9); - if (var11 < var2) { + for (int var10 = 0; var10 < this.verticesCount; ++var10) { // L: 309 + int var11 = Rasterizer3D.method3129(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 310 + int var12 = this.verticesY[var10]; // L: 311 + int var13 = Rasterizer3D.method3130(this.verticesX[var10], this.verticesZ[var10], var8, var9); // L: 312 + if (var11 < var2) { // L: 313 var2 = var11; } - if (var11 > var5) { + if (var11 > var5) { // L: 314 var5 = var11; } - if (var12 < var3) { + if (var12 < var3) { // L: 315 var3 = var12; } - if (var12 > var6) { + if (var12 > var6) { // L: 316 var6 = var12; } - if (var13 < var4) { + if (var13 < var4) { // L: 317 var4 = var13; } - if (var13 > var7) { + if (var13 > var7) { // L: 318 var7 = var13; } } - this.xMid = (var5 + var2) / 2; - this.yMid = (var6 + var3) / 2; - this.zMid = (var7 + var4) / 2; - this.xMidOffset = (var5 - var2 + 1) / 2; - this.yMidOffset = (var6 - var3 + 1) / 2; - this.zMidOffset = (var7 - var4 + 1) / 2; - if (this.xMidOffset < 32) { + this.xMid = (var5 + var2) / 2; // L: 320 + this.yMid = (var6 + var3) / 2; // L: 321 + this.zMid = (var7 + var4) / 2; // L: 322 + this.xMidOffset = (var5 - var2 + 1) / 2; // L: 323 + this.yMidOffset = (var6 - var3 + 1) / 2; // L: 324 + this.zMidOffset = (var7 - var4 + 1) / 2; // L: 325 + if (this.xMidOffset < 32) { // L: 327 this.xMidOffset = 32; } - if (this.zMidOffset < 32) { + if (this.zMidOffset < 32) { // L: 328 this.zMidOffset = 32; } - if (this.isSingleTile) { - this.xMidOffset += 8; - this.zMidOffset += 8; + if (this.isSingleTile) { // L: 329 + this.xMidOffset += 8; // L: 331 + this.zMidOffset += 8; // L: 332 } } - } + } // L: 334 - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("calculateBoundsCylinder") public void calculateBoundsCylinder() { - if (this.boundsType != 1) { - this.boundsType = 1; - super.height = 0; - this.bottomY = 0; - this.xzRadius = 0; + if (this.boundsType != 1) { // L: 337 + this.boundsType = 1; // L: 338 + super.height = 0; // L: 339 + this.bottomY = 0; // L: 340 + this.xzRadius = 0; // L: 341 - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - int var3 = this.verticesY[var1]; - int var4 = this.verticesZ[var1]; - if (-var3 > super.height) { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 342 + int var2 = this.verticesX[var1]; // L: 343 + int var3 = this.verticesY[var1]; // L: 344 + int var4 = this.verticesZ[var1]; // L: 345 + if (-var3 > super.height) { // L: 346 super.height = -var3; } - if (var3 > this.bottomY) { + if (var3 > this.bottomY) { // L: 347 this.bottomY = var3; } - int var5 = var2 * var2 + var4 * var4; - if (var5 > this.xzRadius) { + int var5 = var2 * var2 + var4 * var4; // L: 348 + if (var5 > this.xzRadius) { // L: 349 this.xzRadius = var5; } } - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); - this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); - this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 351 + this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D); // L: 352 + this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D); // L: 353 } - } + } // L: 354 - @ObfuscatedName("n") - void method2998() { - if (this.boundsType != 2) { - this.boundsType = 2; - this.xzRadius = 0; + @ObfuscatedName("x") + void method2992() { + if (this.boundsType != 2) { // L: 357 + this.boundsType = 2; // L: 358 + this.xzRadius = 0; // L: 359 - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - int var3 = this.verticesY[var1]; - int var4 = this.verticesZ[var1]; - int var5 = var2 * var2 + var4 * var4 + var3 * var3; - if (var5 > this.xzRadius) { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 360 + int var2 = this.verticesX[var1]; // L: 361 + int var3 = this.verticesY[var1]; // L: 362 + int var4 = this.verticesZ[var1]; // L: 363 + int var5 = var2 * var2 + var4 * var4 + var3 * var3; // L: 364 + if (var5 > this.xzRadius) { // L: 365 this.xzRadius = var5; } } - this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); - this.radius = this.xzRadius; - this.diameter = this.xzRadius + this.xzRadius; + this.xzRadius = (int)(Math.sqrt((double)this.xzRadius) + 0.99D); // L: 367 + this.radius = this.xzRadius; // L: 368 + this.diameter = this.xzRadius + this.xzRadius; // L: 369 } - } - - @ObfuscatedName("u") - public int method2999() { - this.calculateBoundsCylinder(); - return this.xzRadius; - } - - @ObfuscatedName("z") - @Export("resetBounds") - void resetBounds() { - this.boundsType = 0; - this.xMidOffset = -1; - } + } // L: 370 @ObfuscatedName("w") + public int method3016() { + this.calculateBoundsCylinder(); // L: 373 + return this.xzRadius; // L: 374 + } + + @ObfuscatedName("m") + @Export("resetBounds") + void resetBounds() { + this.boundsType = 0; // L: 378 + this.xMidOffset = -1; // L: 379 + } // L: 380 + + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Leg;I)V" + descriptor = "(Lef;I)V" ) @Export("animate") public void animate(Frames var1, int var2) { - if (this.vertexLabels != null) { - if (var2 != -1) { - Animation var3 = var1.frames[var2]; - Skeleton var4 = var3.skeleton; - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; + if (this.vertexLabels != null) { // L: 383 + if (var2 != -1) { // L: 384 + Animation var3 = var1.frames[var2]; // L: 385 + Skeleton var4 = var3.skeleton; // L: 386 + Model_transformTempX = 0; // L: 387 + Model_transformTempY = 0; // L: 388 + Model_transformTempZ = 0; // L: 389 - for (int var5 = 0; var5 < var3.transformCount; ++var5) { - int var6 = var3.transformSkeletonLabels[var5]; - this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); + for (int var5 = 0; var5 < var3.transformCount; ++var5) { // L: 390 + int var6 = var3.transformSkeletonLabels[var5]; // L: 391 + this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]); // L: 392 } - this.resetBounds(); + this.resetBounds(); // L: 394 } } - } + } // L: 395 - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Leg;ILeg;I[I)V" + descriptor = "(Lef;ILef;I[I)V" ) @Export("animate2") public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) { - if (var2 != -1) { - if (var5 != null && var4 != -1) { - Animation var6 = var1.frames[var2]; - Animation var7 = var3.frames[var4]; - Skeleton var8 = var6.skeleton; - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; - byte var9 = 0; - int var13 = var9 + 1; + if (var2 != -1) { // L: 398 + if (var5 != null && var4 != -1) { // L: 399 + Animation var6 = var1.frames[var2]; // L: 403 + Animation var7 = var3.frames[var4]; // L: 404 + Skeleton var8 = var6.skeleton; // L: 405 + Model_transformTempX = 0; // L: 406 + Model_transformTempY = 0; // L: 407 + Model_transformTempZ = 0; // L: 408 + byte var9 = 0; // L: 409 + int var13 = var9 + 1; // L: 410 int var10 = var5[var9]; int var11; int var12; - for (var11 = 0; var11 < var6.transformCount; ++var11) { - for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { + for (var11 = 0; var11 < var6.transformCount; ++var11) { // L: 411 + for (var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 412 413 } - if (var12 != var10 || var8.transformTypes[var12] == 0) { + if (var12 != var10 || var8.transformTypes[var12] == 0) { // L: 414 this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]); } } - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; - var9 = 0; - var13 = var9 + 1; + Model_transformTempX = 0; // L: 416 + Model_transformTempY = 0; // L: 417 + Model_transformTempZ = 0; // L: 418 + var9 = 0; // L: 419 + var13 = var9 + 1; // L: 420 var10 = var5[var9]; - for (var11 = 0; var11 < var7.transformCount; ++var11) { - for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { + for (var11 = 0; var11 < var7.transformCount; ++var11) { // L: 421 + for (var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) { // L: 422 423 } - if (var12 == var10 || var8.transformTypes[var12] == 0) { + if (var12 == var10 || var8.transformTypes[var12] == 0) { // L: 424 this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]); } } - this.resetBounds(); + this.resetBounds(); // L: 426 } else { - this.animate(var1, var2); + this.animate(var1, var2); // L: 400 } } - } + } // L: 401 427 - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("transform") void transform(int var1, int[] var2, int var3, int var4, int var5) { - int var6 = var2.length; + int var6 = var2.length; // L: 430 int var7; int var8; int var11; int var12; - if (var1 == 0) { - var7 = 0; - Model_transformTempX = 0; - Model_transformTempY = 0; - Model_transformTempZ = 0; + if (var1 == 0) { // L: 431 + var7 = 0; // L: 432 + Model_transformTempX = 0; // L: 433 + Model_transformTempY = 0; // L: 434 + Model_transformTempZ = 0; // L: 435 - for (var8 = 0; var8 < var6; ++var8) { - int var9 = var2[var8]; - if (var9 < this.vertexLabels.length) { - int[] var10 = this.vertexLabels[var9]; + for (var8 = 0; var8 < var6; ++var8) { // L: 436 + int var18 = var2[var8]; // L: 437 + if (var18 < this.vertexLabels.length) { // L: 438 + int[] var19 = this.vertexLabels[var18]; // L: 439 - for (var11 = 0; var11 < var10.length; ++var11) { - var12 = var10[var11]; - Model_transformTempX += this.verticesX[var12]; - Model_transformTempY += this.verticesY[var12]; - Model_transformTempZ += this.verticesZ[var12]; - ++var7; + for (var11 = 0; var11 < var19.length; ++var11) { // L: 440 + var12 = var19[var11]; // L: 441 + Model_transformTempX += this.verticesX[var12]; // L: 442 + Model_transformTempY += this.verticesY[var12]; // L: 443 + Model_transformTempZ += this.verticesZ[var12]; // L: 444 + ++var7; // L: 445 } } } - if (var7 > 0) { - Model_transformTempX = var3 + Model_transformTempX / var7; - Model_transformTempY = var4 + Model_transformTempY / var7; - Model_transformTempZ = var5 + Model_transformTempZ / var7; + if (var7 > 0) { // L: 449 + Model_transformTempX = var3 + Model_transformTempX / var7; // L: 450 + Model_transformTempY = var4 + Model_transformTempY / var7; // L: 451 + Model_transformTempZ = var5 + Model_transformTempZ / var7; // L: 452 } else { - Model_transformTempX = var3; - Model_transformTempY = var4; - Model_transformTempZ = var5; + Model_transformTempX = var3; // L: 455 + Model_transformTempY = var4; // L: 456 + Model_transformTempZ = var5; // L: 457 } } else { + int[] var9; + int var10; int[] var10000; - int[] var18; - int var19; - if (var1 == 1) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; + if (var1 == 1) { // L: 461 + for (var7 = 0; var7 < var6; ++var7) { // L: 462 + var8 = var2[var7]; // L: 463 + if (var8 < this.vertexLabels.length) { // L: 464 + var9 = this.vertexLabels[var8]; // L: 465 - for (var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var10000 = this.verticesX; + for (var10 = 0; var10 < var9.length; ++var10) { // L: 466 + var11 = var9[var10]; // L: 467 + var10000 = this.verticesX; // L: 468 var10000[var11] += var3; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 469 var10000[var11] += var4; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 470 var10000[var11] += var5; } } } - } else if (var1 == 2) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; + } else if (var1 == 2) { // L: 476 + for (var7 = 0; var7 < var6; ++var7) { // L: 477 + var8 = var2[var7]; // L: 478 + if (var8 < this.vertexLabels.length) { // L: 479 + var9 = this.vertexLabels[var8]; // L: 480 - for (var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var10000 = this.verticesX; + for (var10 = 0; var10 < var9.length; ++var10) { // L: 481 + var11 = var9[var10]; // L: 482 + var10000 = this.verticesX; // L: 483 var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 484 var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 485 var10000[var11] -= Model_transformTempZ; - var12 = (var3 & 255) * 8; - int var13 = (var4 & 255) * 8; - int var14 = (var5 & 255) * 8; + var12 = (var3 & 255) * 8; // L: 486 + int var13 = (var4 & 255) * 8; // L: 487 + int var14 = (var5 & 255) * 8; // L: 488 int var15; int var16; int var17; - if (var14 != 0) { - var15 = Model_sine[var14]; - var16 = Model_cosine[var14]; - var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; + if (var14 != 0) { // L: 489 + var15 = Model_sine[var14]; // L: 490 + var16 = Model_cosine[var14]; // L: 491 + var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; // L: 492 + this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; // L: 493 + this.verticesX[var11] = var17; // L: 494 } - if (var12 != 0) { - var15 = Model_sine[var12]; - var16 = Model_cosine[var12]; - var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; - this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; - this.verticesY[var11] = var17; + if (var12 != 0) { // L: 496 + var15 = Model_sine[var12]; // L: 497 + var16 = Model_cosine[var12]; // L: 498 + var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; // L: 499 + this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; // L: 500 + this.verticesY[var11] = var17; // L: 501 } - if (var13 != 0) { - var15 = Model_sine[var13]; - var16 = Model_cosine[var13]; - var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; + if (var13 != 0) { // L: 503 + var15 = Model_sine[var13]; // L: 504 + var16 = Model_cosine[var13]; // L: 505 + var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; // L: 506 + this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; // L: 507 + this.verticesX[var11] = var17; // L: 508 } - var10000 = this.verticesX; + var10000 = this.verticesX; // L: 510 var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 511 var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 512 var10000[var11] += Model_transformTempZ; } } } - } else if (var1 == 3) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; + } else if (var1 == 3) { // L: 518 + for (var7 = 0; var7 < var6; ++var7) { // L: 519 + var8 = var2[var7]; // L: 520 + if (var8 < this.vertexLabels.length) { // L: 521 + var9 = this.vertexLabels[var8]; // L: 522 - for (var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var10000 = this.verticesX; + for (var10 = 0; var10 < var9.length; ++var10) { // L: 523 + var11 = var9[var10]; // L: 524 + var10000 = this.verticesX; // L: 525 var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 526 var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 527 var10000[var11] -= Model_transformTempZ; - this.verticesX[var11] = var3 * this.verticesX[var11] / 128; - this.verticesY[var11] = var4 * this.verticesY[var11] / 128; - this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; - var10000 = this.verticesX; + this.verticesX[var11] = var3 * this.verticesX[var11] / 128; // L: 528 + this.verticesY[var11] = var4 * this.verticesY[var11] / 128; // L: 529 + this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; // L: 530 + var10000 = this.verticesX; // L: 531 var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 532 var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 533 var10000[var11] += Model_transformTempZ; } } } - } else if (var1 == 5) { - if (this.faceLabelsAlpha != null && this.faceAlphas != null) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.faceLabelsAlpha.length) { - var18 = this.faceLabelsAlpha[var8]; + } else if (var1 == 5) { // L: 539 + if (this.faceLabelsAlpha != null && this.faceAlphas != null) { // L: 540 + for (var7 = 0; var7 < var6; ++var7) { // L: 541 + var8 = var2[var7]; // L: 542 + if (var8 < this.faceLabelsAlpha.length) { // L: 543 + var9 = this.faceLabelsAlpha[var8]; // L: 544 - for (var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var12 = (this.faceAlphas[var11] & 255) + var3 * 8; - if (var12 < 0) { + for (var10 = 0; var10 < var9.length; ++var10) { // L: 545 + var11 = var9[var10]; // L: 546 + var12 = (this.faceAlphas[var11] & 255) + var3 * 8; // L: 547 + if (var12 < 0) { // L: 548 var12 = 0; - } else if (var12 > 255) { + } else if (var12 > 255) { // L: 549 var12 = 255; } - this.faceAlphas[var11] = (byte)var12; + this.faceAlphas[var11] = (byte)var12; // L: 550 } } } @@ -918,816 +918,781 @@ public class Model extends Entity { } } - } + } // L: 459 474 516 537 555 557 - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("rotateY90Ccw") public void rotateY90Ccw() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - this.verticesX[var1] = this.verticesZ[var1]; - this.verticesZ[var1] = -var2; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 560 + int var2 = this.verticesX[var1]; // L: 561 + this.verticesX[var1] = this.verticesZ[var1]; // L: 562 + this.verticesZ[var1] = -var2; // L: 563 } - this.resetBounds(); - } + this.resetBounds(); // L: 565 + } // L: 566 - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("rotateY180") public void rotateY180() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - this.verticesX[var1] = -this.verticesX[var1]; - this.verticesZ[var1] = -this.verticesZ[var1]; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 569 + this.verticesX[var1] = -this.verticesX[var1]; // L: 570 + this.verticesZ[var1] = -this.verticesZ[var1]; // L: 571 } - this.resetBounds(); - } + this.resetBounds(); // L: 573 + } // L: 574 - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("rotateY270Ccw") public void rotateY270Ccw() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesZ[var1]; - this.verticesZ[var1] = this.verticesX[var1]; - this.verticesX[var1] = -var2; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 577 + int var2 = this.verticesZ[var1]; // L: 578 + this.verticesZ[var1] = this.verticesX[var1]; // L: 579 + this.verticesX[var1] = -var2; // L: 580 } - this.resetBounds(); - } + this.resetBounds(); // L: 582 + } // L: 583 - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("rotateZ") public void rotateZ(int var1) { - int var2 = Model_sine[var1]; - int var3 = Model_cosine[var1]; + int var2 = Model_sine[var1]; // L: 586 + int var3 = Model_cosine[var1]; // L: 587 - for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; - this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; - this.verticesY[var4] = var5; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 588 + int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16; // L: 589 + this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16; // L: 590 + this.verticesY[var4] = var5; // L: 591 } - this.resetBounds(); - } + this.resetBounds(); // L: 593 + } // L: 594 - @ObfuscatedName("e") + @ObfuscatedName("r") @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int[] var10000 = this.verticesX; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 597 + int[] var10000 = this.verticesX; // L: 598 var10000[var4] += var1; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 599 var10000[var4] += var2; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 600 var10000[var4] += var3; } - this.resetBounds(); - } + this.resetBounds(); // L: 602 + } // L: 603 - @ObfuscatedName("l") + @ObfuscatedName("u") @Export("scale") public void scale(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { - this.verticesX[var4] = this.verticesX[var4] * var1 / 128; - this.verticesY[var4] = var2 * this.verticesY[var4] / 128; - this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 606 + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 607 + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 608 + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 609 } - this.resetBounds(); - } + this.resetBounds(); // L: 611 + } // L: 612 - @ObfuscatedName("t") - public final void method3010(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - field1744[0] = -1; - if (this.boundsType != 2 && this.boundsType != 1) { - this.method2998(); + @ObfuscatedName("p") + public final void method3003(int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + field1742[0] = -1; // L: 615 + if (this.boundsType != 2 && this.boundsType != 1) { // L: 616 + this.method2992(); } - int var8 = Rasterizer3D.Rasterizer3D_clipMidX; - int var9 = Rasterizer3D.Rasterizer3D_clipMidY; - int var10 = Model_sine[var1]; - int var11 = Model_cosine[var1]; - int var12 = Model_sine[var2]; - int var13 = Model_cosine[var2]; - int var14 = Model_sine[var3]; - int var15 = Model_cosine[var3]; - int var16 = Model_sine[var4]; - int var17 = Model_cosine[var4]; - int var18 = var16 * var6 + var17 * var7 >> 16; + int var8 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 617 + int var9 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 618 + int var10 = Model_sine[var1]; // L: 619 + int var11 = Model_cosine[var1]; // L: 620 + int var12 = Model_sine[var2]; // L: 621 + int var13 = Model_cosine[var2]; // L: 622 + int var14 = Model_sine[var3]; // L: 623 + int var15 = Model_cosine[var3]; // L: 624 + int var16 = Model_sine[var4]; // L: 625 + int var17 = Model_cosine[var4]; // L: 626 + int var18 = var16 * var6 + var17 * var7 >> 16; // L: 627 - for (int var19 = 0; var19 < this.verticesCount; ++var19) { - int var20 = this.verticesX[var19]; - int var21 = this.verticesY[var19]; - int var22 = this.verticesZ[var19]; + for (int var19 = 0; var19 < this.verticesCount; ++var19) { // L: 628 + int var20 = this.verticesX[var19]; // L: 629 + int var21 = this.verticesY[var19]; // L: 630 + int var22 = this.verticesZ[var19]; // L: 631 int var23; - if (var3 != 0) { - var23 = var21 * var14 + var20 * var15 >> 16; - var21 = var21 * var15 - var20 * var14 >> 16; - var20 = var23; + if (var3 != 0) { // L: 632 + var23 = var21 * var14 + var20 * var15 >> 16; // L: 633 + var21 = var21 * var15 - var20 * var14 >> 16; // L: 634 + var20 = var23; // L: 635 } - if (var1 != 0) { - var23 = var21 * var11 - var22 * var10 >> 16; - var22 = var21 * var10 + var22 * var11 >> 16; - var21 = var23; + if (var1 != 0) { // L: 637 + var23 = var21 * var11 - var22 * var10 >> 16; // L: 638 + var22 = var21 * var10 + var22 * var11 >> 16; // L: 639 + var21 = var23; // L: 640 } - if (var2 != 0) { - var23 = var22 * var12 + var20 * var13 >> 16; - var22 = var22 * var13 - var20 * var12 >> 16; - var20 = var23; + if (var2 != 0) { // L: 642 + var23 = var22 * var12 + var20 * var13 >> 16; // L: 643 + var22 = var22 * var13 - var20 * var12 >> 16; // L: 644 + var20 = var23; // L: 645 } - var20 += var5; - var21 += var6; - var22 += var7; - var23 = var21 * var17 - var22 * var16 >> 16; - var22 = var21 * var16 + var22 * var17 >> 16; - field1739[var19] = var22 - var18; - modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; - modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; - if (this.field1730 > 0) { - field1740[var19] = var20; - field1736[var19] = var23; - field1742[var19] = var22; + var20 += var5; // L: 647 + var21 += var6; // L: 648 + var22 += var7; // L: 649 + var23 = var21 * var17 - var22 * var16 >> 16; // L: 650 + var22 = var21 * var16 + var22 * var17 >> 16; // L: 651 + field1760[var19] = var22 - var18; // L: 653 + modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8; // L: 654 + modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9; // L: 655 + if (this.field1714 > 0) { // L: 656 + field1728[var19] = var20; // L: 657 + field1739[var19] = var23; // L: 658 + field1740[var19] = var22; // L: 659 } } try { - this.draw0(false, false, false, 0L); - } catch (Exception var25) { + this.draw0(false, false, false, 0L); // L: 663 + } catch (Exception var25) { // L: 665 } - } + } // L: 666 - @ObfuscatedName("x") - public final void method3011(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - field1744[0] = -1; - if (this.boundsType != 2 && this.boundsType != 1) { - this.method2998(); + @ObfuscatedName("b") + public final void method3005(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + field1742[0] = -1; // L: 669 + if (this.boundsType != 2 && this.boundsType != 1) { // L: 670 + this.method2992(); } - int var9 = Rasterizer3D.Rasterizer3D_clipMidX; - int var10 = Rasterizer3D.Rasterizer3D_clipMidY; - int var11 = Model_sine[var1]; - int var12 = Model_cosine[var1]; - int var13 = Model_sine[var2]; - int var14 = Model_cosine[var2]; - int var15 = Model_sine[var3]; - int var16 = Model_cosine[var3]; - int var17 = Model_sine[var4]; - int var18 = Model_cosine[var4]; - int var19 = var17 * var6 + var18 * var7 >> 16; + int var9 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 671 + int var10 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 672 + int var11 = Model_sine[var1]; // L: 673 + int var12 = Model_cosine[var1]; // L: 674 + int var13 = Model_sine[var2]; // L: 675 + int var14 = Model_cosine[var2]; // L: 676 + int var15 = Model_sine[var3]; // L: 677 + int var16 = Model_cosine[var3]; // L: 678 + int var17 = Model_sine[var4]; // L: 679 + int var18 = Model_cosine[var4]; // L: 680 + int var19 = var17 * var6 + var18 * var7 >> 16; // L: 681 - for (int var20 = 0; var20 < this.verticesCount; ++var20) { - int var21 = this.verticesX[var20]; - int var22 = this.verticesY[var20]; - int var23 = this.verticesZ[var20]; + for (int var20 = 0; var20 < this.verticesCount; ++var20) { // L: 682 + int var21 = this.verticesX[var20]; // L: 683 + int var22 = this.verticesY[var20]; // L: 684 + int var23 = this.verticesZ[var20]; // L: 685 int var24; - if (var3 != 0) { - var24 = var22 * var15 + var21 * var16 >> 16; - var22 = var22 * var16 - var21 * var15 >> 16; - var21 = var24; + if (var3 != 0) { // L: 686 + var24 = var22 * var15 + var21 * var16 >> 16; // L: 687 + var22 = var22 * var16 - var21 * var15 >> 16; // L: 688 + var21 = var24; // L: 689 } - if (var1 != 0) { - var24 = var22 * var12 - var23 * var11 >> 16; - var23 = var22 * var11 + var23 * var12 >> 16; - var22 = var24; + if (var1 != 0) { // L: 691 + var24 = var22 * var12 - var23 * var11 >> 16; // L: 692 + var23 = var22 * var11 + var23 * var12 >> 16; // L: 693 + var22 = var24; // L: 694 } - if (var2 != 0) { - var24 = var23 * var13 + var21 * var14 >> 16; - var23 = var23 * var14 - var21 * var13 >> 16; - var21 = var24; + if (var2 != 0) { // L: 696 + var24 = var23 * var13 + var21 * var14 >> 16; // L: 697 + var23 = var23 * var14 - var21 * var13 >> 16; // L: 698 + var21 = var24; // L: 699 } - var21 += var5; - var22 += var6; - var23 += var7; - var24 = var22 * var18 - var23 * var17 >> 16; - var23 = var22 * var17 + var23 * var18 >> 16; - field1739[var20] = var23 - var19; - modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; - modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; - if (this.field1730 > 0) { - field1740[var20] = var21; - field1736[var20] = var24; - field1742[var20] = var23; + var21 += var5; // L: 701 + var22 += var6; // L: 702 + var23 += var7; // L: 703 + var24 = var22 * var18 - var23 * var17 >> 16; // L: 704 + var23 = var22 * var17 + var23 * var18 >> 16; // L: 705 + field1760[var20] = var23 - var19; // L: 707 + modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 708 + modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8; // L: 709 + if (this.field1714 > 0) { // L: 710 + field1728[var20] = var21; // L: 711 + field1739[var20] = var24; // L: 712 + field1740[var20] = var23; // L: 713 } } try { - this.draw0(false, false, false, 0L); - } catch (Exception var26) { + this.draw0(false, false, false, 0L); // L: 717 + } catch (Exception var26) { // L: 719 } - } + } // L: 720 - @ObfuscatedName("ah") + @ObfuscatedName("l") @Export("draw0") final void draw0(boolean var1, boolean var2, boolean var3, long var4) { - if (this.diameter < 1600) { + if (this.diameter < 1600) { // L: 844 int var6; - for (var6 = 0; var6 < this.diameter; ++var6) { - field1744[var6] = 0; + for (var6 = 0; var6 < this.diameter; ++var6) { // L: 845 + field1742[var6] = 0; } - var6 = var3 ? 20 : 5; + var6 = var3 ? 20 : 5; // L: 846 int var7; int var8; + int var9; int var10; int var11; int var12; - int var13; int var15; int var16; int var18; - int var27; - for (var7 = 0; var7 < this.indicesCount; ++var7) { - if (this.faceColors3[var7] != -2) { - var8 = this.indices1[var7]; - var27 = this.indices2[var7]; - var10 = this.indices3[var7]; - var11 = modelViewportXs[var8]; - var12 = modelViewportXs[var27]; - var13 = modelViewportXs[var10]; - int var14; - int var17; - if (!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) { - if (var2) { - var15 = modelViewportYs[var8]; - var16 = modelViewportYs[var27]; - var17 = modelViewportYs[var10]; - var18 = var6 + ViewportMouse.ViewportMouse_y; - boolean isHovered; - if (var18 < var15 && var18 < var16 && var18 < var17) { - isHovered = false; - } else { - var18 = ViewportMouse.ViewportMouse_y - var6; - if (var18 > var15 && var18 > var16 && var18 > var17) { - isHovered = false; - } else { - var18 = var6 + ViewportMouse.ViewportMouse_x; - if (var18 < var11 && var18 < var12 && var18 < var13) { - isHovered = false; - } else { - var18 = ViewportMouse.ViewportMouse_x - var6; - if (var18 > var11 && var18 > var12 && var18 > var13) { - isHovered = false; - } else { - isHovered = true; - } - } - } - } - - if (isHovered) { - ObjectSound.addEntityUnderMouse(var4); - var2 = false; - } - } - - if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) { - field1752[var7] = false; - if (var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) { - field1735[var7] = false; - } else { - field1735[var7] = true; - } - - var14 = (field1739[var8] + field1739[var27] + field1739[var10]) / 3 + this.radius; - field1745[var14][field1744[var14]++] = var7; + int var28; + for (var7 = 0; var7 < this.indicesCount; ++var7) { // L: 847 + if (this.faceColors3[var7] != -2) { // L: 848 + var8 = this.indices1[var7]; // L: 849 + var9 = this.indices2[var7]; // L: 850 + var10 = this.indices3[var7]; // L: 851 + var11 = modelViewportXs[var8]; // L: 852 + var12 = modelViewportXs[var9]; // L: 853 + var28 = modelViewportXs[var10]; // L: 854 + int var29; + if (var1 && (var11 == -5000 || var12 == -5000 || var28 == -5000)) { // L: 855 + var29 = field1728[var8]; // L: 856 + var15 = field1728[var9]; // L: 857 + var16 = field1728[var10]; // L: 858 + int var30 = field1739[var8]; // L: 859 + var18 = field1739[var9]; // L: 860 + int var19 = field1739[var10]; // L: 861 + int var20 = field1740[var8]; // L: 862 + int var21 = field1740[var9]; // L: 863 + int var22 = field1740[var10]; // L: 864 + var29 -= var15; // L: 865 + var16 -= var15; // L: 866 + var30 -= var18; // L: 867 + var19 -= var18; // L: 868 + var20 -= var21; // L: 869 + var22 -= var21; // L: 870 + int var23 = var30 * var22 - var20 * var19; // L: 871 + int var24 = var20 * var16 - var29 * var22; // L: 872 + int var25 = var29 * var19 - var30 * var16; // L: 873 + if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { // L: 874 + field1734[var7] = true; // L: 875 + int var26 = (field1760[var8] + field1760[var9] + field1760[var10]) / 3 + this.radius; // L: 876 + field1743[var26][field1742[var26]++] = var7; // L: 877 } } else { - var14 = field1740[var8]; - var15 = field1740[var27]; - var16 = field1740[var10]; - var17 = field1736[var8]; - var18 = field1736[var27]; - int var19 = field1736[var10]; - int var20 = field1742[var8]; - int var21 = field1742[var27]; - int var22 = field1742[var10]; - var14 -= var15; - var16 -= var15; - var17 -= var18; - var19 -= var18; - var20 -= var21; - var22 -= var21; - int var23 = var17 * var22 - var20 * var19; - int var24 = var20 * var16 - var14 * var22; - int var25 = var14 * var19 - var17 * var16; - if (var15 * var23 + var18 * var24 + var21 * var25 > 0) { - field1752[var7] = true; - int var26 = (field1739[var8] + field1739[var27] + field1739[var10]) / 3 + this.radius; - field1745[var26][field1744[var26]++] = var7; + if (var2 && SoundSystem.method2592(modelViewportYs[var8], modelViewportYs[var9], modelViewportYs[var10], var11, var12, var28, var6)) { // L: 881 + DynamicObject.addEntityUnderMouse(var4); // L: 882 + var2 = false; // L: 883 + } + + if ((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var9]) - (var28 - var12) * (modelViewportYs[var8] - modelViewportYs[var9]) > 0) { // L: 885 + field1734[var7] = false; // L: 886 + if (var11 >= 0 && var12 >= 0 && var28 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var28 <= Rasterizer3D.Rasterizer3D_clipWidth) { // L: 887 + field1747[var7] = false; // L: 888 + } else { + field1747[var7] = true; + } + + var29 = (field1760[var8] + field1760[var9] + field1760[var10]) / 3 + this.radius; // L: 889 + field1743[var29][field1742[var29]++] = var7; // L: 890 } } } } - int[] var9; - if (this.faceRenderPriorities == null) { - for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1744[var7]; - if (var8 > 0) { - var9 = field1745[var7]; + int[] var27; + if (this.faceRenderPriorities == null) { // L: 894 + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 895 + var8 = field1742[var7]; // L: 896 + if (var8 > 0) { // L: 897 + var27 = field1743[var7]; // L: 898 - for (var10 = 0; var10 < var8; ++var10) { - this.drawFace(var9[var10]); + for (var10 = 0; var10 < var8; ++var10) { // L: 899 + this.drawFace(var27[var10]); } } } } else { - for (var7 = 0; var7 < 12; ++var7) { - field1699[var7] = 0; - field1750[var7] = 0; + for (var7 = 0; var7 < 12; ++var7) { // L: 904 + field1744[var7] = 0; // L: 905 + field1748[var7] = 0; // L: 906 } - for (var7 = this.diameter - 1; var7 >= 0; --var7) { - var8 = field1744[var7]; - if (var8 > 0) { - var9 = field1745[var7]; + for (var7 = this.diameter - 1; var7 >= 0; --var7) { // L: 908 + var8 = field1742[var7]; // L: 909 + if (var8 > 0) { // L: 910 + var27 = field1743[var7]; // L: 911 - for (var10 = 0; var10 < var8; ++var10) { - var11 = var9[var10]; - byte var31 = this.faceRenderPriorities[var11]; - var13 = field1699[var31]++; - field1747[var31][var13] = var11; - if (var31 < 10) { - int[] var10000 = field1750; + for (var10 = 0; var10 < var8; ++var10) { // L: 912 + var11 = var27[var10]; // L: 913 + byte var31 = this.faceRenderPriorities[var11]; // L: 914 + var28 = field1744[var31]++; // L: 915 + field1745[var31][var28] = var11; // L: 916 + if (var31 < 10) { // L: 917 + int[] var10000 = field1748; var10000[var31] += var7; - } else if (var31 == 10) { - field1698[var13] = var7; + } else if (var31 == 10) { // L: 918 + field1746[var28] = var7; } else { - field1722[var13] = var7; + field1701[var28] = var7; // L: 919 } } } } - var7 = 0; - if (field1699[1] > 0 || field1699[2] > 0) { - var7 = (field1750[1] + field1750[2]) / (field1699[1] + field1699[2]); + var7 = 0; // L: 923 + if (field1744[1] > 0 || field1744[2] > 0) { // L: 924 + var7 = (field1748[1] + field1748[2]) / (field1744[1] + field1744[2]); } - var8 = 0; - if (field1699[3] > 0 || field1699[4] > 0) { - var8 = (field1750[3] + field1750[4]) / (field1699[3] + field1699[4]); + var8 = 0; // L: 925 + if (field1744[3] > 0 || field1744[4] > 0) { // L: 926 + var8 = (field1748[3] + field1748[4]) / (field1744[3] + field1744[4]); } - var27 = 0; - if (field1699[6] > 0 || field1699[8] > 0) { - var27 = (field1750[8] + field1750[6]) / (field1699[8] + field1699[6]); + var9 = 0; // L: 927 + if (field1744[6] > 0 || field1744[8] > 0) { // L: 928 + var9 = (field1748[8] + field1748[6]) / (field1744[8] + field1744[6]); } - var11 = 0; - var12 = field1699[10]; - int[] var28 = field1747[10]; - int[] var29 = field1698; - if (var11 == var12) { - var11 = 0; - var12 = field1699[11]; - var28 = field1747[11]; - var29 = field1722; + var11 = 0; // L: 930 + var12 = field1744[10]; // L: 931 + int[] var13 = field1745[10]; // L: 932 + int[] var14 = field1746; // L: 933 + if (var11 == var12) { // L: 934 + var11 = 0; // L: 935 + var12 = field1744[11]; // L: 936 + var13 = field1745[11]; // L: 937 + var14 = field1701; // L: 938 } - if (var11 < var12) { - var10 = var29[var11]; + if (var11 < var12) { // L: 940 + var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 941 } - for (var15 = 0; var15 < 10; ++var15) { - while (var15 == 0 && var10 > var7) { - this.drawFace(var28[var11++]); - if (var11 == var12 && var28 != field1747[11]) { - var11 = 0; - var12 = field1699[11]; - var28 = field1747[11]; - var29 = field1722; + for (var15 = 0; var15 < 10; ++var15) { // L: 942 + while (var15 == 0 && var10 > var7) { // L: 943 + this.drawFace(var13[var11++]); // L: 944 + if (var11 == var12 && var13 != field1745[11]) { // L: 945 + var11 = 0; // L: 946 + var12 = field1744[11]; // L: 947 + var13 = field1745[11]; // L: 948 + var14 = field1701; // L: 949 } - if (var11 < var12) { - var10 = var29[var11]; + if (var11 < var12) { // L: 951 + var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 952 } } - while (var15 == 3 && var10 > var8) { - this.drawFace(var28[var11++]); - if (var11 == var12 && var28 != field1747[11]) { - var11 = 0; - var12 = field1699[11]; - var28 = field1747[11]; - var29 = field1722; + while (var15 == 3 && var10 > var8) { // L: 954 + this.drawFace(var13[var11++]); // L: 955 + if (var11 == var12 && var13 != field1745[11]) { // L: 956 + var11 = 0; // L: 957 + var12 = field1744[11]; // L: 958 + var13 = field1745[11]; // L: 959 + var14 = field1701; // L: 960 } - if (var11 < var12) { - var10 = var29[var11]; + if (var11 < var12) { // L: 962 + var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 963 } } - while (var15 == 5 && var10 > var27) { - this.drawFace(var28[var11++]); - if (var11 == var12 && var28 != field1747[11]) { - var11 = 0; - var12 = field1699[11]; - var28 = field1747[11]; - var29 = field1722; + while (var15 == 5 && var10 > var9) { // L: 965 + this.drawFace(var13[var11++]); // L: 966 + if (var11 == var12 && var13 != field1745[11]) { // L: 967 + var11 = 0; // L: 968 + var12 = field1744[11]; // L: 969 + var13 = field1745[11]; // L: 970 + var14 = field1701; // L: 971 } - if (var11 < var12) { - var10 = var29[var11]; + if (var11 < var12) { // L: 973 + var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 974 } } - var16 = field1699[var15]; - int[] var30 = field1747[var15]; + var16 = field1744[var15]; // L: 976 + int[] var17 = field1745[var15]; // L: 977 - for (var18 = 0; var18 < var16; ++var18) { - this.drawFace(var30[var18]); + for (var18 = 0; var18 < var16; ++var18) { // L: 978 + this.drawFace(var17[var18]); // L: 979 } } - while (var10 != -1000) { - this.drawFace(var28[var11++]); - if (var11 == var12 && var28 != field1747[11]) { - var11 = 0; - var28 = field1747[11]; - var12 = field1699[11]; - var29 = field1722; + while (var10 != -1000) { // L: 982 + this.drawFace(var13[var11++]); // L: 983 + if (var11 == var12 && var13 != field1745[11]) { // L: 984 + var11 = 0; // L: 985 + var13 = field1745[11]; // L: 986 + var12 = field1744[11]; // L: 987 + var14 = field1701; // L: 988 } - if (var11 < var12) { - var10 = var29[var11]; + if (var11 < var12) { // L: 990 + var10 = var14[var11]; } else { - var10 = -1000; + var10 = -1000; // L: 991 } } } } - } + } // L: 902 993 - @ObfuscatedName("ai") + @ObfuscatedName("e") @Export("drawFace") final void drawFace(int var1) { - if (field1752[var1]) { - this.method3015(var1); + if (field1734[var1]) { // L: 996 + this.method3051(var1); // L: 997 } else { - int var2 = this.indices1[var1]; - int var3 = this.indices2[var1]; - int var4 = this.indices3[var1]; - Rasterizer3D.field1796 = field1735[var1]; - if (this.faceAlphas == null) { + int var2 = this.indices1[var1]; // L: 1000 + int var3 = this.indices2[var1]; // L: 1001 + int var4 = this.indices3[var1]; // L: 1002 + Rasterizer3D.field1791 = field1747[var1]; // L: 1003 + if (this.faceAlphas == null) { // L: 1004 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1005 } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1006 int var5; int var6; int var7; - if (this.field1731 != null && this.field1731[var1] != -1) { - int var8 = this.field1731[var1] & 255; - var5 = this.field1717[var8]; - var6 = this.field1718[var8]; - var7 = this.field1719[var8]; + if (this.field1757 != null && this.field1757[var1] != -1) { // L: 1014 + int var8 = this.field1757[var1] & 255; // L: 1015 + var5 = this.field1715[var8]; // L: 1016 + var6 = this.field1716[var8]; // L: 1017 + var7 = this.field1717[var8]; // L: 1018 } else { - var5 = var2; - var6 = var3; - var7 = var4; + var5 = var2; // L: 1021 + var6 = var3; // L: 1022 + var7 = var4; // L: 1023 } if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3126(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1740[var5], field1740[var6], field1740[var7], field1736[var5], field1736[var6], field1736[var7], field1742[var5], field1742[var6], field1742[var7], this.faceTextures[var1]); + Rasterizer3D.method3144(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1728[var5], field1728[var6], field1728[var7], field1739[var5], field1739[var6], field1739[var7], field1740[var5], field1740[var6], field1740[var7], this.faceTextures[var1]); // L: 1025 } else { - Rasterizer3D.method3126(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1740[var5], field1740[var6], field1740[var7], field1736[var5], field1736[var6], field1736[var7], field1742[var5], field1742[var6], field1742[var7], this.faceTextures[var1]); + Rasterizer3D.method3144(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field1728[var5], field1728[var6], field1728[var7], field1739[var5], field1739[var6], field1739[var7], field1740[var5], field1740[var6], field1740[var7], this.faceTextures[var1]); // L: 1026 } - } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3124(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1757[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1007 + Rasterizer3D.method3172(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field1756[this.faceColors1[var1]]); } else { - Rasterizer3D.method3122(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); + Rasterizer3D.method3117(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]); // L: 1008 } } - } + } // L: 998 1028 - @ObfuscatedName("ao") - final void method3015(int var1) { - int var2 = Rasterizer3D.Rasterizer3D_clipMidX; - int var3 = Rasterizer3D.Rasterizer3D_clipMidY; - int var4 = 0; - int var5 = this.indices1[var1]; - int var6 = this.indices2[var1]; - int var7 = this.indices3[var1]; - int var8 = field1742[var5]; - int var9 = field1742[var6]; - int var10 = field1742[var7]; - if (this.faceAlphas == null) { + @ObfuscatedName("ab") + final void method3051(int var1) { + int var2 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 1031 + int var3 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 1032 + int var4 = 0; // L: 1033 + int var5 = this.indices1[var1]; // L: 1034 + int var6 = this.indices2[var1]; // L: 1035 + int var7 = this.indices3[var1]; // L: 1036 + int var8 = field1740[var5]; // L: 1037 + int var9 = field1740[var6]; // L: 1038 + int var10 = field1740[var7]; // L: 1039 + if (this.faceAlphas == null) { // L: 1040 Rasterizer3D.Rasterizer3D_alpha = 0; } else { - Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; + Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255; // L: 1041 } int var11; int var12; int var13; int var14; - if (var8 >= 50) { - field1751[var4] = modelViewportXs[var5]; - field1716[var4] = modelViewportYs[var5]; - field1728[var4++] = this.faceColors1[var1]; + if (var8 >= 50) { // L: 1042 + field1749[var4] = modelViewportXs[var5]; // L: 1043 + field1750[var4] = modelViewportYs[var5]; // L: 1044 + field1751[var4++] = this.faceColors1[var1]; // L: 1045 } else { - var11 = field1740[var5]; - var12 = field1736[var5]; - var13 = this.faceColors1[var1]; - if (var10 >= 50) { - var14 = field1763[var10 - var8] * (50 - var8); - field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var7] - var11) * var14 >> 16)) / 50; - field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var7] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + var11 = field1728[var5]; // L: 1048 + var12 = field1739[var5]; // L: 1049 + var13 = this.faceColors1[var1]; // L: 1050 + if (var10 >= 50) { // L: 1051 + var14 = field1761[var10 - var8] * (50 - var8); // L: 1052 + field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var7] - var11) * var14 >> 16)) / 50; // L: 1053 + field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var7] - var12) * var14 >> 16)) / 50; // L: 1054 + field1751[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1055 } - if (var9 >= 50) { - var14 = field1763[var9 - var8] * (50 - var8); - field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var6] - var11) * var14 >> 16)) / 50; - field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var6] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + if (var9 >= 50) { // L: 1057 + var14 = field1761[var9 - var8] * (50 - var8); // L: 1058 + field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var6] - var11) * var14 >> 16)) / 50; // L: 1059 + field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var6] - var12) * var14 >> 16)) / 50; // L: 1060 + field1751[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1061 } } - if (var9 >= 50) { - field1751[var4] = modelViewportXs[var6]; - field1716[var4] = modelViewportYs[var6]; - field1728[var4++] = this.faceColors2[var1]; + if (var9 >= 50) { // L: 1064 + field1749[var4] = modelViewportXs[var6]; // L: 1065 + field1750[var4] = modelViewportYs[var6]; // L: 1066 + field1751[var4++] = this.faceColors2[var1]; // L: 1067 } else { - var11 = field1740[var6]; - var12 = field1736[var6]; - var13 = this.faceColors2[var1]; - if (var8 >= 50) { - var14 = field1763[var8 - var9] * (50 - var9); - field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var5] - var11) * var14 >> 16)) / 50; - field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var5] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + var11 = field1728[var6]; // L: 1070 + var12 = field1739[var6]; // L: 1071 + var13 = this.faceColors2[var1]; // L: 1072 + if (var8 >= 50) { // L: 1073 + var14 = field1761[var8 - var9] * (50 - var9); // L: 1074 + field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var5] - var11) * var14 >> 16)) / 50; // L: 1075 + field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var5] - var12) * var14 >> 16)) / 50; // L: 1076 + field1751[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1077 } - if (var10 >= 50) { - var14 = field1763[var10 - var9] * (50 - var9); - field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var7] - var11) * var14 >> 16)) / 50; - field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var7] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); + if (var10 >= 50) { // L: 1079 + var14 = field1761[var10 - var9] * (50 - var9); // L: 1080 + field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var7] - var11) * var14 >> 16)) / 50; // L: 1081 + field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var7] - var12) * var14 >> 16)) / 50; // L: 1082 + field1751[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16); // L: 1083 } } - if (var10 >= 50) { - field1751[var4] = modelViewportXs[var7]; - field1716[var4] = modelViewportYs[var7]; - field1728[var4++] = this.faceColors3[var1]; + if (var10 >= 50) { // L: 1086 + field1749[var4] = modelViewportXs[var7]; // L: 1087 + field1750[var4] = modelViewportYs[var7]; // L: 1088 + field1751[var4++] = this.faceColors3[var1]; // L: 1089 } else { - var11 = field1740[var7]; - var12 = field1736[var7]; - var13 = this.faceColors3[var1]; - if (var9 >= 50) { - var14 = field1763[var9 - var10] * (50 - var10); - field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var6] - var11) * var14 >> 16)) / 50; - field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var6] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); + var11 = field1728[var7]; // L: 1092 + var12 = field1739[var7]; // L: 1093 + var13 = this.faceColors3[var1]; // L: 1094 + if (var9 >= 50) { // L: 1095 + var14 = field1761[var9 - var10] * (50 - var10); // L: 1096 + field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var6] - var11) * var14 >> 16)) / 50; // L: 1097 + field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var6] - var12) * var14 >> 16)) / 50; // L: 1098 + field1751[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16); // L: 1099 } - if (var8 >= 50) { - var14 = field1763[var8 - var10] * (50 - var10); - field1751[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1740[var5] - var11) * var14 >> 16)) / 50; - field1716[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1736[var5] - var12) * var14 >> 16)) / 50; - field1728[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); + if (var8 >= 50) { // L: 1101 + var14 = field1761[var8 - var10] * (50 - var10); // L: 1102 + field1749[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field1728[var5] - var11) * var14 >> 16)) / 50; // L: 1103 + field1750[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field1739[var5] - var12) * var14 >> 16)) / 50; // L: 1104 + field1751[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16); // L: 1105 } } - var11 = field1751[0]; - var12 = field1751[1]; - var13 = field1751[2]; - var14 = field1716[0]; - int var15 = field1716[1]; - int var16 = field1716[2]; - Rasterizer3D.field1796 = false; + var11 = field1749[0]; // L: 1108 + var12 = field1749[1]; // L: 1109 + var13 = field1749[2]; // L: 1110 + var14 = field1750[0]; // L: 1111 + int var15 = field1750[1]; // L: 1112 + int var16 = field1750[2]; // L: 1113 + Rasterizer3D.field1791 = false; // L: 1114 int var17; int var18; int var19; int var20; - if (var4 == 3) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1796 = true; + if (var4 == 3) { // L: 1115 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1116 + Rasterizer3D.field1791 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1731 != null && this.field1731[var1] != -1) { - var20 = this.field1731[var1] & 255; - var17 = this.field1717[var20]; - var18 = this.field1718[var20]; - var19 = this.field1719[var20]; + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1117 + if (this.field1757 != null && this.field1757[var1] != -1) { // L: 1125 + var20 = this.field1757[var1] & 255; // L: 1126 + var17 = this.field1715[var20]; // L: 1127 + var18 = this.field1716[var20]; // L: 1128 + var19 = this.field1717[var20]; // L: 1129 } else { - var17 = var5; - var18 = var6; - var19 = var7; + var17 = var5; // L: 1132 + var18 = var6; // L: 1133 + var19 = var7; // L: 1134 } - if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3126(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], this.faceTextures[var1]); + if (this.faceColors3[var1] == -1) { // L: 1136 + Rasterizer3D.method3144(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], this.faceTextures[var1]); } else { - Rasterizer3D.method3126(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], this.faceTextures[var1]); + Rasterizer3D.method3144(var14, var15, var16, var11, var12, var13, field1751[0], field1751[1], field1751[2], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], this.faceTextures[var1]); // L: 1137 } - } else if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3124(var14, var15, var16, var11, var12, var13, field1757[this.faceColors1[var1]]); + } else if (this.faceColors3[var1] == -1) { // L: 1118 + Rasterizer3D.method3172(var14, var15, var16, var11, var12, var13, field1756[this.faceColors1[var1]]); } else { - Rasterizer3D.method3122(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2]); + Rasterizer3D.method3117(var14, var15, var16, var11, var12, var13, field1751[0], field1751[1], field1751[2]); // L: 1119 } } - if (var4 == 4) { - if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1751[3] < 0 || field1751[3] > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1796 = true; + if (var4 == 4) { // L: 1140 + if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field1749[3] < 0 || field1749[3] > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1141 + Rasterizer3D.field1791 = true; } - if (this.faceTextures != null && this.faceTextures[var1] != -1) { - if (this.field1731 != null && this.field1731[var1] != -1) { - var20 = this.field1731[var1] & 255; - var17 = this.field1717[var20]; - var18 = this.field1718[var20]; - var19 = this.field1719[var20]; + if (this.faceTextures != null && this.faceTextures[var1] != -1) { // L: 1142 + if (this.field1757 != null && this.field1757[var1] != -1) { // L: 1157 + var20 = this.field1757[var1] & 255; // L: 1158 + var17 = this.field1715[var20]; // L: 1159 + var18 = this.field1716[var20]; // L: 1160 + var19 = this.field1717[var20]; // L: 1161 } else { - var17 = var5; - var18 = var6; - var19 = var7; + var17 = var5; // L: 1164 + var18 = var6; // L: 1165 + var19 = var7; // L: 1166 } - short var21 = this.faceTextures[var1]; - if (this.faceColors3[var1] == -1) { - Rasterizer3D.method3126(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], var21); - Rasterizer3D.method3126(var14, var16, field1716[3], var11, var13, field1751[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], var21); + short var21 = this.faceTextures[var1]; // L: 1168 + if (this.faceColors3[var1] == -1) { // L: 1169 + Rasterizer3D.method3144(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], var21); // L: 1170 + Rasterizer3D.method3144(var14, var16, field1750[3], var11, var13, field1749[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], var21); // L: 1171 } else { - Rasterizer3D.method3126(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], var21); - Rasterizer3D.method3126(var14, var16, field1716[3], var11, var13, field1751[3], field1728[0], field1728[2], field1728[3], field1740[var17], field1740[var18], field1740[var19], field1736[var17], field1736[var18], field1736[var19], field1742[var17], field1742[var18], field1742[var19], var21); + Rasterizer3D.method3144(var14, var15, var16, var11, var12, var13, field1751[0], field1751[1], field1751[2], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], var21); // L: 1174 + Rasterizer3D.method3144(var14, var16, field1750[3], var11, var13, field1749[3], field1751[0], field1751[2], field1751[3], field1728[var17], field1728[var18], field1728[var19], field1739[var17], field1739[var18], field1739[var19], field1740[var17], field1740[var18], field1740[var19], var21); // L: 1175 } - } else if (this.faceColors3[var1] == -1) { - var17 = field1757[this.faceColors1[var1]]; - Rasterizer3D.method3124(var14, var15, var16, var11, var12, var13, var17); - Rasterizer3D.method3124(var14, var16, field1716[3], var11, var13, field1751[3], var17); + } else if (this.faceColors3[var1] == -1) { // L: 1143 + var17 = field1756[this.faceColors1[var1]]; // L: 1144 + Rasterizer3D.method3172(var14, var15, var16, var11, var12, var13, var17); // L: 1145 + Rasterizer3D.method3172(var14, var16, field1750[3], var11, var13, field1749[3], var17); // L: 1146 } else { - Rasterizer3D.method3122(var14, var15, var16, var11, var12, var13, field1728[0], field1728[1], field1728[2]); - Rasterizer3D.method3122(var14, var16, field1716[3], var11, var13, field1751[3], field1728[0], field1728[2], field1728[3]); + Rasterizer3D.method3117(var14, var15, var16, var11, var12, var13, field1751[0], field1751[1], field1751[2]); // L: 1149 + Rasterizer3D.method3117(var14, var16, field1750[3], var11, var13, field1749[3], field1751[0], field1751[2], field1751[3]); // L: 1150 } } - } + } // L: 1179 - @ObfuscatedName("cz") + @ObfuscatedName("cb") @Export("draw") void draw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) { - field1744[0] = -1; - if (this.boundsType != 1) { + field1742[0] = -1; // L: 723 + if (this.boundsType != 1) { // L: 724 this.calculateBoundsCylinder(); } - this.calculateBoundingBox(var1); - int var11 = var5 * var8 - var4 * var6 >> 16; - int var12 = var2 * var7 + var3 * var11 >> 16; - int var13 = var3 * this.xzRadius >> 16; - int var14 = var12 + var13; - if (var14 > 50 && var12 < 3500) { - int var15 = var8 * var4 + var5 * var6 >> 16; - int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; - if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { - int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; - if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { - int var18 = var3 * var7 - var11 * var2 >> 16; - int var19 = var2 * this.xzRadius >> 16; - int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; - if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { - int var21 = (var3 * super.height >> 16) + var19; - int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; - if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { - int var23 = var13 + (var2 * super.height >> 16); - boolean var24 = false; - boolean var25 = false; - if (var12 - var23 <= 50) { + this.calculateBoundingBox(var1); // L: 725 + int var11 = var5 * var8 - var4 * var6 >> 16; // L: 726 + int var12 = var2 * var7 + var3 * var11 >> 16; // L: 727 + int var13 = var3 * this.xzRadius >> 16; // L: 728 + int var14 = var12 + var13; // L: 729 + if (var14 > 50 && var12 < 3500) { // L: 730 + int var15 = var8 * var4 + var5 * var6 >> 16; // L: 731 + int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 732 + if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { // L: 733 + int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; // L: 734 + if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { // L: 735 + int var18 = var3 * var7 - var11 * var2 >> 16; // L: 736 + int var19 = var2 * this.xzRadius >> 16; // L: 737 + int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; // L: 738 + if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { // L: 739 + int var21 = (var3 * super.height >> 16) + var19; // L: 740 + int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; // L: 741 + if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { // L: 742 + int var23 = var13 + (var2 * super.height >> 16); // L: 743 + boolean var24 = false; // L: 744 + boolean var25 = false; // L: 745 + if (var12 - var23 <= 50) { // L: 746 var25 = true; } - boolean var26 = var25 || this.field1730 > 0; - int var27 = class1.method17(); - int var28 = Tiles.method1180(); - boolean var29 = ViewportMouse.ViewportMouse_isInViewport; - boolean var32 = var9 != 0L; - boolean var33; - if (var32) { - var33 = (int)(var9 >>> 16 & 1L) == 1; - var32 = !var33; - } - - var33 = false; + boolean var26 = var25 || this.field1714 > 0; // L: 747 + int var27 = ViewportMouse.ViewportMouse_x; // L: 750 + int var29 = ViewportMouse.ViewportMouse_y; // L: 755 + boolean var31 = class200.method3760(); // L: 758 + boolean var32 = GrandExchangeOfferTotalQuantityComparator.method173(var9); // L: 759 + boolean var33 = false; // L: 760 int var35; int var36; int var37; - if (var32 && var29) { - boolean var34 = false; - if (field1713) { - var34 = class236.method4283(this, var6, var7, var8); + if (var32 && var31) { // L: 761 + boolean var34 = false; // L: 762 + if (field1700) { // L: 763 + var34 = class227.method4186(this, var6, var7, var8); // L: 764 } else { - var35 = var12 - var13; - if (var35 <= 50) { + var35 = var12 - var13; // L: 767 + if (var35 <= 50) { // L: 768 var35 = 50; } - if (var15 > 0) { - var16 /= var14; - var17 /= var35; + if (var15 > 0) { // L: 769 + var16 /= var14; // L: 770 + var17 /= var35; // L: 771 } else { - var17 /= var14; - var16 /= var35; + var17 /= var14; // L: 774 + var16 /= var35; // L: 775 } - if (var18 > 0) { - var22 /= var14; - var20 /= var35; + if (var18 > 0) { // L: 777 + var22 /= var14; // L: 778 + var20 /= var35; // L: 779 } else { - var20 /= var14; - var22 /= var35; + var20 /= var14; // L: 782 + var22 /= var35; // L: 783 } - var36 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; - var37 = var28 - Rasterizer3D.Rasterizer3D_clipMidY; - if (var36 > var16 && var36 < var17 && var37 > var22 && var37 < var20) { - var34 = true; + var36 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; // L: 785 + var37 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; // L: 786 + if (var36 > var16 && var36 < var17 && var37 > var22 && var37 < var20) { // L: 787 + var34 = true; // L: 788 } } - if (var34) { - if (this.isSingleTile) { - ObjectSound.addEntityUnderMouse(var9); + if (var34) { // L: 791 + if (this.isSingleTile) { // L: 792 + DynamicObject.addEntityUnderMouse(var9); } else { - var33 = true; + var33 = true; // L: 793 } } } - int var45 = Rasterizer3D.Rasterizer3D_clipMidX; - var35 = Rasterizer3D.Rasterizer3D_clipMidY; - var36 = 0; - var37 = 0; - if (var1 != 0) { - var36 = Model_sine[var1]; - var37 = Model_cosine[var1]; + int var45 = Rasterizer3D.Rasterizer3D_clipMidX; // L: 796 + var35 = Rasterizer3D.Rasterizer3D_clipMidY; // L: 797 + var36 = 0; // L: 798 + var37 = 0; // L: 799 + if (var1 != 0) { // L: 800 + var36 = Model_sine[var1]; // L: 801 + var37 = Model_cosine[var1]; // L: 802 } - for (int var38 = 0; var38 < this.verticesCount; ++var38) { - int var39 = this.verticesX[var38]; - int var40 = this.verticesY[var38]; - int var41 = this.verticesZ[var38]; + for (int var38 = 0; var38 < this.verticesCount; ++var38) { // L: 804 + int var39 = this.verticesX[var38]; // L: 805 + int var40 = this.verticesY[var38]; // L: 806 + int var41 = this.verticesZ[var38]; // L: 807 int var42; - if (var1 != 0) { - var42 = var41 * var36 + var39 * var37 >> 16; - var41 = var41 * var37 - var39 * var36 >> 16; - var39 = var42; + if (var1 != 0) { // L: 808 + var42 = var41 * var36 + var39 * var37 >> 16; // L: 809 + var41 = var41 * var37 - var39 * var36 >> 16; // L: 810 + var39 = var42; // L: 811 } - var39 += var6; - var40 += var7; - var41 += var8; - var42 = var41 * var4 + var5 * var39 >> 16; - var41 = var5 * var41 - var39 * var4 >> 16; - var39 = var42; - var42 = var3 * var40 - var41 * var2 >> 16; - var41 = var40 * var2 + var3 * var41 >> 16; - field1739[var38] = var41 - var12; - if (var41 >= 50) { - modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var45; - modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; + var39 += var6; // L: 813 + var40 += var7; // L: 814 + var41 += var8; // L: 815 + var42 = var41 * var4 + var5 * var39 >> 16; // L: 816 + var41 = var5 * var41 - var39 * var4 >> 16; // L: 817 + var39 = var42; // L: 818 + var42 = var3 * var40 - var41 * var2 >> 16; // L: 819 + var41 = var40 * var2 + var3 * var41 >> 16; // L: 820 + field1760[var38] = var41 - var12; // L: 822 + if (var41 >= 50) { // L: 823 + modelViewportXs[var38] = var39 * Rasterizer3D.Rasterizer3D_zoom / var41 + var45; // L: 824 + modelViewportYs[var38] = var42 * Rasterizer3D.Rasterizer3D_zoom / var41 + var35; // L: 825 } else { - modelViewportXs[var38] = -5000; - var24 = true; + modelViewportXs[var38] = -5000; // L: 828 + var24 = true; // L: 829 } - if (var26) { - field1740[var38] = var39; - field1736[var38] = var42; - field1742[var38] = var41; + if (var26) { // L: 831 + field1728[var38] = var39; // L: 832 + field1739[var38] = var42; // L: 833 + field1740[var38] = var41; // L: 834 } } try { - this.draw0(var24, var33, this.isSingleTile, var9); - } catch (Exception var44) { + this.draw0(var24, var33, this.isSingleTile, var9); // L: 838 + } catch (Exception var44) { // L: 840 } } @@ -1735,5 +1700,5 @@ public class Model extends Entity { } } } - } + } // L: 841 } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 0c8ce2daff..e0cc2c5ecd 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -3,111 +3,111 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ek") +@ObfuscatedName("ee") @Implements("ModelData") public class ModelData extends Entity { - @ObfuscatedName("ad") - static int[] field1610; - @ObfuscatedName("as") - static int[] field1597; @ObfuscatedName("ar") - static int field1614; - @ObfuscatedName("ap") + static int[] field1606; + @ObfuscatedName("at") + static int[] field1602; + @ObfuscatedName("aq") + static int field1605; + @ObfuscatedName("al") @Export("ModelData_sine") static int[] ModelData_sine; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("ModelData_cosine") static int[] ModelData_cosine; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("verticesCount") int verticesCount; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("verticesX") int[] verticesX; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("verticesY") int[] verticesY; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("verticesZ") int[] verticesZ; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("faceCount") int faceCount; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("indices1") int[] indices1; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("indices2") int[] indices2; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("indices3") int[] indices3; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("faceRenderTypes") byte[] faceRenderTypes; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("faceRenderPriorities") byte[] faceRenderPriorities; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("faceAlphas") byte[] faceAlphas; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("textureCoords") byte[] textureCoords; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("faceColors") short[] faceColors; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("faceTextures") short[] faceTextures; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("priority") byte priority; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("textureTriangleCount") int textureTriangleCount; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("textureRenderTypes") byte[] textureRenderTypes; - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("texTriangleX") short[] texTriangleX; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("texTriangleY") short[] texTriangleY; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("texTriangleZ") short[] texTriangleZ; - @ObfuscatedName("l") + @ObfuscatedName("r") @Export("vertexSkins") int[] vertexSkins; - @ObfuscatedName("t") + @ObfuscatedName("u") @Export("faceSkins") int[] faceSkins; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("vertexLabels") int[][] vertexLabels; @ObfuscatedName("b") @Export("faceLabelsAlpha") int[][] faceLabelsAlpha; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "[Led;" + descriptor = "[Let;" ) @Export("faceNormals") FaceNormal[] faceNormals; - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "[Let;" + descriptor = "[Leg;" ) @Export("vertexNormals") VertexNormal[] vertexNormals; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "[Let;" + descriptor = "[Leg;" ) - VertexNormal[] field1603; - @ObfuscatedName("ai") + VertexNormal[] field1599; + @ObfuscatedName("ag") @Export("ambient") public short ambient; @ObfuscatedName("ao") @@ -116,23 +116,23 @@ public class ModelData extends Entity { @ObfuscatedName("ae") @Export("isBoundsCalculated") boolean isBoundsCalculated; - @ObfuscatedName("ax") - int field1582; - @ObfuscatedName("ag") - int field1578; - @ObfuscatedName("ab") - int field1609; + @ObfuscatedName("an") + int field1598; @ObfuscatedName("am") int field1601; - @ObfuscatedName("ak") - int field1613; + @ObfuscatedName("ap") + int field1603; + @ObfuscatedName("au") + int field1604; + @ObfuscatedName("aa") + int field1589; static { - field1610 = new int[10000]; - field1597 = new int[10000]; - field1614 = 0; - ModelData_sine = Rasterizer3D.Rasterizer3D_sine; - ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; + field1606 = new int[10000]; // L: 44 + field1602 = new int[10000]; // L: 45 + field1605 = 0; // L: 46 + ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47 + ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48 } ModelData() { @@ -140,949 +140,949 @@ public class ModelData extends Entity { this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - } + } // L: 50 @ObfuscatedSignature( - descriptor = "([Lek;I)V" + descriptor = "([Lee;I)V" ) public ModelData(ModelData[] var1, int var2) { this.verticesCount = 0; this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - boolean var3 = false; - boolean var4 = false; - boolean var5 = false; - boolean var6 = false; - boolean var7 = false; - boolean var8 = false; - this.verticesCount = 0; - this.faceCount = 0; - this.textureTriangleCount = 0; - this.priority = -1; + boolean var3 = false; // L: 471 + boolean var4 = false; // L: 472 + boolean var5 = false; // L: 473 + boolean var6 = false; // L: 474 + boolean var7 = false; // L: 475 + boolean var8 = false; // L: 476 + this.verticesCount = 0; // L: 477 + this.faceCount = 0; // L: 478 + this.textureTriangleCount = 0; // L: 479 + this.priority = -1; // L: 480 int var9; ModelData var10; - for (var9 = 0; var9 < var2; ++var9) { - var10 = var1[var9]; - if (var10 != null) { - this.verticesCount += var10.verticesCount; - this.faceCount += var10.faceCount; - this.textureTriangleCount += var10.textureTriangleCount; - if (var10.faceRenderPriorities != null) { + for (var9 = 0; var9 < var2; ++var9) { // L: 481 + var10 = var1[var9]; // L: 482 + if (var10 != null) { // L: 483 + this.verticesCount += var10.verticesCount; // L: 484 + this.faceCount += var10.faceCount; // L: 485 + this.textureTriangleCount += var10.textureTriangleCount; // L: 486 + if (var10.faceRenderPriorities != null) { // L: 487 var4 = true; } else { - if (this.priority == -1) { + if (this.priority == -1) { // L: 489 this.priority = var10.priority; } - if (this.priority != var10.priority) { + if (this.priority != var10.priority) { // L: 490 var4 = true; } } - var3 |= var10.faceRenderTypes != null; - var5 |= var10.faceAlphas != null; - var6 |= var10.faceSkins != null; - var7 |= var10.faceTextures != null; - var8 |= var10.textureCoords != null; + var3 |= var10.faceRenderTypes != null; // L: 492 + var5 |= var10.faceAlphas != null; // L: 493 + var6 |= var10.faceSkins != null; // L: 494 + var7 |= var10.faceTextures != null; // L: 495 + var8 |= var10.textureCoords != null; // L: 496 } } - this.verticesX = new int[this.verticesCount]; - this.verticesY = new int[this.verticesCount]; - this.verticesZ = new int[this.verticesCount]; - this.vertexSkins = new int[this.verticesCount]; - this.indices1 = new int[this.faceCount]; - this.indices2 = new int[this.faceCount]; - this.indices3 = new int[this.faceCount]; - if (var3) { + this.verticesX = new int[this.verticesCount]; // L: 499 + this.verticesY = new int[this.verticesCount]; // L: 500 + this.verticesZ = new int[this.verticesCount]; // L: 501 + this.vertexSkins = new int[this.verticesCount]; // L: 502 + this.indices1 = new int[this.faceCount]; // L: 503 + this.indices2 = new int[this.faceCount]; // L: 504 + this.indices3 = new int[this.faceCount]; // L: 505 + if (var3) { // L: 506 this.faceRenderTypes = new byte[this.faceCount]; } - if (var4) { + if (var4) { // L: 507 this.faceRenderPriorities = new byte[this.faceCount]; } - if (var5) { + if (var5) { // L: 508 this.faceAlphas = new byte[this.faceCount]; } - if (var6) { + if (var6) { // L: 509 this.faceSkins = new int[this.faceCount]; } - if (var7) { + if (var7) { // L: 510 this.faceTextures = new short[this.faceCount]; } - if (var8) { + if (var8) { // L: 511 this.textureCoords = new byte[this.faceCount]; } - this.faceColors = new short[this.faceCount]; - if (this.textureTriangleCount > 0) { - this.textureRenderTypes = new byte[this.textureTriangleCount]; - this.texTriangleX = new short[this.textureTriangleCount]; - this.texTriangleY = new short[this.textureTriangleCount]; - this.texTriangleZ = new short[this.textureTriangleCount]; + this.faceColors = new short[this.faceCount]; // L: 512 + if (this.textureTriangleCount > 0) { // L: 513 + this.textureRenderTypes = new byte[this.textureTriangleCount]; // L: 514 + this.texTriangleX = new short[this.textureTriangleCount]; // L: 515 + this.texTriangleY = new short[this.textureTriangleCount]; // L: 516 + this.texTriangleZ = new short[this.textureTriangleCount]; // L: 517 } - this.verticesCount = 0; - this.faceCount = 0; - this.textureTriangleCount = 0; + this.verticesCount = 0; // L: 519 + this.faceCount = 0; // L: 520 + this.textureTriangleCount = 0; // L: 521 - for (var9 = 0; var9 < var2; ++var9) { - var10 = var1[var9]; - if (var10 != null) { + for (var9 = 0; var9 < var2; ++var9) { // L: 522 + var10 = var1[var9]; // L: 523 + if (var10 != null) { // L: 524 int var11; - for (var11 = 0; var11 < var10.faceCount; ++var11) { - if (var3 && var10.faceRenderTypes != null) { + for (var11 = 0; var11 < var10.faceCount; ++var11) { // L: 525 + if (var3 && var10.faceRenderTypes != null) { // L: 526 527 this.faceRenderTypes[this.faceCount] = var10.faceRenderTypes[var11]; } - if (var4) { - if (var10.faceRenderPriorities != null) { + if (var4) { // L: 529 + if (var10.faceRenderPriorities != null) { // L: 530 this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; } else { - this.faceRenderPriorities[this.faceCount] = var10.priority; + this.faceRenderPriorities[this.faceCount] = var10.priority; // L: 531 } } - if (var5 && var10.faceAlphas != null) { + if (var5 && var10.faceAlphas != null) { // L: 533 534 this.faceAlphas[this.faceCount] = var10.faceAlphas[var11]; } - if (var6 && var10.faceSkins != null) { + if (var6 && var10.faceSkins != null) { // L: 536 537 this.faceSkins[this.faceCount] = var10.faceSkins[var11]; } - if (var7) { - if (var10.faceTextures != null) { + if (var7) { // L: 539 + if (var10.faceTextures != null) { // L: 540 this.faceTextures[this.faceCount] = var10.faceTextures[var11]; } else { - this.faceTextures[this.faceCount] = -1; + this.faceTextures[this.faceCount] = -1; // L: 541 } } - if (var8) { - if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { + if (var8) { // L: 543 + if (var10.textureCoords != null && var10.textureCoords[var11] != -1) { // L: 544 this.textureCoords[this.faceCount] = (byte)(this.textureTriangleCount + var10.textureCoords[var11]); } else { - this.textureCoords[this.faceCount] = -1; + this.textureCoords[this.faceCount] = -1; // L: 545 } } - this.faceColors[this.faceCount] = var10.faceColors[var11]; - this.indices1[this.faceCount] = this.method2928(var10, var10.indices1[var11]); - this.indices2[this.faceCount] = this.method2928(var10, var10.indices2[var11]); - this.indices3[this.faceCount] = this.method2928(var10, var10.indices3[var11]); - ++this.faceCount; + this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547 + this.indices1[this.faceCount] = this.method2904(var10, var10.indices1[var11]); // L: 548 + this.indices2[this.faceCount] = this.method2904(var10, var10.indices2[var11]); // L: 549 + this.indices3[this.faceCount] = this.method2904(var10, var10.indices3[var11]); // L: 550 + ++this.faceCount; // L: 551 } - for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { - byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; - if (var12 == 0) { - this.texTriangleX[this.textureTriangleCount] = (short)this.method2928(var10, var10.texTriangleX[var11]); - this.texTriangleY[this.textureTriangleCount] = (short)this.method2928(var10, var10.texTriangleY[var11]); - this.texTriangleZ[this.textureTriangleCount] = (short)this.method2928(var10, var10.texTriangleZ[var11]); + for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { // L: 553 + byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; // L: 554 + if (var12 == 0) { // L: 555 + this.texTriangleX[this.textureTriangleCount] = (short)this.method2904(var10, var10.texTriangleX[var11]); // L: 556 + this.texTriangleY[this.textureTriangleCount] = (short)this.method2904(var10, var10.texTriangleY[var11]); // L: 557 + this.texTriangleZ[this.textureTriangleCount] = (short)this.method2904(var10, var10.texTriangleZ[var11]); // L: 558 } - ++this.textureTriangleCount; + ++this.textureTriangleCount; // L: 560 } } } - } + } // L: 564 ModelData(byte[] var1) { this.verticesCount = 0; this.faceCount = 0; this.priority = 0; this.isBoundsCalculated = false; - if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { - this.method2908(var1); + if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 59 + this.method2880(var1); } else { - this.method2909(var1); + this.method2920(var1); // L: 60 } - } + } // L: 61 @ObfuscatedSignature( - descriptor = "(Lek;ZZZZ)V", + descriptor = "(Lee;ZZZZ)V", garbageValue = "1" ) public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) { - this.verticesCount = 0; - this.faceCount = 0; - this.priority = 0; - this.isBoundsCalculated = false; - this.verticesCount = var1.verticesCount; - this.faceCount = var1.faceCount; - this.textureTriangleCount = var1.textureTriangleCount; + this.verticesCount = 0; // L: 9 + this.faceCount = 0; // L: 13 + this.priority = 0; // L: 23 + this.isBoundsCalculated = false; // L: 38 + this.verticesCount = var1.verticesCount; // L: 588 + this.faceCount = var1.faceCount; // L: 589 + this.textureTriangleCount = var1.textureTriangleCount; // L: 590 int var6; - if (var2) { - this.verticesX = var1.verticesX; - this.verticesY = var1.verticesY; - this.verticesZ = var1.verticesZ; + if (var2) { // L: 591 + this.verticesX = var1.verticesX; // L: 592 + this.verticesY = var1.verticesY; // L: 593 + this.verticesZ = var1.verticesZ; // L: 594 } else { - this.verticesX = new int[this.verticesCount]; - this.verticesY = new int[this.verticesCount]; - this.verticesZ = new int[this.verticesCount]; + this.verticesX = new int[this.verticesCount]; // L: 597 + this.verticesY = new int[this.verticesCount]; // L: 598 + this.verticesZ = new int[this.verticesCount]; // L: 599 - for (var6 = 0; var6 < this.verticesCount; ++var6) { - this.verticesX[var6] = var1.verticesX[var6]; - this.verticesY[var6] = var1.verticesY[var6]; - this.verticesZ[var6] = var1.verticesZ[var6]; + for (var6 = 0; var6 < this.verticesCount; ++var6) { // L: 600 + this.verticesX[var6] = var1.verticesX[var6]; // L: 601 + this.verticesY[var6] = var1.verticesY[var6]; // L: 602 + this.verticesZ[var6] = var1.verticesZ[var6]; // L: 603 } } - if (var3) { + if (var3) { // L: 606 this.faceColors = var1.faceColors; } else { - this.faceColors = new short[this.faceCount]; + this.faceColors = new short[this.faceCount]; // L: 608 - for (var6 = 0; var6 < this.faceCount; ++var6) { + for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 609 this.faceColors[var6] = var1.faceColors[var6]; } } - if (!var4 && var1.faceTextures != null) { - this.faceTextures = new short[this.faceCount]; + if (!var4 && var1.faceTextures != null) { // L: 611 + this.faceTextures = new short[this.faceCount]; // L: 613 - for (var6 = 0; var6 < this.faceCount; ++var6) { + for (var6 = 0; var6 < this.faceCount; ++var6) { // L: 614 this.faceTextures[var6] = var1.faceTextures[var6]; } } else { this.faceTextures = var1.faceTextures; } - this.faceAlphas = var1.faceAlphas; - this.indices1 = var1.indices1; - this.indices2 = var1.indices2; - this.indices3 = var1.indices3; - this.faceRenderTypes = var1.faceRenderTypes; - this.faceRenderPriorities = var1.faceRenderPriorities; - this.textureCoords = var1.textureCoords; - this.priority = var1.priority; - this.textureRenderTypes = var1.textureRenderTypes; - this.texTriangleX = var1.texTriangleX; - this.texTriangleY = var1.texTriangleY; - this.texTriangleZ = var1.texTriangleZ; - this.vertexSkins = var1.vertexSkins; - this.faceSkins = var1.faceSkins; - this.vertexLabels = var1.vertexLabels; - this.faceLabelsAlpha = var1.faceLabelsAlpha; - this.vertexNormals = var1.vertexNormals; - this.faceNormals = var1.faceNormals; - this.field1603 = var1.field1603; - this.ambient = var1.ambient; - this.contrast = var1.contrast; + this.faceAlphas = var1.faceAlphas; // L: 616 + this.indices1 = var1.indices1; // L: 626 + this.indices2 = var1.indices2; // L: 627 + this.indices3 = var1.indices3; // L: 628 + this.faceRenderTypes = var1.faceRenderTypes; // L: 629 + this.faceRenderPriorities = var1.faceRenderPriorities; // L: 630 + this.textureCoords = var1.textureCoords; // L: 631 + this.priority = var1.priority; // L: 632 + this.textureRenderTypes = var1.textureRenderTypes; // L: 633 + this.texTriangleX = var1.texTriangleX; // L: 634 + this.texTriangleY = var1.texTriangleY; // L: 635 + this.texTriangleZ = var1.texTriangleZ; // L: 636 + this.vertexSkins = var1.vertexSkins; // L: 637 + this.faceSkins = var1.faceSkins; // L: 638 + this.vertexLabels = var1.vertexLabels; // L: 639 + this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 640 + this.vertexNormals = var1.vertexNormals; // L: 641 + this.faceNormals = var1.faceNormals; // L: 642 + this.field1599 = var1.field1599; // L: 643 + this.ambient = var1.ambient; // L: 644 + this.contrast = var1.contrast; // L: 645 } - @ObfuscatedName("o") - void method2908(byte[] var1) { - Buffer var2 = new Buffer(var1); - Buffer var3 = new Buffer(var1); - Buffer var4 = new Buffer(var1); - Buffer var5 = new Buffer(var1); - Buffer var6 = new Buffer(var1); - Buffer var7 = new Buffer(var1); - Buffer var8 = new Buffer(var1); - var2.offset = var1.length - 23; - int var9 = var2.readUnsignedShort(); - int var10 = var2.readUnsignedShort(); - int var11 = var2.readUnsignedByte(); - int var12 = var2.readUnsignedByte(); - int var13 = var2.readUnsignedByte(); - int var14 = var2.readUnsignedByte(); - int var15 = var2.readUnsignedByte(); - int var16 = var2.readUnsignedByte(); - int var17 = var2.readUnsignedByte(); - int var18 = var2.readUnsignedShort(); - int var19 = var2.readUnsignedShort(); - int var20 = var2.readUnsignedShort(); - int var21 = var2.readUnsignedShort(); - int var22 = var2.readUnsignedShort(); - int var23 = 0; - int var24 = 0; - int var25 = 0; + @ObfuscatedName("k") + void method2880(byte[] var1) { + Buffer var2 = new Buffer(var1); // L: 64 + Buffer var3 = new Buffer(var1); // L: 65 + Buffer var4 = new Buffer(var1); // L: 66 + Buffer var5 = new Buffer(var1); // L: 67 + Buffer var6 = new Buffer(var1); // L: 68 + Buffer var7 = new Buffer(var1); // L: 69 + Buffer var8 = new Buffer(var1); // L: 70 + var2.offset = var1.length - 23; // L: 71 + int var9 = var2.readUnsignedShort(); // L: 72 + int var10 = var2.readUnsignedShort(); // L: 73 + int var11 = var2.readUnsignedByte(); // L: 74 + int var12 = var2.readUnsignedByte(); // L: 75 + int var13 = var2.readUnsignedByte(); // L: 76 + int var14 = var2.readUnsignedByte(); // L: 77 + int var15 = var2.readUnsignedByte(); // L: 78 + int var16 = var2.readUnsignedByte(); // L: 79 + int var17 = var2.readUnsignedByte(); // L: 80 + int var18 = var2.readUnsignedShort(); // L: 81 + int var19 = var2.readUnsignedShort(); // L: 82 + int var20 = var2.readUnsignedShort(); // L: 83 + int var21 = var2.readUnsignedShort(); // L: 84 + int var22 = var2.readUnsignedShort(); // L: 85 + int var23 = 0; // L: 86 + int var24 = 0; // L: 87 + int var25 = 0; // L: 88 int var26; - if (var11 > 0) { - this.textureRenderTypes = new byte[var11]; - var2.offset = 0; + if (var11 > 0) { // L: 89 + this.textureRenderTypes = new byte[var11]; // L: 90 + var2.offset = 0; // L: 91 - for (var26 = 0; var26 < var11; ++var26) { - byte var27 = this.textureRenderTypes[var26] = var2.readByte(); - if (var27 == 0) { + for (var26 = 0; var26 < var11; ++var26) { // L: 92 + byte var27 = this.textureRenderTypes[var26] = var2.readByte(); // L: 93 + if (var27 == 0) { // L: 94 ++var23; } - if (var27 >= 1 && var27 <= 3) { + if (var27 >= 1 && var27 <= 3) { // L: 95 ++var24; } - if (var27 == 2) { + if (var27 == 2) { // L: 96 ++var25; } } } - var26 = var11 + var9; - int var28 = var26; - if (var12 == 1) { + var26 = var11 + var9; // L: 101 + int var28 = var26; // L: 102 + if (var12 == 1) { // L: 103 var26 += var10; } - int var29 = var26; - var26 += var10; - int var30 = var26; - if (var13 == 255) { + int var29 = var26; // L: 104 + var26 += var10; // L: 105 + int var30 = var26; // L: 106 + if (var13 == 255) { // L: 107 var26 += var10; } - int var31 = var26; - if (var15 == 1) { + int var31 = var26; // L: 108 + if (var15 == 1) { // L: 109 var26 += var10; } - int var32 = var26; - if (var17 == 1) { + int var32 = var26; // L: 110 + if (var17 == 1) { // L: 111 var26 += var9; } - int var33 = var26; - if (var14 == 1) { + int var33 = var26; // L: 112 + if (var14 == 1) { // L: 113 var26 += var10; } - int var34 = var26; - var26 += var21; - int var35 = var26; - if (var16 == 1) { + int var34 = var26; // L: 114 + var26 += var21; // L: 115 + int var35 = var26; // L: 116 + if (var16 == 1) { // L: 117 var26 += var10 * 2; } - int var36 = var26; - var26 += var22; - int var37 = var26; - var26 += var10 * 2; - int var38 = var26; - var26 += var18; - int var39 = var26; - var26 += var19; - int var40 = var26; - var26 += var20; - int var41 = var26; - var26 += var23 * 6; - int var42 = var26; - var26 += var24 * 6; - int var43 = var26; - var26 += var24 * 6; - int var44 = var26; - var26 += var24 * 2; - int var45 = var26; - var26 += var24; - int var46 = var26; - var26 += var24 * 2 + var25 * 2; - this.verticesCount = var9; - this.faceCount = var10; - this.textureTriangleCount = var11; - this.verticesX = new int[var9]; - this.verticesY = new int[var9]; - this.verticesZ = new int[var9]; - this.indices1 = new int[var10]; - this.indices2 = new int[var10]; - this.indices3 = new int[var10]; - if (var17 == 1) { + int var36 = var26; // L: 118 + var26 += var22; // L: 119 + int var37 = var26; // L: 120 + var26 += var10 * 2; // L: 121 + int var38 = var26; // L: 122 + var26 += var18; // L: 123 + int var39 = var26; // L: 124 + var26 += var19; // L: 125 + int var40 = var26; // L: 126 + var26 += var20; // L: 127 + int var41 = var26; // L: 128 + var26 += var23 * 6; // L: 129 + int var42 = var26; // L: 130 + var26 += var24 * 6; // L: 131 + int var43 = var26; // L: 132 + var26 += var24 * 6; // L: 133 + int var44 = var26; // L: 134 + var26 += var24 * 2; // L: 135 + int var45 = var26; // L: 136 + var26 += var24; // L: 137 + int var46 = var26; // L: 138 + var26 += var24 * 2 + var25 * 2; // L: 139 + this.verticesCount = var9; // L: 141 + this.faceCount = var10; // L: 142 + this.textureTriangleCount = var11; // L: 143 + this.verticesX = new int[var9]; // L: 144 + this.verticesY = new int[var9]; // L: 145 + this.verticesZ = new int[var9]; // L: 146 + this.indices1 = new int[var10]; // L: 147 + this.indices2 = new int[var10]; // L: 148 + this.indices3 = new int[var10]; // L: 149 + if (var17 == 1) { // L: 150 this.vertexSkins = new int[var9]; } - if (var12 == 1) { + if (var12 == 1) { // L: 151 this.faceRenderTypes = new byte[var10]; } - if (var13 == 255) { + if (var13 == 255) { // L: 152 this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; + this.priority = (byte)var13; // L: 153 } - if (var14 == 1) { + if (var14 == 1) { // L: 154 this.faceAlphas = new byte[var10]; } - if (var15 == 1) { + if (var15 == 1) { // L: 155 this.faceSkins = new int[var10]; } - if (var16 == 1) { + if (var16 == 1) { // L: 156 this.faceTextures = new short[var10]; } - if (var16 == 1 && var11 > 0) { + if (var16 == 1 && var11 > 0) { // L: 157 this.textureCoords = new byte[var10]; } - this.faceColors = new short[var10]; - if (var11 > 0) { - this.texTriangleX = new short[var11]; - this.texTriangleY = new short[var11]; - this.texTriangleZ = new short[var11]; + this.faceColors = new short[var10]; // L: 158 + if (var11 > 0) { // L: 159 + this.texTriangleX = new short[var11]; // L: 160 + this.texTriangleY = new short[var11]; // L: 161 + this.texTriangleZ = new short[var11]; // L: 162 } - var2.offset = var11; - var3.offset = var38; - var4.offset = var39; - var5.offset = var40; - var6.offset = var32; - int var48 = 0; - int var49 = 0; - int var50 = 0; + var2.offset = var11; // L: 164 + var3.offset = var38; // L: 165 + var4.offset = var39; // L: 166 + var5.offset = var40; // L: 167 + var6.offset = var32; // L: 168 + int var48 = 0; // L: 169 + int var49 = 0; // L: 170 + int var50 = 0; // L: 171 int var51; int var52; int var53; int var54; int var55; - for (var51 = 0; var51 < var9; ++var51) { - var52 = var2.readUnsignedByte(); - var53 = 0; - if ((var52 & 1) != 0) { + for (var51 = 0; var51 < var9; ++var51) { // L: 172 + var52 = var2.readUnsignedByte(); // L: 173 + var53 = 0; // L: 174 + if ((var52 & 1) != 0) { // L: 175 var53 = var3.readShortSmart(); } - var54 = 0; - if ((var52 & 2) != 0) { + var54 = 0; // L: 176 + if ((var52 & 2) != 0) { // L: 177 var54 = var4.readShortSmart(); } - var55 = 0; - if ((var52 & 4) != 0) { + var55 = 0; // L: 178 + if ((var52 & 4) != 0) { // L: 179 var55 = var5.readShortSmart(); } - this.verticesX[var51] = var48 + var53; - this.verticesY[var51] = var49 + var54; - this.verticesZ[var51] = var50 + var55; - var48 = this.verticesX[var51]; - var49 = this.verticesY[var51]; - var50 = this.verticesZ[var51]; - if (var17 == 1) { + this.verticesX[var51] = var48 + var53; // L: 180 + this.verticesY[var51] = var49 + var54; // L: 181 + this.verticesZ[var51] = var50 + var55; // L: 182 + var48 = this.verticesX[var51]; // L: 183 + var49 = this.verticesY[var51]; // L: 184 + var50 = this.verticesZ[var51]; // L: 185 + if (var17 == 1) { // L: 186 this.vertexSkins[var51] = var6.readUnsignedByte(); } } - var2.offset = var37; - var3.offset = var28; - var4.offset = var30; - var5.offset = var33; - var6.offset = var31; - var7.offset = var35; - var8.offset = var36; + var2.offset = var37; // L: 188 + var3.offset = var28; // L: 189 + var4.offset = var30; // L: 190 + var5.offset = var33; // L: 191 + var6.offset = var31; // L: 192 + var7.offset = var35; // L: 193 + var8.offset = var36; // L: 194 - for (var51 = 0; var51 < var10; ++var51) { - this.faceColors[var51] = (short)var2.readUnsignedShort(); - if (var12 == 1) { + for (var51 = 0; var51 < var10; ++var51) { // L: 195 + this.faceColors[var51] = (short)var2.readUnsignedShort(); // L: 196 + if (var12 == 1) { // L: 197 this.faceRenderTypes[var51] = var3.readByte(); } - if (var13 == 255) { + if (var13 == 255) { // L: 198 this.faceRenderPriorities[var51] = var4.readByte(); } - if (var14 == 1) { + if (var14 == 1) { // L: 199 this.faceAlphas[var51] = var5.readByte(); } - if (var15 == 1) { + if (var15 == 1) { // L: 200 this.faceSkins[var51] = var6.readUnsignedByte(); } - if (var16 == 1) { + if (var16 == 1) { // L: 201 this.faceTextures[var51] = (short)(var7.readUnsignedShort() - 1); } - if (this.textureCoords != null && this.faceTextures[var51] != -1) { + if (this.textureCoords != null && this.faceTextures[var51] != -1) { // L: 202 this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1); } } - var2.offset = var34; - var3.offset = var29; - var51 = 0; - var52 = 0; - var53 = 0; - var54 = 0; + var2.offset = var34; // L: 204 + var3.offset = var29; // L: 205 + var51 = 0; // L: 206 + var52 = 0; // L: 207 + var53 = 0; // L: 208 + var54 = 0; // L: 209 int var56; - for (var55 = 0; var55 < var10; ++var55) { - var56 = var3.readUnsignedByte(); - if (var56 == 1) { - var51 = var2.readShortSmart() + var54; - var52 = var2.readShortSmart() + var51; - var53 = var2.readShortSmart() + var52; - var54 = var53; - this.indices1[var55] = var51; - this.indices2[var55] = var52; - this.indices3[var55] = var53; + for (var55 = 0; var55 < var10; ++var55) { // L: 210 + var56 = var3.readUnsignedByte(); // L: 211 + if (var56 == 1) { // L: 212 + var51 = var2.readShortSmart() + var54; // L: 213 + var52 = var2.readShortSmart() + var51; // L: 215 + var53 = var2.readShortSmart() + var52; // L: 217 + var54 = var53; // L: 218 + this.indices1[var55] = var51; // L: 219 + this.indices2[var55] = var52; // L: 220 + this.indices3[var55] = var53; // L: 221 } - if (var56 == 2) { - var52 = var53; - var53 = var2.readShortSmart() + var54; - var54 = var53; - this.indices1[var55] = var51; - this.indices2[var55] = var52; - this.indices3[var55] = var53; + if (var56 == 2) { // L: 223 + var52 = var53; // L: 224 + var53 = var2.readShortSmart() + var54; // L: 225 + var54 = var53; // L: 226 + this.indices1[var55] = var51; // L: 227 + this.indices2[var55] = var52; // L: 228 + this.indices3[var55] = var53; // L: 229 } - if (var56 == 3) { - var51 = var53; - var53 = var2.readShortSmart() + var54; - var54 = var53; - this.indices1[var55] = var51; - this.indices2[var55] = var52; - this.indices3[var55] = var53; + if (var56 == 3) { // L: 231 + var51 = var53; // L: 232 + var53 = var2.readShortSmart() + var54; // L: 233 + var54 = var53; // L: 234 + this.indices1[var55] = var51; // L: 235 + this.indices2[var55] = var52; // L: 236 + this.indices3[var55] = var53; // L: 237 } - if (var56 == 4) { - int var57 = var51; - var51 = var52; - var52 = var57; - var53 = var2.readShortSmart() + var54; - var54 = var53; - this.indices1[var55] = var51; - this.indices2[var55] = var57; - this.indices3[var55] = var53; + if (var56 == 4) { // L: 239 + int var57 = var51; // L: 240 + var51 = var52; // L: 241 + var52 = var57; // L: 242 + var53 = var2.readShortSmart() + var54; // L: 243 + var54 = var53; // L: 244 + this.indices1[var55] = var51; // L: 245 + this.indices2[var55] = var57; // L: 246 + this.indices3[var55] = var53; // L: 247 } } - var2.offset = var41; - var3.offset = var42; - var4.offset = var43; - var5.offset = var44; - var6.offset = var45; - var7.offset = var46; + var2.offset = var41; // L: 250 + var3.offset = var42; // L: 251 + var4.offset = var43; // L: 252 + var5.offset = var44; // L: 253 + var6.offset = var45; // L: 254 + var7.offset = var46; // L: 255 - for (var55 = 0; var55 < var11; ++var55) { - var56 = this.textureRenderTypes[var55] & 255; - if (var56 == 0) { - this.texTriangleX[var55] = (short)var2.readUnsignedShort(); - this.texTriangleY[var55] = (short)var2.readUnsignedShort(); - this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); + for (var55 = 0; var55 < var11; ++var55) { // L: 256 + var56 = this.textureRenderTypes[var55] & 255; // L: 257 + if (var56 == 0) { // L: 258 + this.texTriangleX[var55] = (short)var2.readUnsignedShort(); // L: 259 + this.texTriangleY[var55] = (short)var2.readUnsignedShort(); // L: 260 + this.texTriangleZ[var55] = (short)var2.readUnsignedShort(); // L: 261 } } - var2.offset = var26; - var55 = var2.readUnsignedByte(); - if (var55 != 0) { + var2.offset = var26; // L: 264 + var55 = var2.readUnsignedByte(); // L: 265 + if (var55 != 0) { // L: 266 new ModelData0(); - var2.readUnsignedShort(); - var2.readUnsignedShort(); - var2.readUnsignedShort(); - var2.readInt(); + var2.readUnsignedShort(); // L: 268 + var2.readUnsignedShort(); // L: 269 + var2.readUnsignedShort(); // L: 270 + var2.readInt(); // L: 271 } - } + } // L: 273 - @ObfuscatedName("q") - void method2909(byte[] var1) { - boolean var2 = false; - boolean var3 = false; - Buffer var4 = new Buffer(var1); - Buffer var5 = new Buffer(var1); - Buffer var6 = new Buffer(var1); - Buffer var7 = new Buffer(var1); - Buffer var8 = new Buffer(var1); - var4.offset = var1.length - 18; - int var9 = var4.readUnsignedShort(); - int var10 = var4.readUnsignedShort(); - int var11 = var4.readUnsignedByte(); - int var12 = var4.readUnsignedByte(); - int var13 = var4.readUnsignedByte(); - int var14 = var4.readUnsignedByte(); - int var15 = var4.readUnsignedByte(); - int var16 = var4.readUnsignedByte(); - int var17 = var4.readUnsignedShort(); - int var18 = var4.readUnsignedShort(); - int var19 = var4.readUnsignedShort(); - int var20 = var4.readUnsignedShort(); - byte var21 = 0; - int var45 = var21 + var9; - int var23 = var45; - var45 += var10; - int var24 = var45; - if (var13 == 255) { + @ObfuscatedName("s") + void method2920(byte[] var1) { + boolean var2 = false; // L: 276 + boolean var3 = false; // L: 277 + Buffer var4 = new Buffer(var1); // L: 278 + Buffer var5 = new Buffer(var1); // L: 279 + Buffer var6 = new Buffer(var1); // L: 280 + Buffer var7 = new Buffer(var1); // L: 281 + Buffer var8 = new Buffer(var1); // L: 282 + var4.offset = var1.length - 18; // L: 283 + int var9 = var4.readUnsignedShort(); // L: 284 + int var10 = var4.readUnsignedShort(); // L: 285 + int var11 = var4.readUnsignedByte(); // L: 286 + int var12 = var4.readUnsignedByte(); // L: 287 + int var13 = var4.readUnsignedByte(); // L: 288 + int var14 = var4.readUnsignedByte(); // L: 289 + int var15 = var4.readUnsignedByte(); // L: 290 + int var16 = var4.readUnsignedByte(); // L: 291 + int var17 = var4.readUnsignedShort(); // L: 292 + int var18 = var4.readUnsignedShort(); // L: 293 + int var19 = var4.readUnsignedShort(); // L: 294 + int var20 = var4.readUnsignedShort(); // L: 295 + byte var21 = 0; // L: 296 + int var45 = var21 + var9; // L: 298 + int var23 = var45; // L: 299 + var45 += var10; // L: 300 + int var24 = var45; // L: 301 + if (var13 == 255) { // L: 302 var45 += var10; } - int var25 = var45; - if (var15 == 1) { + int var25 = var45; // L: 303 + if (var15 == 1) { // L: 304 var45 += var10; } - int var26 = var45; - if (var12 == 1) { + int var26 = var45; // L: 305 + if (var12 == 1) { // L: 306 var45 += var10; } - int var27 = var45; - if (var16 == 1) { + int var27 = var45; // L: 307 + if (var16 == 1) { // L: 308 var45 += var9; } - int var28 = var45; - if (var14 == 1) { + int var28 = var45; // L: 309 + if (var14 == 1) { // L: 310 var45 += var10; } - int var29 = var45; - var45 += var20; - int var30 = var45; - var45 += var10 * 2; - int var31 = var45; - var45 += var11 * 6; - int var32 = var45; - var45 += var17; - int var33 = var45; - var45 += var18; - int var10000 = var45 + var19; - this.verticesCount = var9; - this.faceCount = var10; - this.textureTriangleCount = var11; - this.verticesX = new int[var9]; - this.verticesY = new int[var9]; - this.verticesZ = new int[var9]; - this.indices1 = new int[var10]; - this.indices2 = new int[var10]; - this.indices3 = new int[var10]; - if (var11 > 0) { - this.textureRenderTypes = new byte[var11]; - this.texTriangleX = new short[var11]; - this.texTriangleY = new short[var11]; - this.texTriangleZ = new short[var11]; + int var29 = var45; // L: 311 + var45 += var20; // L: 312 + int var30 = var45; // L: 313 + var45 += var10 * 2; // L: 314 + int var31 = var45; // L: 315 + var45 += var11 * 6; // L: 316 + int var32 = var45; // L: 317 + var45 += var17; // L: 318 + int var33 = var45; // L: 319 + var45 += var18; // L: 320 + int var10000 = var45 + var19; // L: 322 + this.verticesCount = var9; // L: 323 + this.faceCount = var10; // L: 324 + this.textureTriangleCount = var11; // L: 325 + this.verticesX = new int[var9]; // L: 326 + this.verticesY = new int[var9]; // L: 327 + this.verticesZ = new int[var9]; // L: 328 + this.indices1 = new int[var10]; // L: 329 + this.indices2 = new int[var10]; // L: 330 + this.indices3 = new int[var10]; // L: 331 + if (var11 > 0) { // L: 332 + this.textureRenderTypes = new byte[var11]; // L: 333 + this.texTriangleX = new short[var11]; // L: 334 + this.texTriangleY = new short[var11]; // L: 335 + this.texTriangleZ = new short[var11]; // L: 336 } - if (var16 == 1) { + if (var16 == 1) { // L: 338 this.vertexSkins = new int[var9]; } - if (var12 == 1) { - this.faceRenderTypes = new byte[var10]; - this.textureCoords = new byte[var10]; - this.faceTextures = new short[var10]; + if (var12 == 1) { // L: 339 + this.faceRenderTypes = new byte[var10]; // L: 340 + this.textureCoords = new byte[var10]; // L: 341 + this.faceTextures = new short[var10]; // L: 342 } - if (var13 == 255) { + if (var13 == 255) { // L: 344 this.faceRenderPriorities = new byte[var10]; } else { - this.priority = (byte)var13; + this.priority = (byte)var13; // L: 345 } - if (var14 == 1) { + if (var14 == 1) { // L: 346 this.faceAlphas = new byte[var10]; } - if (var15 == 1) { + if (var15 == 1) { // L: 347 this.faceSkins = new int[var10]; } - this.faceColors = new short[var10]; - var4.offset = var21; - var5.offset = var32; - var6.offset = var33; - var7.offset = var45; - var8.offset = var27; - int var35 = 0; - int var36 = 0; - int var37 = 0; + this.faceColors = new short[var10]; // L: 348 + var4.offset = var21; // L: 349 + var5.offset = var32; // L: 350 + var6.offset = var33; // L: 351 + var7.offset = var45; // L: 352 + var8.offset = var27; // L: 353 + int var35 = 0; // L: 354 + int var36 = 0; // L: 355 + int var37 = 0; // L: 356 int var38; int var39; int var40; int var41; int var42; - for (var38 = 0; var38 < var9; ++var38) { - var39 = var4.readUnsignedByte(); - var40 = 0; - if ((var39 & 1) != 0) { + for (var38 = 0; var38 < var9; ++var38) { // L: 357 + var39 = var4.readUnsignedByte(); // L: 358 + var40 = 0; // L: 359 + if ((var39 & 1) != 0) { // L: 360 var40 = var5.readShortSmart(); } - var41 = 0; - if ((var39 & 2) != 0) { + var41 = 0; // L: 361 + if ((var39 & 2) != 0) { // L: 362 var41 = var6.readShortSmart(); } - var42 = 0; - if ((var39 & 4) != 0) { + var42 = 0; // L: 363 + if ((var39 & 4) != 0) { // L: 364 var42 = var7.readShortSmart(); } - this.verticesX[var38] = var35 + var40; - this.verticesY[var38] = var36 + var41; - this.verticesZ[var38] = var37 + var42; - var35 = this.verticesX[var38]; - var36 = this.verticesY[var38]; - var37 = this.verticesZ[var38]; - if (var16 == 1) { + this.verticesX[var38] = var35 + var40; // L: 365 + this.verticesY[var38] = var36 + var41; // L: 366 + this.verticesZ[var38] = var37 + var42; // L: 367 + var35 = this.verticesX[var38]; // L: 368 + var36 = this.verticesY[var38]; // L: 369 + var37 = this.verticesZ[var38]; // L: 370 + if (var16 == 1) { // L: 371 this.vertexSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var30; - var5.offset = var26; - var6.offset = var24; - var7.offset = var28; - var8.offset = var25; + var4.offset = var30; // L: 373 + var5.offset = var26; // L: 374 + var6.offset = var24; // L: 375 + var7.offset = var28; // L: 376 + var8.offset = var25; // L: 377 - for (var38 = 0; var38 < var10; ++var38) { - this.faceColors[var38] = (short)var4.readUnsignedShort(); - if (var12 == 1) { - var39 = var5.readUnsignedByte(); - if ((var39 & 1) == 1) { - this.faceRenderTypes[var38] = 1; - var2 = true; + for (var38 = 0; var38 < var10; ++var38) { // L: 378 + this.faceColors[var38] = (short)var4.readUnsignedShort(); // L: 379 + if (var12 == 1) { // L: 380 + var39 = var5.readUnsignedByte(); // L: 381 + if ((var39 & 1) == 1) { // L: 382 + this.faceRenderTypes[var38] = 1; // L: 383 + var2 = true; // L: 384 } else { - this.faceRenderTypes[var38] = 0; + this.faceRenderTypes[var38] = 0; // L: 386 } - if ((var39 & 2) == 2) { - this.textureCoords[var38] = (byte)(var39 >> 2); - this.faceTextures[var38] = this.faceColors[var38]; - this.faceColors[var38] = 127; - if (this.faceTextures[var38] != -1) { + if ((var39 & 2) == 2) { // L: 387 + this.textureCoords[var38] = (byte)(var39 >> 2); // L: 388 + this.faceTextures[var38] = this.faceColors[var38]; // L: 389 + this.faceColors[var38] = 127; // L: 390 + if (this.faceTextures[var38] != -1) { // L: 391 var3 = true; } } else { - this.textureCoords[var38] = -1; - this.faceTextures[var38] = -1; + this.textureCoords[var38] = -1; // L: 394 + this.faceTextures[var38] = -1; // L: 395 } } - if (var13 == 255) { + if (var13 == 255) { // L: 398 this.faceRenderPriorities[var38] = var6.readByte(); } - if (var14 == 1) { + if (var14 == 1) { // L: 399 this.faceAlphas[var38] = var7.readByte(); } - if (var15 == 1) { + if (var15 == 1) { // L: 400 this.faceSkins[var38] = var8.readUnsignedByte(); } } - var4.offset = var29; - var5.offset = var23; - var38 = 0; - var39 = 0; - var40 = 0; - var41 = 0; + var4.offset = var29; // L: 402 + var5.offset = var23; // L: 403 + var38 = 0; // L: 404 + var39 = 0; // L: 405 + var40 = 0; // L: 406 + var41 = 0; // L: 407 int var43; int var44; - for (var42 = 0; var42 < var10; ++var42) { - var43 = var5.readUnsignedByte(); - if (var43 == 1) { - var38 = var4.readShortSmart() + var41; - var39 = var4.readShortSmart() + var38; - var40 = var4.readShortSmart() + var39; - var41 = var40; - this.indices1[var42] = var38; - this.indices2[var42] = var39; - this.indices3[var42] = var40; + for (var42 = 0; var42 < var10; ++var42) { // L: 408 + var43 = var5.readUnsignedByte(); // L: 409 + if (var43 == 1) { // L: 410 + var38 = var4.readShortSmart() + var41; // L: 411 + var39 = var4.readShortSmart() + var38; // L: 413 + var40 = var4.readShortSmart() + var39; // L: 415 + var41 = var40; // L: 416 + this.indices1[var42] = var38; // L: 417 + this.indices2[var42] = var39; // L: 418 + this.indices3[var42] = var40; // L: 419 } - if (var43 == 2) { - var39 = var40; - var40 = var4.readShortSmart() + var41; - var41 = var40; - this.indices1[var42] = var38; - this.indices2[var42] = var39; - this.indices3[var42] = var40; + if (var43 == 2) { // L: 421 + var39 = var40; // L: 422 + var40 = var4.readShortSmart() + var41; // L: 423 + var41 = var40; // L: 424 + this.indices1[var42] = var38; // L: 425 + this.indices2[var42] = var39; // L: 426 + this.indices3[var42] = var40; // L: 427 } - if (var43 == 3) { - var38 = var40; - var40 = var4.readShortSmart() + var41; - var41 = var40; - this.indices1[var42] = var38; - this.indices2[var42] = var39; - this.indices3[var42] = var40; + if (var43 == 3) { // L: 429 + var38 = var40; // L: 430 + var40 = var4.readShortSmart() + var41; // L: 431 + var41 = var40; // L: 432 + this.indices1[var42] = var38; // L: 433 + this.indices2[var42] = var39; // L: 434 + this.indices3[var42] = var40; // L: 435 } - if (var43 == 4) { - var44 = var38; - var38 = var39; - var39 = var44; - var40 = var4.readShortSmart() + var41; - var41 = var40; - this.indices1[var42] = var38; - this.indices2[var42] = var44; - this.indices3[var42] = var40; + if (var43 == 4) { // L: 437 + var44 = var38; // L: 438 + var38 = var39; // L: 439 + var39 = var44; // L: 440 + var40 = var4.readShortSmart() + var41; // L: 441 + var41 = var40; // L: 442 + this.indices1[var42] = var38; // L: 443 + this.indices2[var42] = var44; // L: 444 + this.indices3[var42] = var40; // L: 445 } } - var4.offset = var31; + var4.offset = var31; // L: 448 - for (var42 = 0; var42 < var11; ++var42) { - this.textureRenderTypes[var42] = 0; - this.texTriangleX[var42] = (short)var4.readUnsignedShort(); - this.texTriangleY[var42] = (short)var4.readUnsignedShort(); - this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); + for (var42 = 0; var42 < var11; ++var42) { // L: 449 + this.textureRenderTypes[var42] = 0; // L: 450 + this.texTriangleX[var42] = (short)var4.readUnsignedShort(); // L: 451 + this.texTriangleY[var42] = (short)var4.readUnsignedShort(); // L: 452 + this.texTriangleZ[var42] = (short)var4.readUnsignedShort(); // L: 453 } - if (this.textureCoords != null) { - boolean var46 = false; + if (this.textureCoords != null) { // L: 455 + boolean var46 = false; // L: 456 - for (var43 = 0; var43 < var10; ++var43) { - var44 = this.textureCoords[var43] & 255; - if (var44 != 255) { - if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { + for (var43 = 0; var43 < var10; ++var43) { // L: 457 + var44 = this.textureCoords[var43] & 255; // L: 458 + if (var44 != 255) { // L: 459 + if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) { // L: 460 this.textureCoords[var43] = -1; } else { - var46 = true; + var46 = true; // L: 461 } } } - if (!var46) { + if (!var46) { // L: 464 this.textureCoords = null; } } - if (!var3) { + if (!var3) { // L: 466 this.faceTextures = null; } - if (!var2) { + if (!var2) { // L: 467 this.faceRenderTypes = null; } - } + } // L: 468 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lek;I)I" + descriptor = "(Lee;I)I" ) - final int method2928(ModelData var1, int var2) { - int var3 = -1; - int var4 = var1.verticesX[var2]; - int var5 = var1.verticesY[var2]; - int var6 = var1.verticesZ[var2]; + final int method2904(ModelData var1, int var2) { + int var3 = -1; // L: 567 + int var4 = var1.verticesX[var2]; // L: 568 + int var5 = var1.verticesY[var2]; // L: 569 + int var6 = var1.verticesZ[var2]; // L: 570 - for (int var7 = 0; var7 < this.verticesCount; ++var7) { - if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { - var3 = var7; + for (int var7 = 0; var7 < this.verticesCount; ++var7) { // L: 571 + if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) { // L: 572 + var3 = var7; // L: 573 break; } } - if (var3 == -1) { - this.verticesX[this.verticesCount] = var4; - this.verticesY[this.verticesCount] = var5; - this.verticesZ[this.verticesCount] = var6; + if (var3 == -1) { // L: 577 + this.verticesX[this.verticesCount] = var4; // L: 578 + this.verticesY[this.verticesCount] = var5; // L: 579 + this.verticesZ[this.verticesCount] = var6; // L: 580 if (var1.vertexSkins != null) { - this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; + this.vertexSkins[this.verticesCount] = var1.vertexSkins[var2]; // L: 581 } - var3 = this.verticesCount++; + var3 = this.verticesCount++; // L: 582 } - return var3; + return var3; // L: 584 } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "()Lek;" + descriptor = "()Lee;" ) - public ModelData method2938() { - ModelData var1 = new ModelData(); - if (this.faceRenderTypes != null) { - var1.faceRenderTypes = new byte[this.faceCount]; + public ModelData method2945() { + ModelData var1 = new ModelData(); // L: 650 + if (this.faceRenderTypes != null) { // L: 651 + var1.faceRenderTypes = new byte[this.faceCount]; // L: 652 - for (int var2 = 0; var2 < this.faceCount; ++var2) { + for (int var2 = 0; var2 < this.faceCount; ++var2) { // L: 653 var1.faceRenderTypes[var2] = this.faceRenderTypes[var2]; } } - var1.verticesCount = this.verticesCount; - var1.faceCount = this.faceCount; - var1.textureTriangleCount = this.textureTriangleCount; - var1.verticesX = this.verticesX; - var1.verticesY = this.verticesY; - var1.verticesZ = this.verticesZ; - var1.indices1 = this.indices1; - var1.indices2 = this.indices2; - var1.indices3 = this.indices3; - var1.faceRenderPriorities = this.faceRenderPriorities; - var1.faceAlphas = this.faceAlphas; - var1.textureCoords = this.textureCoords; - var1.faceColors = this.faceColors; - var1.faceTextures = this.faceTextures; - var1.priority = this.priority; - var1.textureRenderTypes = this.textureRenderTypes; - var1.texTriangleX = this.texTriangleX; - var1.texTriangleY = this.texTriangleY; - var1.texTriangleZ = this.texTriangleZ; - var1.vertexSkins = this.vertexSkins; - var1.faceSkins = this.faceSkins; - var1.vertexLabels = this.vertexLabels; - var1.faceLabelsAlpha = this.faceLabelsAlpha; - var1.vertexNormals = this.vertexNormals; - var1.faceNormals = this.faceNormals; - var1.ambient = this.ambient; - var1.contrast = this.contrast; - return var1; + var1.verticesCount = this.verticesCount; // L: 655 + var1.faceCount = this.faceCount; // L: 656 + var1.textureTriangleCount = this.textureTriangleCount; // L: 657 + var1.verticesX = this.verticesX; // L: 658 + var1.verticesY = this.verticesY; // L: 659 + var1.verticesZ = this.verticesZ; // L: 660 + var1.indices1 = this.indices1; // L: 661 + var1.indices2 = this.indices2; // L: 662 + var1.indices3 = this.indices3; // L: 663 + var1.faceRenderPriorities = this.faceRenderPriorities; // L: 664 + var1.faceAlphas = this.faceAlphas; // L: 665 + var1.textureCoords = this.textureCoords; // L: 666 + var1.faceColors = this.faceColors; // L: 667 + var1.faceTextures = this.faceTextures; // L: 668 + var1.priority = this.priority; // L: 669 + var1.textureRenderTypes = this.textureRenderTypes; // L: 670 + var1.texTriangleX = this.texTriangleX; // L: 671 + var1.texTriangleY = this.texTriangleY; // L: 672 + var1.texTriangleZ = this.texTriangleZ; // L: 673 + var1.vertexSkins = this.vertexSkins; // L: 674 + var1.faceSkins = this.faceSkins; // L: 675 + var1.vertexLabels = this.vertexLabels; // L: 676 + var1.faceLabelsAlpha = this.faceLabelsAlpha; // L: 677 + var1.vertexNormals = this.vertexNormals; // L: 678 + var1.faceNormals = this.faceNormals; // L: 679 + var1.ambient = this.ambient; // L: 680 + var1.contrast = this.contrast; // L: 681 + return var1; // L: 682 } - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "([[IIIIZI)Lek;" + descriptor = "([[IIIIZI)Lee;" ) - public ModelData method2912(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { - this.calculateBounds(); - int var7 = var2 + this.field1578; - int var8 = var2 + this.field1609; - int var9 = var4 + this.field1613; - int var10 = var4 + this.field1601; - if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { - var7 >>= 7; - var8 = var8 + 127 >> 7; - var9 >>= 7; - var10 = var10 + 127 >> 7; - if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { + public ModelData method2883(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) { + this.calculateBounds(); // L: 686 + int var7 = var2 + this.field1601; // L: 687 + int var8 = var2 + this.field1603; // L: 688 + int var9 = var4 + this.field1589; // L: 689 + int var10 = var4 + this.field1604; // L: 690 + if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 691 + var7 >>= 7; // L: 692 + var8 = var8 + 127 >> 7; // L: 693 + var9 >>= 7; // L: 694 + var10 = var10 + 127 >> 7; // L: 695 + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { // L: 696 return this; } else { - ModelData var11 = new ModelData(); - var11.verticesCount = this.verticesCount; - var11.faceCount = this.faceCount; - var11.textureTriangleCount = this.textureTriangleCount; - var11.verticesX = this.verticesX; - var11.verticesZ = this.verticesZ; - var11.indices1 = this.indices1; - var11.indices2 = this.indices2; - var11.indices3 = this.indices3; - var11.faceRenderTypes = this.faceRenderTypes; - var11.faceRenderPriorities = this.faceRenderPriorities; - var11.faceAlphas = this.faceAlphas; - var11.textureCoords = this.textureCoords; - var11.faceColors = this.faceColors; - var11.faceTextures = this.faceTextures; - var11.priority = this.priority; - var11.textureRenderTypes = this.textureRenderTypes; - var11.texTriangleX = this.texTriangleX; - var11.texTriangleY = this.texTriangleY; - var11.texTriangleZ = this.texTriangleZ; - var11.vertexSkins = this.vertexSkins; - var11.faceSkins = this.faceSkins; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.ambient = this.ambient; - var11.contrast = this.contrast; - var11.verticesY = new int[var11.verticesCount]; + ModelData var11 = new ModelData(); // L: 699 + var11.verticesCount = this.verticesCount; // L: 700 + var11.faceCount = this.faceCount; // L: 701 + var11.textureTriangleCount = this.textureTriangleCount; // L: 702 + var11.verticesX = this.verticesX; // L: 703 + var11.verticesZ = this.verticesZ; // L: 704 + var11.indices1 = this.indices1; // L: 705 + var11.indices2 = this.indices2; // L: 706 + var11.indices3 = this.indices3; // L: 707 + var11.faceRenderTypes = this.faceRenderTypes; // L: 708 + var11.faceRenderPriorities = this.faceRenderPriorities; // L: 709 + var11.faceAlphas = this.faceAlphas; // L: 710 + var11.textureCoords = this.textureCoords; // L: 711 + var11.faceColors = this.faceColors; // L: 712 + var11.faceTextures = this.faceTextures; // L: 713 + var11.priority = this.priority; // L: 714 + var11.textureRenderTypes = this.textureRenderTypes; // L: 715 + var11.texTriangleX = this.texTriangleX; // L: 716 + var11.texTriangleY = this.texTriangleY; // L: 717 + var11.texTriangleZ = this.texTriangleZ; // L: 718 + var11.vertexSkins = this.vertexSkins; // L: 719 + var11.faceSkins = this.faceSkins; // L: 720 + var11.vertexLabels = this.vertexLabels; // L: 721 + var11.faceLabelsAlpha = this.faceLabelsAlpha; // L: 722 + var11.ambient = this.ambient; // L: 723 + var11.contrast = this.contrast; // L: 724 + var11.verticesY = new int[var11.verticesCount]; // L: 725 int var12; int var13; int var14; @@ -1093,601 +1093,601 @@ public class ModelData extends Entity { int var19; int var20; int var21; - if (var6 == 0) { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = var2 + this.verticesX[var12]; - var14 = var4 + this.verticesZ[var12]; - var15 = var13 & 127; - var16 = var14 & 127; - var17 = var13 >> 7; - var18 = var14 >> 7; - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; - var21 = var19 * (128 - var16) + var20 * var16 >> 7; - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + if (var6 == 0) { // L: 730 + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 731 + var13 = var2 + this.verticesX[var12]; // L: 732 + var14 = var4 + this.verticesZ[var12]; // L: 733 + var15 = var13 & 127; // L: 734 + var16 = var14 & 127; // L: 735 + var17 = var13 >> 7; // L: 736 + var18 = var14 >> 7; // L: 737 + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; // L: 738 + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; // L: 739 + var21 = var19 * (128 - var16) + var20 * var16 >> 7; // L: 740 + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; // L: 741 } } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = (-this.verticesY[var12] << 16) / super.height; - if (var13 < var6) { - var14 = var2 + this.verticesX[var12]; - var15 = var4 + this.verticesZ[var12]; - var16 = var14 & 127; - var17 = var15 & 127; - var18 = var14 >> 7; - var19 = var15 >> 7; - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; + for (var12 = 0; var12 < var11.verticesCount; ++var12) { // L: 745 + var13 = (-this.verticesY[var12] << 16) / super.height; // L: 746 + if (var13 < var6) { // L: 747 + var14 = var2 + this.verticesX[var12]; // L: 748 + var15 = var4 + this.verticesZ[var12]; // L: 749 + var16 = var14 & 127; // L: 750 + var17 = var15 & 127; // L: 751 + var18 = var14 >> 7; // L: 752 + var19 = var15 >> 7; // L: 753 + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; // L: 754 + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; // L: 755 + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; // L: 756 + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; // L: 757 } } } - var11.invalidate(); - return var11; + var11.invalidate(); // L: 761 + return var11; // L: 762 } } else { return this; } } - @ObfuscatedName("n") - void method2940() { + @ObfuscatedName("x") + void method2884() { int[] var1; int var2; int var10002; int var3; int var4; - if (this.vertexSkins != null) { - var1 = new int[256]; - var2 = 0; + if (this.vertexSkins != null) { // L: 766 + var1 = new int[256]; // L: 767 + var2 = 0; // L: 768 - for (var3 = 0; var3 < this.verticesCount; ++var3) { - var4 = this.vertexSkins[var3]; - var10002 = var1[var4]++; - if (var4 > var2) { + for (var3 = 0; var3 < this.verticesCount; ++var3) { // L: 769 + var4 = this.vertexSkins[var3]; // L: 770 + var10002 = var1[var4]++; // L: 771 + if (var4 > var2) { // L: 772 var2 = var4; } } - this.vertexLabels = new int[var2 + 1][]; + this.vertexLabels = new int[var2 + 1][]; // L: 774 - for (var3 = 0; var3 <= var2; ++var3) { - this.vertexLabels[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var3 = 0; var3 <= var2; ++var3) { // L: 775 + this.vertexLabels[var3] = new int[var1[var3]]; // L: 776 + var1[var3] = 0; // L: 777 } - for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { - var4 = this.vertexSkins[var3]; + for (var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) { // L: 779 781 + var4 = this.vertexSkins[var3]; // L: 780 } - this.vertexSkins = null; + this.vertexSkins = null; // L: 783 } - if (this.faceSkins != null) { - var1 = new int[256]; - var2 = 0; + if (this.faceSkins != null) { // L: 785 + var1 = new int[256]; // L: 786 + var2 = 0; // L: 787 - for (var3 = 0; var3 < this.faceCount; ++var3) { - var4 = this.faceSkins[var3]; - var10002 = var1[var4]++; - if (var4 > var2) { + for (var3 = 0; var3 < this.faceCount; ++var3) { // L: 788 + var4 = this.faceSkins[var3]; // L: 789 + var10002 = var1[var4]++; // L: 790 + if (var4 > var2) { // L: 791 var2 = var4; } } - this.faceLabelsAlpha = new int[var2 + 1][]; + this.faceLabelsAlpha = new int[var2 + 1][]; // L: 793 - for (var3 = 0; var3 <= var2; ++var3) { - this.faceLabelsAlpha[var3] = new int[var1[var3]]; - var1[var3] = 0; + for (var3 = 0; var3 <= var2; ++var3) { // L: 794 + this.faceLabelsAlpha[var3] = new int[var1[var3]]; // L: 795 + var1[var3] = 0; // L: 796 } - for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { - var4 = this.faceSkins[var3]; + for (var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) { // L: 798 800 + var4 = this.faceSkins[var3]; // L: 799 } - this.faceSkins = null; + this.faceSkins = null; // L: 802 } - } - - @ObfuscatedName("u") - public void method2914() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - this.verticesX[var1] = this.verticesZ[var1]; - this.verticesZ[var1] = -var2; - } - - this.invalidate(); - } - - @ObfuscatedName("z") - public void method2944() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - this.verticesX[var1] = -this.verticesX[var1]; - this.verticesZ[var1] = -this.verticesZ[var1]; - } - - this.invalidate(); - } + } // L: 804 @ObfuscatedName("w") - public void method2915() { - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesZ[var1]; - this.verticesZ[var1] = this.verticesX[var1]; - this.verticesX[var1] = -var2; + public void method2885() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 807 + int var2 = this.verticesX[var1]; // L: 808 + this.verticesX[var1] = this.verticesZ[var1]; // L: 809 + this.verticesZ[var1] = -var2; // L: 810 } - this.invalidate(); - } + this.invalidate(); // L: 812 + } // L: 813 - @ObfuscatedName("y") - public void method2968(int var1) { - int var2 = ModelData_sine[var1]; - int var3 = ModelData_cosine[var1]; - - for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; - this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; - this.verticesX[var4] = var5; + @ObfuscatedName("m") + public void method2886() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 816 + this.verticesX[var1] = -this.verticesX[var1]; // L: 817 + this.verticesZ[var1] = -this.verticesZ[var1]; // L: 818 } - this.invalidate(); - } + this.invalidate(); // L: 820 + } // L: 821 - @ObfuscatedName("c") + @ObfuscatedName("n") + public void method2881() { + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 824 + int var2 = this.verticesZ[var1]; // L: 825 + this.verticesZ[var1] = this.verticesX[var1]; // L: 826 + this.verticesX[var1] = -var2; // L: 827 + } + + this.invalidate(); // L: 829 + } // L: 830 + + @ObfuscatedName("d") + public void method2888(int var1) { + int var2 = ModelData_sine[var1]; // L: 833 + int var3 = ModelData_cosine[var1]; // L: 834 + + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 835 + int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16; // L: 836 + this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16; // L: 837 + this.verticesX[var4] = var5; // L: 838 + } + + this.invalidate(); // L: 840 + } // L: 841 + + @ObfuscatedName("h") @Export("changeOffset") public void changeOffset(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int[] var10000 = this.verticesX; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844 + int[] var10000 = this.verticesX; // L: 845 var10000[var4] += var1; - var10000 = this.verticesY; + var10000 = this.verticesY; // L: 846 var10000[var4] += var2; - var10000 = this.verticesZ; + var10000 = this.verticesZ; // L: 847 var10000[var4] += var3; } - this.invalidate(); - } + this.invalidate(); // L: 849 + } // L: 850 - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("recolor") public void recolor(short var1, short var2) { - for (int var3 = 0; var3 < this.faceCount; ++var3) { - if (this.faceColors[var3] == var1) { + for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 853 + if (this.faceColors[var3] == var1) { // L: 854 this.faceColors[var3] = var2; } } - } + } // L: 856 - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("retexture") public void retexture(short var1, short var2) { - if (this.faceTextures != null) { - for (int var3 = 0; var3 < this.faceCount; ++var3) { + if (this.faceTextures != null) { // L: 859 + for (int var3 = 0; var3 < this.faceCount; ++var3) { // L: 860 if (this.faceTextures[var3] == var1) { - this.faceTextures[var3] = var2; + this.faceTextures[var3] = var2; // L: 861 } } } - } + } // L: 863 - @ObfuscatedName("r") - public void method2919() { + @ObfuscatedName("c") + public void method2892() { int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { + for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866 this.verticesZ[var1] = -this.verticesZ[var1]; } - for (var1 = 0; var1 < this.faceCount; ++var1) { - int var2 = this.indices1[var1]; - this.indices1[var1] = this.indices3[var1]; - this.indices3[var1] = var2; + for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 867 + int var2 = this.indices1[var1]; // L: 868 + this.indices1[var1] = this.indices3[var1]; // L: 869 + this.indices3[var1] = var2; // L: 870 } - this.invalidate(); - } + this.invalidate(); // L: 872 + } // L: 873 - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("resize") public void resize(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.verticesCount; ++var4) { - this.verticesX[var4] = this.verticesX[var4] * var1 / 128; - this.verticesY[var4] = var2 * this.verticesY[var4] / 128; - this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; + for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876 + this.verticesX[var4] = this.verticesX[var4] * var1 / 128; // L: 877 + this.verticesY[var4] = var2 * this.verticesY[var4] / 128; // L: 878 + this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128; // L: 879 } - this.invalidate(); - } + this.invalidate(); // L: 881 + } // L: 882 - @ObfuscatedName("e") + @ObfuscatedName("r") @Export("calculateVertexNormals") public void calculateVertexNormals() { - if (this.vertexNormals == null) { - this.vertexNormals = new VertexNormal[this.verticesCount]; + if (this.vertexNormals == null) { // L: 885 + this.vertexNormals = new VertexNormal[this.verticesCount]; // L: 886 int var1; - for (var1 = 0; var1 < this.verticesCount; ++var1) { + for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 887 this.vertexNormals[var1] = new VertexNormal(); } - for (var1 = 0; var1 < this.faceCount; ++var1) { - int var2 = this.indices1[var1]; - int var3 = this.indices2[var1]; - int var4 = this.indices3[var1]; - int var5 = this.verticesX[var3] - this.verticesX[var2]; - int var6 = this.verticesY[var3] - this.verticesY[var2]; - int var7 = this.verticesZ[var3] - this.verticesZ[var2]; - int var8 = this.verticesX[var4] - this.verticesX[var2]; - int var9 = this.verticesY[var4] - this.verticesY[var2]; - int var10 = this.verticesZ[var4] - this.verticesZ[var2]; - int var11 = var6 * var10 - var9 * var7; - int var12 = var7 * var8 - var10 * var5; + for (var1 = 0; var1 < this.faceCount; ++var1) { // L: 888 + int var2 = this.indices1[var1]; // L: 889 + int var3 = this.indices2[var1]; // L: 890 + int var4 = this.indices3[var1]; // L: 891 + int var5 = this.verticesX[var3] - this.verticesX[var2]; // L: 892 + int var6 = this.verticesY[var3] - this.verticesY[var2]; // L: 893 + int var7 = this.verticesZ[var3] - this.verticesZ[var2]; // L: 894 + int var8 = this.verticesX[var4] - this.verticesX[var2]; // L: 895 + int var9 = this.verticesY[var4] - this.verticesY[var2]; // L: 896 + int var10 = this.verticesZ[var4] - this.verticesZ[var2]; // L: 897 + int var11 = var6 * var10 - var9 * var7; // L: 898 + int var12 = var7 * var8 - var10 * var5; // L: 899 int var13; - for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { - var11 >>= 1; - var12 >>= 1; + for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) { // L: 900 901 904 + var11 >>= 1; // L: 902 + var12 >>= 1; // L: 903 } - int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); - if (var14 <= 0) { + int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13)); // L: 906 + if (var14 <= 0) { // L: 907 var14 = 1; } - var11 = var11 * 256 / var14; - var12 = var12 * 256 / var14; - var13 = var13 * 256 / var14; + var11 = var11 * 256 / var14; // L: 908 + var12 = var12 * 256 / var14; // L: 909 + var13 = var13 * 256 / var14; // L: 910 byte var15; - if (this.faceRenderTypes == null) { + if (this.faceRenderTypes == null) { // L: 912 var15 = 0; } else { - var15 = this.faceRenderTypes[var1]; + var15 = this.faceRenderTypes[var1]; // L: 913 } - if (var15 == 0) { - VertexNormal var16 = this.vertexNormals[var2]; - var16.x += var11; - var16.y += var12; - var16.z += var13; - ++var16.magnitude; - var16 = this.vertexNormals[var3]; - var16.x += var11; - var16.y += var12; - var16.z += var13; - ++var16.magnitude; - var16 = this.vertexNormals[var4]; - var16.x += var11; - var16.y += var12; - var16.z += var13; - ++var16.magnitude; - } else if (var15 == 1) { - if (this.faceNormals == null) { + if (var15 == 0) { // L: 914 + VertexNormal var16 = this.vertexNormals[var2]; // L: 916 + var16.x += var11; // L: 917 + var16.y += var12; // L: 918 + var16.z += var13; // L: 919 + ++var16.magnitude; // L: 920 + var16 = this.vertexNormals[var3]; // L: 921 + var16.x += var11; // L: 922 + var16.y += var12; // L: 923 + var16.z += var13; // L: 924 + ++var16.magnitude; // L: 925 + var16 = this.vertexNormals[var4]; // L: 926 + var16.x += var11; // L: 927 + var16.y += var12; // L: 928 + var16.z += var13; // L: 929 + ++var16.magnitude; // L: 930 + } else if (var15 == 1) { // L: 932 + if (this.faceNormals == null) { // L: 933 this.faceNormals = new FaceNormal[this.faceCount]; } - FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); - var17.x = var11; - var17.y = var12; - var17.z = var13; + FaceNormal var17 = this.faceNormals[var1] = new FaceNormal(); // L: 934 + var17.x = var11; // L: 935 + var17.y = var12; // L: 936 + var17.z = var13; // L: 937 } } } - } + } // L: 940 - @ObfuscatedName("l") + @ObfuscatedName("u") @Export("invalidate") void invalidate() { - this.vertexNormals = null; - this.field1603 = null; - this.faceNormals = null; - this.isBoundsCalculated = false; - } + this.vertexNormals = null; // L: 943 + this.field1599 = null; // L: 944 + this.faceNormals = null; // L: 945 + this.isBoundsCalculated = false; // L: 946 + } // L: 947 - @ObfuscatedName("t") + @ObfuscatedName("p") @Export("calculateBounds") void calculateBounds() { - if (!this.isBoundsCalculated) { - super.height = 0; - this.field1582 = 0; - this.field1578 = 999999; - this.field1609 = -999999; - this.field1601 = -99999; - this.field1613 = 99999; + if (!this.isBoundsCalculated) { // L: 950 + super.height = 0; // L: 951 + this.field1598 = 0; // L: 952 + this.field1601 = 999999; // L: 953 + this.field1603 = -999999; // L: 954 + this.field1604 = -99999; // L: 955 + this.field1589 = 99999; // L: 956 - for (int var1 = 0; var1 < this.verticesCount; ++var1) { - int var2 = this.verticesX[var1]; - int var3 = this.verticesY[var1]; - int var4 = this.verticesZ[var1]; - if (var2 < this.field1578) { - this.field1578 = var2; + for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 957 + int var2 = this.verticesX[var1]; // L: 958 + int var3 = this.verticesY[var1]; // L: 959 + int var4 = this.verticesZ[var1]; // L: 960 + if (var2 < this.field1601) { // L: 961 + this.field1601 = var2; } - if (var2 > this.field1609) { - this.field1609 = var2; + if (var2 > this.field1603) { // L: 962 + this.field1603 = var2; } - if (var4 < this.field1613) { - this.field1613 = var4; + if (var4 < this.field1589) { // L: 963 + this.field1589 = var4; } - if (var4 > this.field1601) { - this.field1601 = var4; + if (var4 > this.field1604) { // L: 964 + this.field1604 = var4; } - if (-var3 > super.height) { + if (-var3 > super.height) { // L: 965 super.height = -var3; } - if (var3 > this.field1582) { - this.field1582 = var3; + if (var3 > this.field1598) { // L: 966 + this.field1598 = var3; } } - this.isBoundsCalculated = true; + this.isBoundsCalculated = true; // L: 968 } - } + } // L: 969 - @ObfuscatedName("ah") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIIII)Lef;" + descriptor = "(IIIII)Ler;" ) @Export("toModel") public final Model toModel(int var1, int var2, int var3, int var4, int var5) { - this.calculateVertexNormals(); - int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); - int var7 = var6 * var2 >> 8; - Model var8 = new Model(); - var8.faceColors1 = new int[this.faceCount]; - var8.faceColors2 = new int[this.faceCount]; - var8.faceColors3 = new int[this.faceCount]; - if (this.textureTriangleCount > 0 && this.textureCoords != null) { - int[] var9 = new int[this.textureTriangleCount]; + this.calculateVertexNormals(); // L: 1028 + int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4)); // L: 1029 + int var7 = var6 * var2 >> 8; // L: 1030 + Model var8 = new Model(); // L: 1031 + var8.faceColors1 = new int[this.faceCount]; // L: 1032 + var8.faceColors2 = new int[this.faceCount]; // L: 1033 + var8.faceColors3 = new int[this.faceCount]; // L: 1034 + if (this.textureTriangleCount > 0 && this.textureCoords != null) { // L: 1035 + int[] var9 = new int[this.textureTriangleCount]; // L: 1036 int var10; - for (var10 = 0; var10 < this.faceCount; ++var10) { - if (this.textureCoords[var10] != -1) { + for (var10 = 0; var10 < this.faceCount; ++var10) { // L: 1037 + if (this.textureCoords[var10] != -1) { // L: 1038 ++var9[this.textureCoords[var10] & 255]; } } - var8.field1730 = 0; + var8.field1714 = 0; // L: 1040 - for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { - if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { - ++var8.field1730; + for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041 + if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042 + ++var8.field1714; } } - var8.field1717 = new int[var8.field1730]; - var8.field1718 = new int[var8.field1730]; - var8.field1719 = new int[var8.field1730]; - var10 = 0; + var8.field1715 = new int[var8.field1714]; // L: 1044 + var8.field1716 = new int[var8.field1714]; // L: 1045 + var8.field1717 = new int[var8.field1714]; // L: 1046 + var10 = 0; // L: 1047 int var11; - for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { - if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { - var8.field1717[var10] = this.texTriangleX[var11] & '\uffff'; - var8.field1718[var10] = this.texTriangleY[var11] & '\uffff'; - var8.field1719[var10] = this.texTriangleZ[var11] & '\uffff'; - var9[var11] = var10++; + for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048 + if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049 + var8.field1715[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050 + var8.field1716[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051 + var8.field1717[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052 + var9[var11] = var10++; // L: 1053 } else { - var9[var11] = -1; + var9[var11] = -1; // L: 1055 } } - var8.field1731 = new byte[this.faceCount]; + var8.field1757 = new byte[this.faceCount]; // L: 1057 - for (var11 = 0; var11 < this.faceCount; ++var11) { - if (this.textureCoords[var11] != -1) { - var8.field1731[var11] = (byte)var9[this.textureCoords[var11] & 255]; + for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058 + if (this.textureCoords[var11] != -1) { // L: 1059 + var8.field1757[var11] = (byte)var9[this.textureCoords[var11] & 255]; } else { - var8.field1731[var11] = -1; + var8.field1757[var11] = -1; // L: 1060 } } } - for (int var16 = 0; var16 < this.faceCount; ++var16) { + for (int var16 = 0; var16 < this.faceCount; ++var16) { // L: 1063 byte var17; - if (this.faceRenderTypes == null) { + if (this.faceRenderTypes == null) { // L: 1065 var17 = 0; } else { - var17 = this.faceRenderTypes[var16]; + var17 = this.faceRenderTypes[var16]; // L: 1066 } byte var18; - if (this.faceAlphas == null) { + if (this.faceAlphas == null) { // L: 1068 var18 = 0; } else { - var18 = this.faceAlphas[var16]; + var18 = this.faceAlphas[var16]; // L: 1069 } short var12; - if (this.faceTextures == null) { + if (this.faceTextures == null) { // L: 1071 var12 = -1; } else { - var12 = this.faceTextures[var16]; + var12 = this.faceTextures[var16]; // L: 1072 } - if (var18 == -2) { + if (var18 == -2) { // L: 1073 var17 = 3; } - if (var18 == -1) { + if (var18 == -1) { // L: 1074 var17 = 2; } VertexNormal var13; int var14; FaceNormal var19; - if (var12 == -1) { - if (var17 != 0) { - if (var17 == 1) { - var19 = this.faceNormals[var16]; - var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method2911(this.faceColors[var16] & '\uffff', var14); - var8.faceColors3[var16] = -1; - } else if (var17 == 3) { - var8.faceColors1[var16] = 128; - var8.faceColors3[var16] = -1; + if (var12 == -1) { // L: 1075 + if (var17 != 0) { // L: 1076 + if (var17 == 1) { // L: 1093 + var19 = this.faceNormals[var16]; // L: 1094 + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1095 + var8.faceColors1[var16] = method2956(this.faceColors[var16] & '\uffff', var14); // L: 1096 + var8.faceColors3[var16] = -1; // L: 1097 + } else if (var17 == 3) { // L: 1099 + var8.faceColors1[var16] = 128; // L: 1100 + var8.faceColors3[var16] = -1; // L: 1101 } else { - var8.faceColors3[var16] = -2; + var8.faceColors3[var16] = -2; // L: 1104 } } else { - int var15 = this.faceColors[var16] & '\uffff'; - if (this.field1603 != null && this.field1603[this.indices1[var16]] != null) { - var13 = this.field1603[this.indices1[var16]]; + int var15 = this.faceColors[var16] & '\uffff'; // L: 1079 + if (this.field1599 != null && this.field1599[this.indices1[var16]] != null) { // L: 1080 + var13 = this.field1599[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; + var13 = this.vertexNormals[this.indices1[var16]]; // L: 1081 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method2911(var15, var14); - if (this.field1603 != null && this.field1603[this.indices2[var16]] != null) { - var13 = this.field1603[this.indices2[var16]]; + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082 + var8.faceColors1[var16] = method2956(var15, var14); // L: 1083 + if (this.field1599 != null && this.field1599[this.indices2[var16]] != null) { // L: 1084 + var13 = this.field1599[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; + var13 = this.vertexNormals[this.indices2[var16]]; // L: 1085 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method2911(var15, var14); - if (this.field1603 != null && this.field1603[this.indices3[var16]] != null) { - var13 = this.field1603[this.indices3[var16]]; + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086 + var8.faceColors2[var16] = method2956(var15, var14); // L: 1087 + if (this.field1599 != null && this.field1599[this.indices3[var16]] != null) { // L: 1088 + var13 = this.field1599[this.indices3[var16]]; } else { - var13 = this.vertexNormals[this.indices3[var16]]; + var13 = this.vertexNormals[this.indices3[var16]]; // L: 1089 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method2911(var15, var14); + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090 + var8.faceColors3[var16] = method2956(var15, var14); // L: 1091 } - } else if (var17 != 0) { - if (var17 == 1) { - var19 = this.faceNormals[var16]; - var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; - var8.faceColors1[var16] = method2927(var14); - var8.faceColors3[var16] = -1; + } else if (var17 != 0) { // L: 1108 + if (var17 == 1) { // L: 1124 + var19 = this.faceNormals[var16]; // L: 1125 + var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1126 + var8.faceColors1[var16] = method2900(var14); // L: 1127 + var8.faceColors3[var16] = -1; // L: 1128 } else { - var8.faceColors3[var16] = -2; + var8.faceColors3[var16] = -2; // L: 1131 } } else { - if (this.field1603 != null && this.field1603[this.indices1[var16]] != null) { - var13 = this.field1603[this.indices1[var16]]; + if (this.field1599 != null && this.field1599[this.indices1[var16]] != null) { // L: 1111 + var13 = this.field1599[this.indices1[var16]]; } else { - var13 = this.vertexNormals[this.indices1[var16]]; + var13 = this.vertexNormals[this.indices1[var16]]; // L: 1112 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors1[var16] = method2927(var14); - if (this.field1603 != null && this.field1603[this.indices2[var16]] != null) { - var13 = this.field1603[this.indices2[var16]]; + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113 + var8.faceColors1[var16] = method2900(var14); // L: 1114 + if (this.field1599 != null && this.field1599[this.indices2[var16]] != null) { // L: 1115 + var13 = this.field1599[this.indices2[var16]]; } else { - var13 = this.vertexNormals[this.indices2[var16]]; + var13 = this.vertexNormals[this.indices2[var16]]; // L: 1116 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors2[var16] = method2927(var14); - if (this.field1603 != null && this.field1603[this.indices3[var16]] != null) { - var13 = this.field1603[this.indices3[var16]]; + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117 + var8.faceColors2[var16] = method2900(var14); // L: 1118 + if (this.field1599 != null && this.field1599[this.indices3[var16]] != null) { // L: 1119 + var13 = this.field1599[this.indices3[var16]]; } else { - var13 = this.vertexNormals[this.indices3[var16]]; + var13 = this.vertexNormals[this.indices3[var16]]; // L: 1120 } - var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; - var8.faceColors3[var16] = method2927(var14); + var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121 + var8.faceColors3[var16] = method2900(var14); // L: 1122 } } - this.method2940(); - var8.verticesCount = this.verticesCount; - var8.verticesX = this.verticesX; - var8.verticesY = this.verticesY; - var8.verticesZ = this.verticesZ; - var8.indicesCount = this.faceCount; - var8.indices1 = this.indices1; - var8.indices2 = this.indices2; - var8.indices3 = this.indices3; - var8.faceRenderPriorities = this.faceRenderPriorities; - var8.faceAlphas = this.faceAlphas; - var8.field1715 = this.priority; - var8.vertexLabels = this.vertexLabels; - var8.faceLabelsAlpha = this.faceLabelsAlpha; - var8.faceTextures = this.faceTextures; - return var8; + this.method2884(); // L: 1135 + var8.verticesCount = this.verticesCount; // L: 1136 + var8.verticesX = this.verticesX; // L: 1137 + var8.verticesY = this.verticesY; // L: 1138 + var8.verticesZ = this.verticesZ; // L: 1139 + var8.indicesCount = this.faceCount; // L: 1140 + var8.indices1 = this.indices1; // L: 1141 + var8.indices2 = this.indices2; // L: 1142 + var8.indices3 = this.indices3; // L: 1143 + var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144 + var8.faceAlphas = this.faceAlphas; // L: 1145 + var8.field1720 = this.priority; // L: 1146 + var8.vertexLabels = this.vertexLabels; // L: 1147 + var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1148 + var8.faceTextures = this.faceTextures; // L: 1149 + return var8; // L: 1150 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lic;II)Lek;" + descriptor = "(Lic;II)Lee;" ) @Export("ModelData_get") public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new ModelData(var3); + byte[] var3 = var0.takeFile(var1, var2); // L: 53 + return var3 == null ? null : new ModelData(var3); // L: 54 } - @ObfuscatedName("x") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Lek;Lek;IIIZ)V" + descriptor = "(Lee;Lee;IIIZ)V" ) - static void method2924(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { - var0.calculateBounds(); - var0.calculateVertexNormals(); - var1.calculateBounds(); - var1.calculateVertexNormals(); - ++field1614; - int var6 = 0; - int[] var7 = var1.verticesX; - int var8 = var1.verticesCount; + static void method2935(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) { + var0.calculateBounds(); // L: 972 + var0.calculateVertexNormals(); // L: 973 + var1.calculateBounds(); // L: 974 + var1.calculateVertexNormals(); // L: 975 + ++field1605; // L: 976 + int var6 = 0; // L: 977 + int[] var7 = var1.verticesX; // L: 978 + int var8 = var1.verticesCount; // L: 979 int var9; - for (var9 = 0; var9 < var0.verticesCount; ++var9) { - VertexNormal var10 = var0.vertexNormals[var9]; - if (var10.magnitude != 0) { - int var11 = var0.verticesY[var9] - var3; - if (var11 <= var1.field1582) { - int var12 = var0.verticesX[var9] - var2; - if (var12 >= var1.field1578 && var12 <= var1.field1609) { - int var13 = var0.verticesZ[var9] - var4; - if (var13 >= var1.field1613 && var13 <= var1.field1601) { - for (int var14 = 0; var14 < var8; ++var14) { - VertexNormal var15 = var1.vertexNormals[var14]; - if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { - if (var0.field1603 == null) { - var0.field1603 = new VertexNormal[var0.verticesCount]; + for (var9 = 0; var9 < var0.verticesCount; ++var9) { // L: 980 + VertexNormal var10 = var0.vertexNormals[var9]; // L: 981 + if (var10.magnitude != 0) { // L: 982 + int var11 = var0.verticesY[var9] - var3; // L: 983 + if (var11 <= var1.field1598) { // L: 984 + int var12 = var0.verticesX[var9] - var2; // L: 985 + if (var12 >= var1.field1601 && var12 <= var1.field1603) { // L: 986 + int var13 = var0.verticesZ[var9] - var4; // L: 987 + if (var13 >= var1.field1589 && var13 <= var1.field1604) { // L: 988 + for (int var14 = 0; var14 < var8; ++var14) { // L: 989 + VertexNormal var15 = var1.vertexNormals[var14]; // L: 990 + if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 991 + if (var0.field1599 == null) { // L: 992 + var0.field1599 = new VertexNormal[var0.verticesCount]; } - if (var1.field1603 == null) { - var1.field1603 = new VertexNormal[var8]; + if (var1.field1599 == null) { // L: 993 + var1.field1599 = new VertexNormal[var8]; } - VertexNormal var16 = var0.field1603[var9]; - if (var16 == null) { - var16 = var0.field1603[var9] = new VertexNormal(var10); + VertexNormal var16 = var0.field1599[var9]; // L: 994 + if (var16 == null) { // L: 995 + var16 = var0.field1599[var9] = new VertexNormal(var10); } - VertexNormal var17 = var1.field1603[var14]; + VertexNormal var17 = var1.field1599[var14]; // L: 996 if (var17 == null) { - var17 = var1.field1603[var14] = new VertexNormal(var15); + var17 = var1.field1599[var14] = new VertexNormal(var15); // L: 997 } - var16.x += var15.x; - var16.y += var15.y; - var16.z += var15.z; - var16.magnitude += var15.magnitude; - var17.x += var10.x; - var17.y += var10.y; - var17.z += var10.z; - var17.magnitude += var10.magnitude; - ++var6; - field1610[var9] = field1614; - field1597[var14] = field1614; + var16.x += var15.x; // L: 998 + var16.y += var15.y; // L: 999 + var16.z += var15.z; // L: 1000 + var16.magnitude += var15.magnitude; // L: 1001 + var17.x += var10.x; // L: 1002 + var17.y += var10.y; // L: 1003 + var17.z += var10.z; // L: 1004 + var17.magnitude += var10.magnitude; // L: 1005 + ++var6; // L: 1006 + field1606[var9] = field1605; // L: 1007 + field1602[var14] = field1605; // L: 1008 } } } @@ -1696,50 +1696,50 @@ public class ModelData extends Entity { } } - if (var6 >= 3 && var5) { - for (var9 = 0; var9 < var0.faceCount; ++var9) { - if (field1610[var0.indices1[var9]] == field1614 && field1610[var0.indices2[var9]] == field1614 && field1610[var0.indices3[var9]] == field1614) { - if (var0.faceRenderTypes == null) { + if (var6 >= 3 && var5) { // L: 1012 + for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013 + if (field1606[var0.indices1[var9]] == field1605 && field1606[var0.indices2[var9]] == field1605 && field1606[var0.indices3[var9]] == field1605) { // L: 1014 + if (var0.faceRenderTypes == null) { // L: 1015 var0.faceRenderTypes = new byte[var0.faceCount]; } - var0.faceRenderTypes[var9] = 2; + var0.faceRenderTypes[var9] = 2; // L: 1016 } } - for (var9 = 0; var9 < var1.faceCount; ++var9) { - if (field1614 == field1597[var1.indices1[var9]] && field1614 == field1597[var1.indices2[var9]] && field1614 == field1597[var1.indices3[var9]]) { - if (var1.faceRenderTypes == null) { + for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019 + if (field1605 == field1602[var1.indices1[var9]] && field1605 == field1602[var1.indices2[var9]] && field1605 == field1602[var1.indices3[var9]]) { // L: 1020 + if (var1.faceRenderTypes == null) { // L: 1021 var1.faceRenderTypes = new byte[var1.faceCount]; } - var1.faceRenderTypes[var9] = 2; + var1.faceRenderTypes[var9] = 2; // L: 1022 } } } - } + } // L: 1025 - @ObfuscatedName("ai") - static final int method2911(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { + @ObfuscatedName("e") + static final int method2956(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1154 + if (var1 < 2) { // L: 1155 var1 = 2; - } else if (var1 > 126) { + } else if (var1 > 126) { // L: 1156 var1 = 126; } - return (var0 & 65408) + var1; + return (var0 & 65408) + var1; // L: 1157 } - @ObfuscatedName("ao") - static final int method2927(int var0) { - if (var0 < 2) { + @ObfuscatedName("ab") + static final int method2900(int var0) { + if (var0 < 2) { // L: 1161 var0 = 2; } else if (var0 > 126) { - var0 = 126; + var0 = 126; // L: 1162 } - return var0; + return var0; // L: 1163 } } diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index b6c102dd02..4f72b4b2af 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -1,40 +1,71 @@ +import java.io.IOException; +import java.net.Socket; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("en") +@ObfuscatedName("ej") @Implements("ModelData0") public class ModelData0 { - ModelData0() { - } - - @ObfuscatedName("q") + @ObfuscatedName("sl") @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "-706706502" + descriptor = "Lid;" ) - static char method3374(char var0) { - if (var0 == 198) { - return 'E'; - } else if (var0 == 230) { - return 'e'; - } else if (var0 == 223) { - return 's'; - } else if (var0 == 338) { - return 'E'; + public static class247 field1901; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + @Export("soundEffectsArchive") + static AbstractArchive soundEffectsArchive; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + @Export("titlebuttonSprite") + static IndexedSprite titlebuttonSprite; + @ObfuscatedName("au") + static String field1904; + + ModelData0() { + } // L: 4 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Lct;Lct;IZIZB)I", + garbageValue = "73" + ) + static int method3376(World var0, World var1, int var2, boolean var3, int var4, boolean var5) { + int var6 = class2.compareWorlds(var0, var1, var2, var3); // L: 199 + if (var6 != 0) { // L: 200 + return var3 ? -var6 : var6; // L: 201 + } else if (var4 == -1) { // L: 204 + return 0; } else { - return (char)(var0 == 339 ? 'e' : '\u0000'); + int var7 = class2.compareWorlds(var0, var1, var4, var5); // L: 205 + return var5 ? -var7 : var7; // L: 206 } } - @ObfuscatedName("ii") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1532544056" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1145056768" ) - @Export("shouldPrioritizeDrop") - static boolean shouldPrioritizeDrop() { - return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; + static final void method3377(String var0) { + StringBuilder var10000 = (new StringBuilder()).append(var0); + Object var10001 = null; + String var1 = var10000.append(" is already on your friend list").toString(); // L: 112 + WorldMapRectangle.addGameMessage(30, "", var1); // L: 114 + } // L: 116 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(Ljava/net/Socket;IIB)Lln;", + garbageValue = "14" + ) + public static AbstractSocket method3375(Socket var0, int var1, int var2) throws IOException { + return new BufferedNetSocket(var0, var1, var2); // L: 10 } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 65485a4bca..6d2b74b6f9 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -3,138 +3,148 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; +import java.awt.image.BufferedImage; +import java.awt.image.PixelGrabber; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import javax.imageio.ImageIO; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bc") +@ObfuscatedName("be") @Implements("MouseHandler") public class MouseHandler implements MouseListener, MouseMotionListener, FocusListener { - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lbc;" - ) - @Export("MouseHandler_instance") - public static MouseHandler MouseHandler_instance; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -344511405 - ) - @Export("MouseHandler_idleCycles") - public static volatile int MouseHandler_idleCycles; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 1045483843 - ) - @Export("MouseHandler_currentButtonVolatile") - public static volatile int MouseHandler_currentButtonVolatile; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 238880943 - ) - @Export("MouseHandler_xVolatile") - public static volatile int MouseHandler_xVolatile; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1843810125 - ) - @Export("MouseHandler_yVolatile") - public static volatile int MouseHandler_yVolatile; - @ObfuscatedName("a") - @ObfuscatedGetter( - longValue = 6776371404405886705L - ) - @Export("MouseHandler_lastMovedVolatile") - public static volatile long MouseHandler_lastMovedVolatile; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 793567275 - ) - @Export("MouseHandler_currentButton") - public static int MouseHandler_currentButton; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = -493092611 + intValue = 551932135 ) @Export("MouseHandler_x") public static int MouseHandler_x; - @ObfuscatedName("y") - @ObfuscatedGetter( - longValue = 8491441905862716493L + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lbe;" ) - @Export("MouseHandler_millis") - public static long MouseHandler_millis; - @ObfuscatedName("c") + @Export("MouseHandler_instance") + static MouseHandler MouseHandler_instance; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1383373793 + intValue = -1641634033 + ) + @Export("MouseHandler_idleCycles") + public static volatile int MouseHandler_idleCycles; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1212010463 ) @Export("MouseHandler_y") public static int MouseHandler_y; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 569317801 + ) + @Export("MouseHandler_currentButtonVolatile") + static volatile int MouseHandler_currentButtonVolatile; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 476051061 + ) + @Export("MouseHandler_xVolatile") + static volatile int MouseHandler_xVolatile; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1924891607 + ) + @Export("MouseHandler_yVolatile") + static volatile int MouseHandler_yVolatile; + @ObfuscatedName("n") + @ObfuscatedGetter( + longValue = -5989118801596156891L + ) + @Export("MouseHandler_lastMovedVolatile") + static volatile long MouseHandler_lastMovedVolatile; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1364176147 + ) + @Export("MouseHandler_currentButton") + public static int MouseHandler_currentButton; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1244221461 + longValue = 1548820219885674609L + ) + @Export("MouseHandler_millis") + public static long MouseHandler_millis; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1745887067 ) @Export("MouseHandler_lastButtonVolatile") - public static volatile int MouseHandler_lastButtonVolatile; - @ObfuscatedName("k") + static volatile int MouseHandler_lastButtonVolatile; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1667850499 + intValue = 2031476779 ) @Export("MouseHandler_lastPressedXVolatile") - public static volatile int MouseHandler_lastPressedXVolatile; - @ObfuscatedName("r") + static volatile int MouseHandler_lastPressedXVolatile; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -356343703 + intValue = -604562201 ) @Export("MouseHandler_lastPressedYVolatile") - public static volatile int MouseHandler_lastPressedYVolatile; - @ObfuscatedName("s") + static volatile int MouseHandler_lastPressedYVolatile; + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = 2783715713141770813L + longValue = -1684843054653501119L ) @Export("MouseHandler_lastPressedTimeMillisVolatile") - public static volatile long MouseHandler_lastPressedTimeMillisVolatile; - @ObfuscatedName("v") + static volatile long MouseHandler_lastPressedTimeMillisVolatile; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1358279153 + intValue = 376699801 ) @Export("MouseHandler_lastButton") public static int MouseHandler_lastButton; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1481741683 + intValue = 1229832903 ) @Export("MouseHandler_lastPressedX") public static int MouseHandler_lastPressedX; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1779789351 + intValue = -434332357 ) @Export("MouseHandler_lastPressedY") public static int MouseHandler_lastPressedY; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = -1326951704781204379L + longValue = -2055163658116269707L ) @Export("MouseHandler_lastPressedTimeMillis") public static long MouseHandler_lastPressedTimeMillis; - @ObfuscatedName("hg") - @ObfuscatedGetter( - intValue = 127786367 + @ObfuscatedName("fg") + @ObfuscatedSignature( + descriptor = "Lln;" ) - @Export("cameraX") - static int cameraX; + static AbstractSocket field508; + @ObfuscatedName("ij") + @ObfuscatedGetter( + intValue = 1280773695 + ) + @Export("oculusOrbFocalPointY") + static int oculusOrbFocalPointY; static { - MouseHandler_instance = new MouseHandler(); - MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; - MouseHandler_xVolatile = -1; - MouseHandler_yVolatile = -1; + MouseHandler_instance = new MouseHandler(); // L: 15 + MouseHandler_idleCycles = 0; // L: 16 + MouseHandler_currentButtonVolatile = 0; // L: 17 + MouseHandler_xVolatile = -1; // L: 18 + MouseHandler_yVolatile = -1; // L: 19 MouseHandler_lastMovedVolatile = -1L; - MouseHandler_currentButton = 0; + MouseHandler_currentButton = 0; // L: 21 MouseHandler_x = 0; MouseHandler_y = 0; MouseHandler_millis = 0L; @@ -142,131 +152,468 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi MouseHandler_lastPressedXVolatile = 0; MouseHandler_lastPressedYVolatile = 0; MouseHandler_lastPressedTimeMillisVolatile = 0L; - MouseHandler_lastButton = 0; + MouseHandler_lastButton = 0; // L: 29 MouseHandler_lastPressedX = 0; MouseHandler_lastPressedY = 0; MouseHandler_lastPressedTimeMillis = 0L; } MouseHandler() { - } + } // L: 34 - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/awt/event/MouseEvent;I)I", - garbageValue = "-750750909" + descriptor = "(Ljava/awt/event/MouseEvent;B)I", + garbageValue = "-11" ) @Export("getButton") final int getButton(MouseEvent var1) { - int var2 = var1.getButton(); - if (!var1.isAltDown() && var2 != 2) { - return !var1.isMetaDown() && var2 != 3 ? 1 : 2; + int var2 = var1.getButton(); // L: 72 + if (!var1.isAltDown() && var2 != 2) { // L: 73 + return !var1.isMetaDown() && var2 != 3 ? 1 : 2; // L: 74 75 } else { return 4; } } public final synchronized void mouseMoved(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_xVolatile = var1.getX(); - MouseHandler_yVolatile = var1.getY(); - MouseHandler_lastMovedVolatile = var1.getWhen(); + if (MouseHandler_instance != null) { // L: 120 + MouseHandler_idleCycles = 0; // L: 121 + MouseHandler_xVolatile = var1.getX(); // L: 122 + MouseHandler_yVolatile = var1.getY(); // L: 123 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 124 } - } - - public final synchronized void focusLost(FocusEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_currentButtonVolatile = 0; - } - - } - - public final synchronized void mouseExited(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_xVolatile = -1; - MouseHandler_yVolatile = -1; - MouseHandler_lastMovedVolatile = var1.getWhen(); - } - - } - - public final synchronized void mouseReleased(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_currentButtonVolatile = 0; - } - - if (var1.isPopupTrigger()) { - var1.consume(); - } - - } + } // L: 126 public final void mouseClicked(MouseEvent var1) { - if (var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { // L: 99 var1.consume(); } - } + } // L: 100 + + public final synchronized void mouseEntered(MouseEvent var1) { + this.mouseMoved(var1); // L: 103 + } // L: 104 + + public final synchronized void mouseExited(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 107 + MouseHandler_idleCycles = 0; // L: 108 + MouseHandler_xVolatile = -1; // L: 109 + MouseHandler_yVolatile = -1; // L: 110 + MouseHandler_lastMovedVolatile = var1.getWhen(); // L: 111 + } + + } // L: 113 + + public final synchronized void mouseDragged(MouseEvent var1) { + this.mouseMoved(var1); // L: 116 + } // L: 117 + + public final void focusGained(FocusEvent var1) { + } // L: 128 + + public final synchronized void focusLost(FocusEvent var1) { + if (MouseHandler_instance != null) { // L: 131 + MouseHandler_currentButtonVolatile = 0; + } + + } // L: 132 public final synchronized void mousePressed(MouseEvent var1) { - if (MouseHandler_instance != null) { - MouseHandler_idleCycles = 0; - MouseHandler_lastPressedXVolatile = var1.getX(); - MouseHandler_lastPressedYVolatile = var1.getY(); - MouseHandler_lastPressedTimeMillisVolatile = MilliClock.currentTimeMillis(); - MouseHandler_lastButtonVolatile = this.getButton(var1); - if (MouseHandler_lastButtonVolatile != 0) { + if (MouseHandler_instance != null) { // L: 79 + MouseHandler_idleCycles = 0; // L: 80 + MouseHandler_lastPressedXVolatile = var1.getX(); // L: 81 + MouseHandler_lastPressedYVolatile = var1.getY(); // L: 82 + MouseHandler_lastPressedTimeMillisVolatile = PacketWriter.currentTimeMillis(); // L: 83 + MouseHandler_lastButtonVolatile = this.getButton(var1); // L: 84 + if (MouseHandler_lastButtonVolatile != 0) { // L: 85 MouseHandler_currentButtonVolatile = MouseHandler_lastButtonVolatile; } } - if (var1.isPopupTrigger()) { + if (var1.isPopupTrigger()) { // L: 87 var1.consume(); } - } + } // L: 88 - public final void focusGained(FocusEvent var1) { - } + public final synchronized void mouseReleased(MouseEvent var1) { + if (MouseHandler_instance != null) { // L: 91 + MouseHandler_idleCycles = 0; // L: 92 + MouseHandler_currentButtonVolatile = 0; // L: 93 + } - public final synchronized void mouseDragged(MouseEvent var1) { - this.mouseMoved(var1); - } + if (var1.isPopupTrigger()) { // L: 95 + var1.consume(); + } - public final synchronized void mouseEntered(MouseEvent var1) { - this.mouseMoved(var1); + } // L: 96 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "([BI)Llp;", + garbageValue = "1839748509" + ) + @Export("convertJpgToSprite") + public static final Sprite convertJpgToSprite(byte[] var0) { + BufferedImage var1 = null; // L: 20 + + try { + var1 = ImageIO.read(new ByteArrayInputStream(var0)); // L: 22 + int var2 = var1.getWidth(); // L: 23 + int var3 = var1.getHeight(); // L: 24 + int[] var4 = new int[var2 * var3]; // L: 25 + PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2); // L: 26 + var5.grabPixels(); // L: 27 + return new Sprite(var4, var2, var3); // L: 28 + } catch (IOException var7) { // L: 30 + } catch (InterruptedException var8) { // L: 31 + } + + return new Sprite(0, 0); // L: 32 } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-121589904" + descriptor = "(Lhq;IIII)V", + garbageValue = "1755181117" ) - static void method1154() { - class247.field3220 = new int[2000]; - int var0 = 0; - int var1 = 240; - - int var3; - for (byte var2 = 12; var0 < 16; var1 -= var2) { - var3 = ScriptEvent.method1235((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F)); - class247.field3220[var0] = var3; - ++var0; + @Export("Widget_setKeyRate") + static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { + if (var0.field2682 == null) { // L: 926 + throw new RuntimeException(); // L: 927 + } else { + var0.field2682[var1] = var2; // L: 929 + var0.field2683[var1] = var3; // L: 930 } + } // L: 931 - var1 = 48; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(ILhg;ZB)V", + garbageValue = "70" + ) + static void method1150(int var0, Coord var1, boolean var2) { + WorldMapArea var3 = WorldMapSection0.getWorldMap().getMapArea(var0); // L: 3851 + int var4 = WorldMapLabelSize.localPlayer.plane; // L: 3852 + int var5 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; // L: 3853 + int var6 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; // L: 3854 + Coord var7 = new Coord(var4, var5, var6); // L: 3855 + WorldMapSection0.getWorldMap().method6549(var3, var7, var1, var2); // L: 3856 + } // L: 3857 - for (int var5 = var1 / 6; var0 < class247.field3220.length; var1 -= var5) { - var3 = var0 * 2; + @ObfuscatedName("gq") + @ObfuscatedSignature( + descriptor = "(Lgd;I)V", + garbageValue = "-930522600" + ) + static final void method1134(class194 var0) { + PacketBuffer var1 = Client.packetWriter.packetBuffer; // L: 6341 + int var2; + int var3; + int var4; + int var5; + int var6; + int var7; + if (class194.field2361 == var0) { // L: 6342 + var2 = var1.method5656(); // L: 6343 + var3 = var1.method5646(); // L: 6344 + var4 = (var3 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6345 + var5 = (var3 & 7) + ScriptEvent.field597; // L: 6346 + var6 = var1.method5656(); // L: 6347 + var7 = var1.readUnsignedShort(); // L: 6348 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 6349 + NodeDeque var42 = Client.groundItems[Huffman.Client_plane][var4][var5]; // L: 6350 + if (var42 != null) { // L: 6351 + for (TileItem var36 = (TileItem)var42.last(); var36 != null; var36 = (TileItem)var42.previous()) { // L: 6352 6353 6358 + if ((var6 & 32767) == var36.id && var2 == var36.quantity) { // L: 6354 + var36.quantity = var7; // L: 6355 + break; + } + } - for (int var4 = ScriptEvent.method1235((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class247.field3220.length; ++var0) { - class247.field3220[var0] = var4; + class13.updateItemPile(var4, var5); // L: 6360 + } + } + + } else { + int var8; + int var9; + int var10; + if (class194.field2371 == var0) { // L: 6365 + var2 = var1.method5612(); // L: 6366 + var3 = var2 >> 4 & 15; // L: 6367 + var4 = var2 & 7; // L: 6368 + var5 = var1.method5612(); // L: 6369 + var6 = var1.readUnsignedByte(); // L: 6370 + var7 = (var6 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6371 + var8 = (var6 & 7) + ScriptEvent.field597; // L: 6372 + var9 = var1.method5656(); // L: 6373 + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 6374 + var10 = var3 + 1; // L: 6375 + if (WorldMapLabelSize.localPlayer.pathX[0] >= var7 - var10 && WorldMapLabelSize.localPlayer.pathX[0] <= var7 + var10 && WorldMapLabelSize.localPlayer.pathY[0] >= var8 - var10 && WorldMapLabelSize.localPlayer.pathY[0] <= var10 + var8 && Client.areaSoundEffectVolume != 0 && var4 > 0 && Client.soundEffectCount < 50) { // L: 6376 6377 + Client.soundEffectIds[Client.soundEffectCount] = var9; // L: 6378 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; // L: 6379 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5; // L: 6380 + Client.soundEffects[Client.soundEffectCount] = null; // L: 6381 + Client.soundLocations[Client.soundEffectCount] = var3 + (var8 << 8) + (var7 << 16); // L: 6382 + ++Client.soundEffectCount; // L: 6383 + } + } + } + + int var11; + int var12; + int var13; + int var14; + byte var38; + if (class194.field2364 == var0) { // L: 6388 + var2 = var1.method5656(); // L: 6389 + var38 = var1.method5649(); // L: 6390 + var4 = var1.method5646(); // L: 6391 + var5 = (var4 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6392 + var6 = (var4 & 7) + ScriptEvent.field597; // L: 6393 + var7 = var1.readUnsignedByte(); // L: 6394 + var8 = var1.method5612() * 4; // L: 6395 + var9 = var1.method5639(); // L: 6396 + var10 = var1.method5655(); // L: 6397 + var11 = var1.readUnsignedShort(); // L: 6398 + var12 = var1.method5658(); // L: 6399 + var13 = var1.method5646() * 4; // L: 6400 + byte var41 = var1.method5649(); // L: 6401 + var3 = var38 + var5; // L: 6402 + var14 = var41 + var6; // L: 6403 + if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104 && var3 >= 0 && var14 >= 0 && var3 < 104 && var14 < 104 && var2 != 65535) { // L: 6404 + var5 = var5 * 128 + 64; // L: 6405 + var6 = var6 * 128 + 64; // L: 6406 + var3 = var3 * 128 + 64; // L: 6407 + var14 = var14 * 128 + 64; // L: 6408 + Projectile var35 = new Projectile(var2, Huffman.Client_plane, var5, var6, ArchiveLoader.getTileHeight(var5, var6, Huffman.Client_plane) - var8, var10 + Client.cycle, var11 + Client.cycle, var9, var7, var12, var13); // L: 6409 + var35.setDestination(var3, var14, ArchiveLoader.getTileHeight(var3, var14, Huffman.Client_plane) - var13, var10 + Client.cycle); // L: 6410 + Client.projectiles.addFirst(var35); // L: 6411 + } + + } else if (class194.field2365 == var0) { // L: 6415 + var2 = var1.method5639(); // L: 6416 + var3 = (var2 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6417 + var4 = (var2 & 7) + ScriptEvent.field597; // L: 6418 + var5 = var1.method5612(); // L: 6419 + var6 = var5 >> 2; // L: 6420 + var7 = var5 & 3; // L: 6421 + var8 = Client.field736[var6]; // L: 6422 + var9 = var1.readUnsignedShort(); // L: 6423 + if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) { // L: 6424 + if (var8 == 0) { // L: 6425 + BoundaryObject var34 = ScriptEvent.scene.method3276(Huffman.Client_plane, var3, var4); // L: 6426 + if (var34 != null) { // L: 6427 + var11 = UserComparator9.Entity_unpackID(var34.tag); // L: 6428 + if (var6 == 2) { // L: 6429 + var34.entity1 = new DynamicObject(var11, 2, var7 + 4, Huffman.Client_plane, var3, var4, var9, false, var34.entity1); // L: 6430 + var34.entity2 = new DynamicObject(var11, 2, var7 + 1 & 3, Huffman.Client_plane, var3, var4, var9, false, var34.entity2); // L: 6431 + } else { + var34.entity1 = new DynamicObject(var11, var6, var7, Huffman.Client_plane, var3, var4, var9, false, var34.entity1); // L: 6433 + } + } + } + + if (var8 == 1) { // L: 6436 + WallDecoration var43 = ScriptEvent.scene.method3211(Huffman.Client_plane, var3, var4); // L: 6437 + if (var43 != null) { // L: 6438 + var11 = UserComparator9.Entity_unpackID(var43.tag); // L: 6439 + if (var6 != 4 && var6 != 5) { // L: 6440 + if (var6 == 6) { // L: 6441 + var43.entity1 = new DynamicObject(var11, 4, var7 + 4, Huffman.Client_plane, var3, var4, var9, false, var43.entity1); + } else if (var6 == 7) { // L: 6442 + var43.entity1 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, Huffman.Client_plane, var3, var4, var9, false, var43.entity1); + } else if (var6 == 8) { // L: 6443 + var43.entity1 = new DynamicObject(var11, 4, var7 + 4, Huffman.Client_plane, var3, var4, var9, false, var43.entity1); // L: 6444 + var43.entity2 = new DynamicObject(var11, 4, (var7 + 2 & 3) + 4, Huffman.Client_plane, var3, var4, var9, false, var43.entity2); + } + } else { + var43.entity1 = new DynamicObject(var11, 4, var7, Huffman.Client_plane, var3, var4, var9, false, var43.entity1); // L: 6445 + } + } + } + + if (var8 == 2) { // L: 6449 + GameObject var44 = ScriptEvent.scene.method3197(Huffman.Client_plane, var3, var4); // L: 6450 + if (var6 == 11) { // L: 6451 + var6 = 10; + } + + if (var44 != null) { // L: 6452 + var44.entity = new DynamicObject(UserComparator9.Entity_unpackID(var44.tag), var6, var7, Huffman.Client_plane, var3, var4, var9, false, var44.entity); + } + } + + if (var8 == 3) { // L: 6454 + FloorDecoration var45 = ScriptEvent.scene.getFloorDecoration(Huffman.Client_plane, var3, var4); // L: 6455 + if (var45 != null) { // L: 6456 + var45.entity = new DynamicObject(UserComparator9.Entity_unpackID(var45.tag), 22, var7, Huffman.Client_plane, var3, var4, var9, false, var45.entity); + } + } + } + + } else if (class194.field2368 == var0) { // L: 6461 + var2 = var1.method5657(); // L: 6462 + var3 = var1.method5639(); // L: 6463 + var4 = (var3 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6464 + var5 = (var3 & 7) + ScriptEvent.field597; // L: 6465 + var6 = var1.method5639(); // L: 6466 + var7 = var1.method5655(); // L: 6467 + if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { // L: 6468 + var4 = var4 * 128 + 64; // L: 6469 + var5 = var5 * 128 + 64; // L: 6470 + GraphicsObject var33 = new GraphicsObject(var2, Huffman.Client_plane, var4, var5, ArchiveLoader.getTileHeight(var4, var5, Huffman.Client_plane) - var6, var7, Client.cycle); // L: 6471 + Client.graphicsObjects.addFirst(var33); // L: 6472 + } + + } else if (class194.field2362 == var0) { // L: 6476 + var2 = var1.method5646(); // L: 6477 + var3 = (var2 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6478 + var4 = (var2 & 7) + ScriptEvent.field597; // L: 6479 + var5 = var1.method5639(); // L: 6480 + var6 = var5 >> 2; // L: 6481 + var7 = var5 & 3; // L: 6482 + var8 = Client.field736[var6]; // L: 6483 + var9 = var1.method5657(); // L: 6484 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6485 + class9.updatePendingSpawn(Huffman.Client_plane, var3, var4, var8, var9, var6, var7, 0, -1); // L: 6486 + } + + } else if (class194.field2367 == var0) { // L: 6490 + var2 = var1.method5646(); // L: 6491 + var3 = var2 >> 2; // L: 6492 + var4 = var2 & 3; // L: 6493 + var5 = Client.field736[var3]; // L: 6494 + var6 = var1.method5612(); // L: 6495 + var7 = (var6 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6496 + var8 = (var6 & 7) + ScriptEvent.field597; // L: 6497 + if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { // L: 6498 + class9.updatePendingSpawn(Huffman.Client_plane, var7, var8, var5, -1, var3, var4, 0, -1); // L: 6499 + } + + } else { + TileItem var31; + if (class194.field2363 == var0) { // L: 6503 + var2 = var1.method5612(); // L: 6504 + var3 = (var2 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6505 + var4 = (var2 & 7) + ScriptEvent.field597; // L: 6506 + var5 = var1.readUnsignedShort(); // L: 6507 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6508 + NodeDeque var32 = Client.groundItems[Huffman.Client_plane][var3][var4]; // L: 6509 + if (var32 != null) { // L: 6510 + for (var31 = (TileItem)var32.last(); var31 != null; var31 = (TileItem)var32.previous()) { // L: 6511 6512 6517 + if ((var5 & 32767) == var31.id) { // L: 6513 + var31.remove(); // L: 6514 + break; + } + } + + if (var32.last() == null) { // L: 6519 + Client.groundItems[Huffman.Client_plane][var3][var4] = null; + } + + class13.updateItemPile(var3, var4); // L: 6520 + } + } + + } else if (class194.field2370 == var0) { // L: 6525 + var2 = var1.readUnsignedByte(); // L: 6526 + var3 = (var2 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6527 + var4 = (var2 & 7) + ScriptEvent.field597; // L: 6528 + var5 = var1.method5656(); // L: 6529 + var6 = var1.method5657(); // L: 6530 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 6531 + var31 = new TileItem(); // L: 6532 + var31.id = var6; // L: 6533 + var31.quantity = var5; // L: 6534 + if (Client.groundItems[Huffman.Client_plane][var3][var4] == null) { // L: 6535 + Client.groundItems[Huffman.Client_plane][var3][var4] = new NodeDeque(); + } + + Client.groundItems[Huffman.Client_plane][var3][var4].addFirst(var31); // L: 6536 + class13.updateItemPile(var3, var4); // L: 6537 + } + + } else { + if (class194.field2366 == var0) { // L: 6541 + byte var37 = var1.readByte(); // L: 6542 + var38 = var1.method5649(); // L: 6543 + var4 = var1.readUnsignedShort(); // L: 6544 + byte var39 = var1.readByte(); // L: 6545 + byte var40 = var1.method5649(); // L: 6546 + var7 = var1.readUnsignedShort(); // L: 6547 + var8 = var1.method5656(); // L: 6548 + var9 = var1.readUnsignedByte(); // L: 6549 + var10 = (var9 >> 4 & 7) + WorldMapIcon_0.field154; // L: 6550 + var11 = (var9 & 7) + ScriptEvent.field597; // L: 6551 + var12 = var1.method5646(); // L: 6552 + var13 = var12 >> 2; // L: 6553 + var14 = var12 & 3; // L: 6554 + int var15 = Client.field736[var13]; // L: 6555 + int var16 = var1.readUnsignedShort(); // L: 6556 + Player var17; + if (var4 == Client.localPlayerIndex) { // L: 6558 + var17 = WorldMapLabelSize.localPlayer; + } else { + var17 = Client.players[var4]; // L: 6559 + } + + if (var17 != null) { // L: 6560 + ObjectDefinition var18 = MidiPcmStream.getObjectDefinition(var16); // L: 6561 + int var19; + int var20; + if (var14 != 1 && var14 != 3) { // L: 6564 + var19 = var18.sizeX; // L: 6569 + var20 = var18.sizeY; // L: 6570 + } else { + var19 = var18.sizeY; // L: 6565 + var20 = var18.sizeX; // L: 6566 + } + + int var21 = var10 + (var19 >> 1); // L: 6572 + int var22 = var10 + (var19 + 1 >> 1); // L: 6573 + int var23 = var11 + (var20 >> 1); // L: 6574 + int var24 = var11 + (var20 + 1 >> 1); // L: 6575 + int[][] var25 = Tiles.Tiles_heights[Huffman.Client_plane]; // L: 6576 + int var26 = var25[var22][var24] + var25[var21][var24] + var25[var21][var23] + var25[var22][var23] >> 2; // L: 6577 + int var27 = (var10 << 7) + (var19 << 6); // L: 6578 + int var28 = (var11 << 7) + (var20 << 6); // L: 6579 + Model var29 = var18.getModel(var13, var14, var25, var27, var26, var28); // L: 6580 + if (var29 != null) { // L: 6581 + class9.updatePendingSpawn(Huffman.Client_plane, var10, var11, var15, -1, 0, 0, var8 + 1, var7 + 1); // L: 6582 + var17.animationCycleStart = var8 + Client.cycle; // L: 6583 + var17.animationCycleEnd = var7 + Client.cycle; // L: 6584 + var17.model0 = var29; // L: 6585 + var17.field645 = var19 * 64 + var10 * 128; // L: 6586 + var17.field640 = var20 * 64 + var11 * 128; // L: 6587 + var17.tileHeight2 = var26; // L: 6588 + byte var30; + if (var38 > var40) { // L: 6589 + var30 = var38; // L: 6590 + var38 = var40; // L: 6591 + var40 = var30; // L: 6592 + } + + if (var37 > var39) { // L: 6594 + var30 = var37; // L: 6595 + var37 = var39; // L: 6596 + var39 = var30; // L: 6597 + } + + var17.field649 = var10 + var38; // L: 6599 + var17.field651 = var40 + var10; // L: 6600 + var17.field635 = var11 + var37; // L: 6601 + var17.field643 = var11 + var39; // L: 6602 + } + } + } + + } } } - - } + } // L: 6363 6413 6459 6474 6488 6501 6523 6539 6606 } diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java index 6f06b451ca..f9ef1bc1db 100644 --- a/runescape-client/src/main/java/MouseRecorder.java +++ b/runescape-client/src/main/java/MouseRecorder.java @@ -4,207 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bx") +@ObfuscatedName("bo") @Implements("MouseRecorder") public class MouseRecorder implements Runnable { - @ObfuscatedName("m") + @ObfuscatedName("rc") + @ObfuscatedGetter( + intValue = 829134311 + ) + static int field609; + @ObfuscatedName("eu") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive18") + static Archive archive18; + @ObfuscatedName("fc") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + @Export("socketTask") + static Task socketTask; + @ObfuscatedName("z") @Export("isRunning") boolean isRunning; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("lock") Object lock; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1800286553 + intValue = -587598223 ) @Export("index") int index; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("xs") int[] xs; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("ys") int[] ys; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("millis") long[] millis; MouseRecorder() { - this.isRunning = true; - this.lock = new Object(); - this.index = 0; - this.xs = new int[500]; - this.ys = new int[500]; - this.millis = new long[500]; - } + this.isRunning = true; // L: 7 + this.lock = new Object(); // L: 8 + this.index = 0; // L: 9 + this.xs = new int[500]; // L: 10 + this.ys = new int[500]; // L: 11 + this.millis = new long[500]; // L: 12 + } // L: 14 public void run() { - while (this.isRunning) { - synchronized(this.lock) { - if (this.index < 500) { - this.xs[this.index] = MouseHandler.MouseHandler_x; - this.ys[this.index] = MouseHandler.MouseHandler_y; - this.millis[this.index] = MouseHandler.MouseHandler_millis; - ++this.index; + for (; this.isRunning; class227.sleepExact(50L)) { // L: 17 26 + synchronized(this.lock) { // L: 18 + if (this.index < 500) { // L: 19 + this.xs[this.index] = MouseHandler.MouseHandler_x; // L: 20 + this.ys[this.index] = MouseHandler.MouseHandler_y; // L: 21 + this.millis[this.index] = MouseHandler.MouseHandler_millis; // L: 22 + ++this.index; // L: 23 } } - - SpriteMask.sleepExact(49L); - SpriteMask.sleepExact(1L); } - } + } // L: 28 - @ObfuscatedName("m") + @ObfuscatedName("id") @ObfuscatedSignature( - descriptor = "(DDII)[D", - garbageValue = "-2077426308" + descriptor = "(Lhq;IIZS)V", + garbageValue = "338" ) - public static double[] method1248(double var0, double var2, int var4) { - int var5 = var4 * 2 + 1; - double[] var6 = new double[var5]; - int var7 = -var4; - - for (int var8 = 0; var7 <= var4; ++var8) { - double var15 = ((double)var7 - var0) / var2; - double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D); - double var11 = var13 / var2; - var6[var8] = var11; - ++var7; + @Export("alignWidgetSize") + static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { + int var4 = var0.width; // L: 9242 + int var5 = var0.height; // L: 9243 + if (var0.widthAlignment == 0) { // L: 9244 + var0.width = var0.rawWidth; + } else if (var0.widthAlignment == 1) { // L: 9245 + var0.width = var1 - var0.rawWidth; + } else if (var0.widthAlignment == 2) { // L: 9246 + var0.width = var0.rawWidth * var1 >> 14; } - return var6; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-2086998807" - ) - @Export("decodeStringCp1252") - public static String decodeStringCp1252(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - - for (int var5 = 0; var5 < var2; ++var5) { - int var6 = var0[var5 + var1] & 255; - if (var6 != 0) { - if (var6 >= 128 && var6 < 160) { - char var7 = class297.cp1252AsciiExtension[var6 - 128]; - if (var7 == 0) { - var7 = '?'; - } - - var6 = var7; - } - - var3[var4++] = (char)var6; - } + if (var0.heightAlignment == 0) { // L: 9247 + var0.height = var0.rawHeight; + } else if (var0.heightAlignment == 1) { // L: 9248 + var0.height = var2 - var0.rawHeight; + } else if (var0.heightAlignment == 2) { + var0.height = var2 * var0.rawHeight >> 14; // L: 9249 } - return new String(var3, 0, var4); - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-150787474" - ) - public static void method1251() { - ItemDefinition.ItemDefinition_cachedSprites.clear(); - } - - @ObfuscatedName("fi") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1161280240" - ) - @Export("logOut") - static final void logOut() { - Client.packetWriter.close(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear(); - Entity.method3387(); - ObjectDefinition.ObjectDefinition_cached.clear(); - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - ObjectDefinition.ObjectDefinition_cachedEntities.clear(); - ObjectDefinition.ObjectDefinition_cachedModels.clear(); - NPCDefinition.NpcDefinition_cached.clear(); - NPCDefinition.NpcDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cached.clear(); - ItemDefinition.ItemDefinition_cachedModels.clear(); - ItemDefinition.ItemDefinition_cachedSprites.clear(); - AttackOption.method2181(); - class60.method972(); - KitDefinition.method4624(); - HealthBar.method2133(); - HitSplatDefinition.HitSplatDefinition_cached.clear(); - HitSplatDefinition.HitSplatDefinition_cachedSprites.clear(); - HitSplatDefinition.HitSplatDefinition_cachedFonts.clear(); - AbstractWorldMapData.method343(); - StructDefinition.StructDefinition_cached.clear(); - ParamDefinition.ParamDefinition_cached.clear(); - WorldMapElement.WorldMapElement_cachedSprites.clear(); - ObjectSound.method2007(); - ObjectSound.method2008(); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); - Script.Script_cached.clear(); - MilliClock.archive0.clearFiles(); - Message.archive1.clearFiles(); - class105.archive3.clearFiles(); - GrandExchangeOffer.archive4.clearFiles(); - WorldMapRectangle.archive5.clearFiles(); - UserComparator7.archive6.clearFiles(); - Projectile.archive7.clearFiles(); - GrandExchangeEvent.archive8.clearFiles(); - Tile.archive9.clearFiles(); - GraphicsObject.archive10.clearFiles(); - WorldMapData_0.archive11.clearFiles(); - Message.archive12.clearFiles(); - UserComparator3.scene.clear(); - - for (int var0 = 0; var0 < 4; ++var0) { - Client.collisionMaps[var0].clear(); + if (var0.widthAlignment == 4) { // L: 9250 + var0.width = var0.height * var0.field2622 / var0.field2623; } - System.gc(); - class206.field2439 = 1; - Huffman.musicTrackArchive = null; - class206.musicTrackGroupId = -1; - MilliClock.musicTrackFileId = -1; - class206.musicTrackVolume = 0; - class336.musicTrackBoolean = false; - class206.field2442 = 2; - Client.currentTrackGroupId = -1; - Client.field743 = false; - - for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var1.stream1 != null) { - class60.pcmStreamMixer.removeSubStream(var1.stream1); - var1.stream1 = null; - } - - if (var1.stream2 != null) { - class60.pcmStreamMixer.removeSubStream(var1.stream2); - var1.stream2 = null; - } + if (var0.heightAlignment == 4) { // L: 9251 + var0.height = var0.field2623 * var0.width / var0.field2622; } - ObjectSound.objectSounds.clear(); - ClientPreferences.updateGameState(10); - } - - @ObfuscatedName("fy") - @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-126" - ) - @Export("playSoundJingle") - static void playSoundJingle(int var0, int var1) { - if (Client.musicVolume != 0 && var0 != -1) { - UserComparator9.method3513(WorldMapData_0.archive11, var0, 0, Client.musicVolume, false); - Client.field743 = true; + if (var0.contentType == 1337) { // L: 9252 + Client.viewportWidget = var0; } - } + if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { // L: 9253 + ScriptEvent var6 = new ScriptEvent(); // L: 9254 + var6.widget = var0; // L: 9255 + var6.args = var0.onResize; // L: 9256 + Client.scriptEvents.addFirst(var6); // L: 9257 + } + + } // L: 9259 } diff --git a/runescape-client/src/main/java/MouseWheel.java b/runescape-client/src/main/java/MouseWheel.java index 270a1d4264..d92b5dfe35 100644 --- a/runescape-client/src/main/java/MouseWheel.java +++ b/runescape-client/src/main/java/MouseWheel.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fv") +@ObfuscatedName("fd") @Implements("MouseWheel") public interface MouseWheel { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1995693829" + garbageValue = "1668209919" ) @Export("useRotation") int useRotation(); diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java index b89c5a3a70..c17ddf6e05 100644 --- a/runescape-client/src/main/java/MouseWheelHandler.java +++ b/runescape-client/src/main/java/MouseWheelHandler.java @@ -7,53 +7,53 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bh") +@ObfuscatedName("bc") @Implements("MouseWheelHandler") public final class MouseWheelHandler implements MouseWheel, MouseWheelListener { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1874957647 + intValue = 1614539885 ) @Export("rotation") int rotation; MouseWheelHandler() { - this.rotation = 0; - } + this.rotation = 0; // L: 8 + } // L: 10 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(Ljava/awt/Component;I)V", - garbageValue = "-337398134" + garbageValue = "1793602712" ) @Export("addTo") void addTo(Component var1) { - var1.addMouseWheelListener(this); - } + var1.addMouseWheelListener(this); // L: 13 + } // L: 14 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "21" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1289798046" ) @Export("removeFrom") void removeFrom(Component var1) { - var1.removeMouseWheelListener(this); - } + var1.removeMouseWheelListener(this); // L: 17 + } // L: 18 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1995693829" + garbageValue = "1668209919" ) @Export("useRotation") public synchronized int useRotation() { - int var1 = this.rotation; - this.rotation = 0; - return var1; + int var1 = this.rotation; // L: 26 + this.rotation = 0; // L: 27 + return var1; // L: 28 } public synchronized void mouseWheelMoved(MouseWheelEvent var1) { - this.rotation += var1.getWheelRotation(); - } + this.rotation += var1.getWheelRotation(); // L: 22 + } // L: 23 } diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index c12b8e43fb..9f12809cce 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -1,331 +1,330 @@ -import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hi") +@ObfuscatedName("hx") @Implements("MusicPatch") public class MusicPatch extends Node { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1762286349 + intValue = -1168420419 ) - int field2520; - @ObfuscatedName("o") + int field2513; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Ldp;" + descriptor = "[Lde;" ) @Export("rawSounds") RawSound[] rawSounds; - @ObfuscatedName("q") - short[] field2521; - @ObfuscatedName("j") - byte[] field2517; - @ObfuscatedName("p") - byte[] field2518; - @ObfuscatedName("g") + @ObfuscatedName("s") + short[] field2510; + @ObfuscatedName("t") + byte[] field2507; + @ObfuscatedName("i") + byte[] field2509; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Lgp;" + descriptor = "[Lgo;" ) - MusicPatchNode2[] field2519; - @ObfuscatedName("n") - byte[] field2522; - @ObfuscatedName("u") - int[] field2514; + MusicPatchNode2[] field2506; + @ObfuscatedName("x") + byte[] field2511; + @ObfuscatedName("w") + int[] field2512; MusicPatch(byte[] var1) { - this.rawSounds = new RawSound[128]; - this.field2521 = new short[128]; - this.field2517 = new byte[128]; - this.field2518 = new byte[128]; - this.field2519 = new MusicPatchNode2[128]; - this.field2522 = new byte[128]; - this.field2514 = new int[128]; - Buffer var2 = new Buffer(var1); + this.rawSounds = new RawSound[128]; // L: 21 + this.field2510 = new short[128]; // L: 22 + this.field2507 = new byte[128]; // L: 23 + this.field2509 = new byte[128]; // L: 24 + this.field2506 = new MusicPatchNode2[128]; // L: 25 + this.field2511 = new byte[128]; // L: 26 + this.field2512 = new int[128]; // L: 27 + Buffer var2 = new Buffer(var1); // L: 28 int var3; - for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { + for (var3 = 0; var2.array[var3 + var2.offset] != 0; ++var3) { // L: 29 30 } - byte[] var4 = new byte[var3]; + byte[] var4 = new byte[var3]; // L: 31 int var5; - for (var5 = 0; var5 < var3; ++var5) { + for (var5 = 0; var5 < var3; ++var5) { // L: 32 var4[var5] = var2.readByte(); } - ++var2.offset; - ++var3; - var5 = var2.offset; - var2.offset += var3; + ++var2.offset; // L: 33 + ++var3; // L: 34 + var5 = var2.offset; // L: 35 + var2.offset += var3; // L: 36 int var6; - for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { + for (var6 = 0; var2.array[var6 + var2.offset] != 0; ++var6) { // L: 37 38 } - byte[] var7 = new byte[var6]; + byte[] var7 = new byte[var6]; // L: 39 int var8; - for (var8 = 0; var8 < var6; ++var8) { + for (var8 = 0; var8 < var6; ++var8) { // L: 40 var7[var8] = var2.readByte(); } - ++var2.offset; - ++var6; - var8 = var2.offset; - var2.offset += var6; + ++var2.offset; // L: 41 + ++var6; // L: 42 + var8 = var2.offset; // L: 43 + var2.offset += var6; // L: 44 int var9; - for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { + for (var9 = 0; var2.array[var9 + var2.offset] != 0; ++var9) { // L: 45 46 } - byte[] var10 = new byte[var9]; + byte[] var10 = new byte[var9]; // L: 47 - for (int var11 = 0; var11 < var9; ++var11) { + for (int var11 = 0; var11 < var9; ++var11) { // L: 48 var10[var11] = var2.readByte(); } - ++var2.offset; - ++var9; - byte[] var36 = new byte[var9]; + ++var2.offset; // L: 49 + ++var9; // L: 50 + byte[] var38 = new byte[var9]; // L: 51 int var12; int var14; - if (var9 > 1) { - var36[1] = 1; - int var13 = 1; - var12 = 2; + if (var9 > 1) { // L: 53 + var38[1] = 1; // L: 54 + int var13 = 1; // L: 55 + var12 = 2; // L: 56 - for (var14 = 2; var14 < var9; ++var14) { - int var15 = var2.readUnsignedByte(); - if (var15 == 0) { + for (var14 = 2; var14 < var9; ++var14) { // L: 57 + int var43 = var2.readUnsignedByte(); // L: 58 + if (var43 == 0) { // L: 59 var13 = var12++; } else { - if (var15 <= var13) { - --var15; + if (var43 <= var13) { // L: 61 + --var43; } - var13 = var15; + var13 = var43; // L: 62 } - var36[var14] = (byte)var13; + var38[var14] = (byte)var13; // L: 64 } } else { - var12 = var9; + var12 = var9; // L: 67 } - MusicPatchNode2[] var37 = new MusicPatchNode2[var12]; + MusicPatchNode2[] var39 = new MusicPatchNode2[var12]; // L: 68 - MusicPatchNode2 var38; - for (var14 = 0; var14 < var37.length; ++var14) { - var38 = var37[var14] = new MusicPatchNode2(); - int var16 = var2.readUnsignedByte(); - if (var16 > 0) { - var38.field2424 = new byte[var16 * 2]; + MusicPatchNode2 var15; + for (var14 = 0; var14 < var39.length; ++var14) { // L: 69 + var15 = var39[var14] = new MusicPatchNode2(); // L: 70 + int var42 = var2.readUnsignedByte(); // L: 71 + if (var42 > 0) { // L: 72 + var15.field2426 = new byte[var42 * 2]; } - var16 = var2.readUnsignedByte(); - if (var16 > 0) { - var38.field2429 = new byte[var16 * 2 + 2]; - var38.field2429[1] = 64; + var42 = var2.readUnsignedByte(); // L: 73 + if (var42 > 0) { // L: 74 + var15.field2433 = new byte[var42 * 2 + 2]; // L: 75 + var15.field2433[1] = 64; // L: 76 } } - var14 = var2.readUnsignedByte(); - byte[] var45 = var14 > 0 ? new byte[var14 * 2] : null; - var14 = var2.readUnsignedByte(); - byte[] var39 = var14 > 0 ? new byte[var14 * 2] : null; + var14 = var2.readUnsignedByte(); // L: 79 + byte[] var44 = var14 > 0 ? new byte[var14 * 2] : null; // L: 80 + var14 = var2.readUnsignedByte(); // L: 81 + byte[] var16 = var14 > 0 ? new byte[var14 * 2] : null; // L: 82 int var17; - for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { + for (var17 = 0; var2.array[var17 + var2.offset] != 0; ++var17) { // L: 83 84 } - byte[] var18 = new byte[var17]; + byte[] var18 = new byte[var17]; // L: 85 int var19; - for (var19 = 0; var19 < var17; ++var19) { + for (var19 = 0; var19 < var17; ++var19) { // L: 86 var18[var19] = var2.readByte(); } - ++var2.offset; - ++var17; - var19 = 0; + ++var2.offset; // L: 87 + ++var17; // L: 88 + var19 = 0; // L: 89 int var20; - for (var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - this.field2521[var20] = (short)var19; + for (var20 = 0; var20 < 128; ++var20) { // L: 90 + var19 += var2.readUnsignedByte(); // L: 91 + this.field2510[var20] = (short)var19; // L: 92 } - var19 = 0; + var19 = 0; // L: 94 - short[] var48; - for (var20 = 0; var20 < 128; ++var20) { - var19 += var2.readUnsignedByte(); - var48 = this.field2521; - var48[var20] = (short)(var48[var20] + (var19 << 8)); + short[] var50; + for (var20 = 0; var20 < 128; ++var20) { // L: 95 + var19 += var2.readUnsignedByte(); // L: 96 + var50 = this.field2510; // L: 97 + var50[var20] = (short)(var50[var20] + (var19 << 8)); } - var20 = 0; - int var21 = 0; - int var22 = 0; + var20 = 0; // L: 99 + int var21 = 0; // L: 100 + int var22 = 0; // L: 101 int var23; - for (var23 = 0; var23 < 128; ++var23) { - if (var20 == 0) { - if (var21 < var18.length) { + for (var23 = 0; var23 < 128; ++var23) { // L: 102 + if (var20 == 0) { // L: 103 + if (var21 < var18.length) { // L: 104 var20 = var18[var21++]; } else { - var20 = -1; + var20 = -1; // L: 105 } - var22 = var2.readVarInt(); + var22 = var2.readVarInt(); // L: 106 } - var48 = this.field2521; - var48[var23] = (short)(var48[var23] + ((var22 - 1 & 2) << 14)); - this.field2514[var23] = var22; - --var20; + var50 = this.field2510; // L: 108 + var50[var23] = (short)(var50[var23] + ((var22 - 1 & 2) << 14)); + this.field2512[var23] = var22; // L: 109 + --var20; // L: 110 } - var20 = 0; - var21 = 0; - var23 = 0; + var20 = 0; // L: 112 + var21 = 0; // L: 113 + var23 = 0; // L: 114 int var24; - for (var24 = 0; var24 < 128; ++var24) { - if (this.field2514[var24] != 0) { - if (var20 == 0) { - if (var21 < var4.length) { + for (var24 = 0; var24 < 128; ++var24) { // L: 115 + if (this.field2512[var24] != 0) { // L: 116 + if (var20 == 0) { // L: 117 + if (var21 < var4.length) { // L: 118 var20 = var4[var21++]; } else { - var20 = -1; + var20 = -1; // L: 119 } - var23 = var2.array[var5++] - 1; + var23 = var2.array[var5++] - 1; // L: 120 } - this.field2522[var24] = (byte)var23; - --var20; + this.field2511[var24] = (byte)var23; // L: 122 + --var20; // L: 123 } } - var20 = 0; - var21 = 0; - var24 = 0; + var20 = 0; // L: 125 + var21 = 0; // L: 126 + var24 = 0; // L: 127 - for (int var25 = 0; var25 < 128; ++var25) { - if (this.field2514[var25] != 0) { - if (var20 == 0) { - if (var21 < var7.length) { + for (int var25 = 0; var25 < 128; ++var25) { // L: 128 + if (this.field2512[var25] != 0) { // L: 129 + if (var20 == 0) { // L: 130 + if (var21 < var7.length) { // L: 131 var20 = var7[var21++]; } else { - var20 = -1; + var20 = -1; // L: 132 } - var24 = var2.array[var8++] + 16 << 2; + var24 = var2.array[var8++] + 16 << 2; // L: 133 } - this.field2518[var25] = (byte)var24; - --var20; + this.field2509[var25] = (byte)var24; // L: 135 + --var20; // L: 136 } } - var20 = 0; - var21 = 0; - MusicPatchNode2 var40 = null; + var20 = 0; // L: 138 + var21 = 0; // L: 139 + MusicPatchNode2 var40 = null; // L: 140 int var26; - for (var26 = 0; var26 < 128; ++var26) { - if (this.field2514[var26] != 0) { - if (var20 == 0) { - var40 = var37[var36[var21]]; - if (var21 < var10.length) { + for (var26 = 0; var26 < 128; ++var26) { // L: 141 + if (this.field2512[var26] != 0) { // L: 142 + if (var20 == 0) { // L: 143 + var40 = var39[var38[var21]]; // L: 144 + if (var21 < var10.length) { // L: 145 var20 = var10[var21++]; } else { - var20 = -1; + var20 = -1; // L: 146 } } - this.field2519[var26] = var40; - --var20; + this.field2506[var26] = var40; // L: 148 + --var20; // L: 149 } } - var20 = 0; - var21 = 0; - var26 = 0; + var20 = 0; // L: 151 + var21 = 0; // L: 152 + var26 = 0; // L: 153 int var27; - for (var27 = 0; var27 < 128; ++var27) { - if (var20 == 0) { - if (var21 < var18.length) { + for (var27 = 0; var27 < 128; ++var27) { // L: 154 + if (var20 == 0) { // L: 155 + if (var21 < var18.length) { // L: 156 var20 = var18[var21++]; } else { - var20 = -1; + var20 = -1; // L: 157 } - if (this.field2514[var27] > 0) { + if (this.field2512[var27] > 0) { // L: 158 var26 = var2.readUnsignedByte() + 1; } } - this.field2517[var27] = (byte)var26; - --var20; + this.field2507[var27] = (byte)var26; // L: 160 + --var20; // L: 161 } - this.field2520 = var2.readUnsignedByte() + 1; + this.field2513 = var2.readUnsignedByte() + 1; // L: 163 - MusicPatchNode2 var28; int var29; - for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; - if (var28.field2424 != null) { - for (var29 = 1; var29 < var28.field2424.length; var29 += 2) { - var28.field2424[var29] = var2.readByte(); + MusicPatchNode2 var41; + for (var27 = 0; var27 < var12; ++var27) { // L: 164 + var41 = var39[var27]; // L: 165 + if (var41.field2426 != null) { // L: 166 + for (var29 = 1; var29 < var41.field2426.length; var29 += 2) { // L: 167 + var41.field2426[var29] = var2.readByte(); } } - if (var28.field2429 != null) { - for (var29 = 3; var29 < var28.field2429.length - 2; var29 += 2) { - var28.field2429[var29] = var2.readByte(); + if (var41.field2433 != null) { // L: 169 + for (var29 = 3; var29 < var41.field2433.length - 2; var29 += 2) { // L: 170 + var41.field2433[var29] = var2.readByte(); } } } - if (var45 != null) { - for (var27 = 1; var27 < var45.length; var27 += 2) { - var45[var27] = var2.readByte(); + if (var44 != null) { // L: 173 + for (var27 = 1; var27 < var44.length; var27 += 2) { // L: 174 + var44[var27] = var2.readByte(); } } - if (var39 != null) { - for (var27 = 1; var27 < var39.length; var27 += 2) { - var39[var27] = var2.readByte(); + if (var16 != null) { // L: 176 + for (var27 = 1; var27 < var16.length; var27 += 2) { // L: 177 + var16[var27] = var2.readByte(); } } - for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; - if (var28.field2429 != null) { - var19 = 0; + for (var27 = 0; var27 < var12; ++var27) { // L: 179 + var41 = var39[var27]; // L: 180 + if (var41.field2433 != null) { // L: 181 + var19 = 0; // L: 182 - for (var29 = 2; var29 < var28.field2429.length; var29 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var28.field2429[var29] = (byte)var19; + for (var29 = 2; var29 < var41.field2433.length; var29 += 2) { // L: 183 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 184 + var41.field2433[var29] = (byte)var19; // L: 185 } } } - for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; - if (var28.field2424 != null) { - var19 = 0; + for (var27 = 0; var27 < var12; ++var27) { // L: 189 + var41 = var39[var27]; // L: 190 + if (var41.field2426 != null) { // L: 191 + var19 = 0; // L: 192 - for (var29 = 2; var29 < var28.field2424.length; var29 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var28.field2424[var29] = (byte)var19; + for (var29 = 2; var29 < var41.field2426.length; var29 += 2) { // L: 193 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 194 + var41.field2426[var29] = (byte)var19; // L: 195 } } } @@ -334,220 +333,236 @@ public class MusicPatch extends Node { int var32; int var33; int var34; - int var42; - byte var44; - if (var45 != null) { - var19 = var2.readUnsignedByte(); - var45[0] = (byte)var19; + int var35; + int var36; + int var47; + byte var49; + if (var44 != null) { // L: 199 + var19 = var2.readUnsignedByte(); // L: 200 + var44[0] = (byte)var19; // L: 201 - for (var27 = 2; var27 < var45.length; var27 += 2) { - var19 = 1 + var19 + var2.readUnsignedByte(); - var45[var27] = (byte)var19; + for (var27 = 2; var27 < var44.length; var27 += 2) { // L: 202 + var19 = var19 + 1 + var2.readUnsignedByte(); // L: 203 + var44[var27] = (byte)var19; // L: 204 } - var44 = var45[0]; - byte var41 = var45[1]; + var49 = var44[0]; // L: 206 + byte var28 = var44[1]; // L: 207 - for (var29 = 0; var29 < var44; ++var29) { - this.field2517[var29] = (byte)(var41 * this.field2517[var29] + 32 >> 6); + for (var29 = 0; var29 < var49; ++var29) { // L: 208 + this.field2507[var29] = (byte)(var28 * this.field2507[var29] + 32 >> 6); } - for (var29 = 2; var29 < var45.length; var29 += 2) { - var30 = var45[var29]; - byte var31 = var45[var29 + 1]; - var32 = var41 * (var30 - var44) + (var30 - var44) / 2; + for (var29 = 2; var29 < var44.length; var29 += 2) { // L: 209 210 227 + var30 = var44[var29]; // L: 211 + byte var31 = var44[var29 + 1]; // L: 212 + var32 = var28 * (var30 - var49) + (var30 - var49) / 2; // L: 213 - for (var33 = var44; var33 < var30; ++var33) { - var34 = WorldMapRectangle.method347(var32, var30 - var44); - this.field2517[var33] = (byte)(var34 * this.field2517[var33] + 32 >> 6); - var32 += var31 - var41; + for (var33 = var49; var33 < var30; ++var33) { // L: 214 + var35 = var30 - var49; // L: 216 + var36 = var32 >>> 31; // L: 218 + var34 = (var32 + var36) / var35 - var36; // L: 219 + this.field2507[var33] = (byte)(var34 * this.field2507[var33] + 32 >> 6); // L: 222 + var32 += var31 - var28; // L: 223 } - var44 = var30; - var41 = var31; + var49 = var30; // L: 225 + var28 = var31; // L: 226 } - for (var42 = var44; var42 < 128; ++var42) { - this.field2517[var42] = (byte)(var41 * this.field2517[var42] + 32 >> 6); + for (var47 = var49; var47 < 128; ++var47) { // L: 229 + this.field2507[var47] = (byte)(var28 * this.field2507[var47] + 32 >> 6); } - var38 = null; + var15 = null; // L: 230 } - if (var39 != null) { - var19 = var2.readUnsignedByte(); - var39[0] = (byte)var19; + if (var16 != null) { // L: 232 + var19 = var2.readUnsignedByte(); // L: 233 + var16[0] = (byte)var19; // L: 234 - for (var27 = 2; var27 < var39.length; var27 += 2) { - var19 = var19 + 1 + var2.readUnsignedByte(); - var39[var27] = (byte)var19; + for (var27 = 2; var27 < var16.length; var27 += 2) { // L: 235 + var19 = 1 + var19 + var2.readUnsignedByte(); // L: 236 + var16[var27] = (byte)var19; // L: 237 } - var44 = var39[0]; - int var47 = var39[1] << 1; + var49 = var16[0]; // L: 239 + int var46 = var16[1] << 1; // L: 240 - for (var29 = 0; var29 < var44; ++var29) { - var42 = var47 + (this.field2518[var29] & 255); - if (var42 < 0) { - var42 = 0; + for (var29 = 0; var29 < var49; ++var29) { // L: 241 + var47 = var46 + (this.field2509[var29] & 255); // L: 242 + if (var47 < 0) { // L: 243 + var47 = 0; } - if (var42 > 128) { - var42 = 128; + if (var47 > 128) { // L: 244 + var47 = 128; } - this.field2518[var29] = (byte)var42; + this.field2509[var29] = (byte)var47; // L: 245 } - int var43; - for (var29 = 2; var29 < var39.length; var29 += 2) { - var30 = var39[var29]; - var43 = var39[var29 + 1] << 1; - var32 = var47 * (var30 - var44) + (var30 - var44) / 2; + int var48; + for (var29 = 2; var29 < var16.length; var29 += 2) { // L: 247 248 268 + var30 = var16[var29]; // L: 249 + var48 = var16[var29 + 1] << 1; // L: 250 + var32 = var46 * (var30 - var49) + (var30 - var49) / 2; // L: 251 - for (var33 = var44; var33 < var30; ++var33) { - var34 = WorldMapRectangle.method347(var32, var30 - var44); - int var35 = var34 + (this.field2518[var33] & 255); - if (var35 < 0) { - var35 = 0; + for (var33 = var49; var33 < var30; ++var33) { // L: 252 + var35 = var30 - var49; // L: 254 + var36 = var32 >>> 31; // L: 256 + var34 = (var32 + var36) / var35 - var36; // L: 257 + int var37 = var34 + (this.field2509[var33] & 255); // L: 260 + if (var37 < 0) { // L: 261 + var37 = 0; } - if (var35 > 128) { - var35 = 128; + if (var37 > 128) { // L: 262 + var37 = 128; } - this.field2518[var33] = (byte)var35; - var32 += var43 - var47; + this.field2509[var33] = (byte)var37; // L: 263 + var32 += var48 - var46; // L: 264 } - var44 = var30; - var47 = var43; + var49 = var30; // L: 266 + var46 = var48; // L: 267 } - for (var42 = var44; var42 < 128; ++var42) { - var43 = var47 + (this.field2518[var42] & 255); - if (var43 < 0) { - var43 = 0; + for (var47 = var49; var47 < 128; ++var47) { // L: 270 + var48 = var46 + (this.field2509[var47] & 255); // L: 271 + if (var48 < 0) { // L: 272 + var48 = 0; } - if (var43 > 128) { - var43 = 128; + if (var48 > 128) { // L: 273 + var48 = 128; } - this.field2518[var42] = (byte)var43; + this.field2509[var47] = (byte)var48; // L: 274 } - Object var46 = null; + Object var45 = null; // L: 276 } - for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2426 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 278 + var39[var27].field2425 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; - if (var28.field2424 != null) { - var28.field2427 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 279 + var41 = var39[var27]; // L: 280 + if (var41.field2426 != null) { // L: 281 + var41.field2427 = var2.readUnsignedByte(); } - if (var28.field2429 != null) { - var28.field2428 = var2.readUnsignedByte(); + if (var41.field2433 != null) { // L: 282 + var41.field2428 = var2.readUnsignedByte(); } - if (var28.field2426 > 0) { - var28.field2435 = var2.readUnsignedByte(); + if (var41.field2425 > 0) { // L: 283 + var41.field2429 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { - var37[var27].field2431 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 285 + var39[var27].field2431 = var2.readUnsignedByte(); } - for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; - if (var28.field2431 > 0) { - var28.field2430 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 286 + var41 = var39[var27]; // L: 287 + if (var41.field2431 > 0) { // L: 288 + var41.field2430 = var2.readUnsignedByte(); } } - for (var27 = 0; var27 < var12; ++var27) { - var28 = var37[var27]; - if (var28.field2430 > 0) { - var28.field2425 = var2.readUnsignedByte(); + for (var27 = 0; var27 < var12; ++var27) { // L: 290 + var41 = var39[var27]; // L: 291 + if (var41.field2430 > 0) { // L: 292 + var41.field2432 = var2.readUnsignedByte(); } } - } + } // L: 294 - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ldo;[B[II)Z", - garbageValue = "512208018" + descriptor = "(Lds;[B[IB)Z", + garbageValue = "-93" ) - boolean method4027(SoundCache var1, byte[] var2, int[] var3) { - boolean var4 = true; - int var5 = 0; - RawSound var6 = null; + boolean method3979(SoundCache var1, byte[] var2, int[] var3) { + boolean var4 = true; // L: 297 + int var5 = 0; // L: 298 + RawSound var6 = null; // L: 299 - for (int var7 = 0; var7 < 128; ++var7) { - if (var2 == null || var2[var7] != 0) { - int var8 = this.field2514[var7]; - if (var8 != 0) { - if (var5 != var8) { - var5 = var8--; - if ((var8 & 1) == 0) { + for (int var7 = 0; var7 < 128; ++var7) { // L: 300 + if (var2 == null || var2[var7] != 0) { // L: 301 + int var8 = this.field2512[var7]; // L: 302 + if (var8 != 0) { // L: 303 + if (var8 != var5) { // L: 304 + var5 = var8--; // L: 305 306 + if ((var8 & 1) == 0) { // L: 307 var6 = var1.getSoundEffect(var8 >> 2, var3); } else { - var6 = var1.getMusicSample(var8 >> 2, var3); + var6 = var1.getMusicSample(var8 >> 2, var3); // L: 308 } - if (var6 == null) { + if (var6 == null) { // L: 309 var4 = false; } } - if (var6 != null) { - this.rawSounds[var7] = var6; - this.field2514[var7] = 0; + if (var6 != null) { // L: 311 + this.rawSounds[var7] = var6; // L: 312 + this.field2512[var7] = 0; // L: 313 } } } } - return var4; + return var4; // L: 317 } - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "58" + descriptor = "(S)V", + garbageValue = "25153" ) @Export("clear") void clear() { - this.field2514 = null; - } + this.field2512 = null; // L: 321 + } // L: 322 - @ObfuscatedName("m") + @ObfuscatedName("ib") @ObfuscatedSignature( - descriptor = "(Ljava/io/File;I)V", - garbageValue = "-1151002932" + descriptor = "(Lhq;I)Z", + garbageValue = "-2027629220" ) - static void method4025(File var0) { - FileSystem.FileSystem_cacheDir = var0; - if (!FileSystem.FileSystem_cacheDir.exists()) { - throw new RuntimeException(""); + @Export("runCs1") + static final boolean runCs1(Widget var0) { + if (var0.cs1Comparisons == null) { // L: 9332 + return false; } else { - FileSystem.FileSystem_hasPermissions = true; + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { // L: 9333 + int var2 = GrandExchangeOfferNameComparator.method230(var0, var1); // L: 9334 + int var3 = var0.cs1ComparisonValues[var1]; // L: 9335 + if (var0.cs1Comparisons[var1] == 2) { // L: 9336 + if (var2 >= var3) { // L: 9337 + return false; + } + } else if (var0.cs1Comparisons[var1] == 3) { // L: 9339 + if (var2 <= var3) { // L: 9340 + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { // L: 9342 + if (var2 == var3) { // L: 9343 + return false; + } + } else if (var3 != var2) { // L: 9345 + return false; + } + } + + return true; // L: 9347 } } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)[Llw;", - garbageValue = "16711680" - ) - @Export("FillMode_values") - public static class332[] FillMode_values() { - return new class332[]{class332.field3881, class332.SOLID, class332.field3880}; - } } diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java index 5462f6888f..5c56ed48fa 100644 --- a/runescape-client/src/main/java/MusicPatchNode.java +++ b/runescape-client/src/main/java/MusicPatchNode.java @@ -1,266 +1,175 @@ -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hm") +@ObfuscatedName("he") @Implements("MusicPatchNode") public class MusicPatchNode extends Node { - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 53728519 - ) - int field2479; - @ObfuscatedName("o") + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lhi;" + descriptor = "[Lls;" + ) + @Export("worldSelectArrows") + static IndexedSprite[] worldSelectArrows; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 2053658771 + ) + int field2484; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lhx;" ) @Export("patch") MusicPatch patch; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ldp;" + descriptor = "Lde;" ) @Export("rawSound") RawSound rawSound; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgp;" + descriptor = "Lgo;" ) - MusicPatchNode2 field2477; - @ObfuscatedName("p") + MusicPatchNode2 field2472; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -332172395 + intValue = 227260251 ) - int field2480; - @ObfuscatedName("g") + int field2473; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 352043121 + intValue = -648254967 ) - int field2481; - @ObfuscatedName("n") + int field2474; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1390443867 + intValue = 479011763 ) - int field2499; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 2081977777 - ) - int field2483; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 824681331 - ) - int field2484; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 2037828979 - ) - int field2485; + int field2475; @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1496244827 + intValue = 2012218471 ) - int field2491; - @ObfuscatedName("y") + int field2481; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -182332207 + intValue = -1638523819 ) - int field2496; - @ObfuscatedName("c") + int field2477; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1654304629 + intValue = -585277595 ) - int field2488; + int field2487; + @ObfuscatedName("n") + @ObfuscatedGetter( + intValue = 3127069 + ) + int field2479; + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 1851085 + ) + int field2480; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -487308175 + intValue = 2137879269 + ) + int field2478; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 310302327 + ) + int field2482; + @ObfuscatedName("q") + @ObfuscatedGetter( + intValue = -308754063 + ) + int field2483; + @ObfuscatedName("c") + @ObfuscatedGetter( + intValue = -1275885009 ) int field2489; - @ObfuscatedName("k") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -213876459 + intValue = 586999213 ) - int field2490; - @ObfuscatedName("r") + int field2485; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 986422195 + intValue = -1374963465 ) - int field2493; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = 1071893335 - ) - int field2492; + int field2469; @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 1037928597 - ) - int field2476; - @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Ldm;" ) @Export("stream") RawPcmStream stream; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = -1898603709 + intValue = 993070793 ) - int field2495; - @ObfuscatedName("t") + int field2488; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 594099895 + intValue = -178085679 ) - int field2478; + int field2486; MusicPatchNode() { - } + } // L: 31 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(S)V", + garbageValue = "10823" ) - void method3963() { - this.patch = null; - this.rawSound = null; - this.field2477 = null; - this.stream = null; - } + void method3926() { + this.patch = null; // L: 34 + this.rawSound = null; // L: 35 + this.field2472 = null; // L: 36 + this.stream = null; // L: 37 + } // L: 38 - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lig;II)V", - garbageValue = "2117396915" + descriptor = "(IB)Ljd;", + garbageValue = "-111" ) - static void method3968(Archive var0, int var1) { - if (UserComparator9.NetCache_reference != null) { - UserComparator9.NetCache_reference.offset = var1 * 8 + 5; - int var2 = UserComparator9.NetCache_reference.readInt(); - int var3 = UserComparator9.NetCache_reference.readInt(); - var0.loadIndex(var2, var3); + public static HitSplatDefinition method3929(int var0) { + HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); // L: 46 + if (var1 != null) { // L: 47 + return var1; } else { - WorldMapEvent.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); - NetCache.NetCache_archives[var1] = var0; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "2076016155" - ) - public static boolean method3966() { - ReflectionCheck var0 = (ReflectionCheck)class105.reflectionChecks.last(); - return var0 != null; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-6" - ) - static void method3970() { - try { - File var0 = new File(ArchiveLoader.userHomeDirectory, "random.dat"); - int var2; - if (var0.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); - } else { - label36: - for (int var1 = 0; var1 < InterfaceParent.field590.length; ++var1) { - for (var2 = 0; var2 < class234.field3096.length; ++var2) { - File var3 = new File(class234.field3096[var2] + InterfaceParent.field590[var1] + File.separatorChar + "random.dat"); - if (var3.exists()) { - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0); - break label36; - } - } - } + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); // L: 48 + var1 = new HitSplatDefinition(); // L: 49 + if (var2 != null) { // L: 50 + var1.decode(new Buffer(var2)); } - if (JagexCache.JagexCache_randomDat == null) { - RandomAccessFile var4 = new RandomAccessFile(var0, "rw"); - var2 = var4.read(); - var4.seek(0L); - var4.write(var2); - var4.seek(0L); - var4.close(); - JagexCache.JagexCache_randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0); - } - } catch (IOException var5) { + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); // L: 51 + return var1; // L: 52 } - } - @ObfuscatedName("c") + @ObfuscatedName("ka") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "158312448" + descriptor = "(Ljava/lang/String;B)V", + garbageValue = "-27" ) - static int method3964(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - if (var0 == ScriptOpcodes.CC_GETX) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.x; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETY) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.y; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.width; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.height; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.parentId; - return 1; - } else { - return 2; + @Export("Clan_joinChat") + static final void Clan_joinChat(String var0) { + if (!var0.equals("")) { // L: 10695 + PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2324, Client.packetWriter.isaacCipher); // L: 10697 + var1.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var0)); // L: 10698 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 10699 + Client.packetWriter.addNode(var1); // L: 10700 } - } - - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "-1086642561" - ) - static int method3969(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.SOUND_SYNTH) { - UrlRequester.Interpreter_intStackSize -= 3; - AbstractWorldMapIcon.queueSoundEffect(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize], Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_SONG) { - UserComparator9.playSong(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { - UrlRequester.Interpreter_intStackSize -= 2; - MouseRecorder.playSoundJingle(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize], Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); - return 1; - } else { - return 2; - } - } - - @ObfuscatedName("je") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "-1185349902" - ) - @Export("updateRootInterface") - static final void updateRootInterface(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (UserComparator4.loadInterface(var0)) { - class9.updateInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6); - } - } + } // L: 10701 } diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index ed52f7620f..aa47b2880b 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -4,112 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gp") +@ObfuscatedName("go") @Implements("MusicPatchNode2") public class MusicPatchNode2 { - @ObfuscatedName("fj") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lls;" ) - @Export("fontPlain12") - static Font fontPlain12; - @ObfuscatedName("m") - byte[] field2424; - @ObfuscatedName("o") - byte[] field2429; - @ObfuscatedName("q") + @Export("options_buttons_2Sprite") + static IndexedSprite options_buttons_2Sprite; + @ObfuscatedName("z") + byte[] field2426; + @ObfuscatedName("k") + byte[] field2433; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 2005334705 - ) - int field2426; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1648638881 - ) - int field2427; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 905436641 - ) - int field2428; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 759232079 - ) - int field2435; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -154479383 - ) - int field2430; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 566366641 - ) - int field2431; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1910724783 + intValue = -1592616107 ) int field2425; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1659545793 + ) + int field2427; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 797409947 + ) + int field2428; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 172516803 + ) + int field2429; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1393523029 + ) + int field2430; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 369539099 + ) + int field2431; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 1425584275 + ) + int field2432; MusicPatchNode2() { - } - - @ObfuscatedName("ev") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "4" - ) - static int method3820() { - if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { - int var0 = 0; - - for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { - var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; - } - - return var0 * 10000 / Client.field945; - } else { - return 10000; - } - } - - @ObfuscatedName("gs") - @ObfuscatedSignature( - descriptor = "(Lbt;I)V", - garbageValue = "486554393" - ) - static final void method3819(PendingSpawn var0) { - long var1 = 0L; - int var3 = -1; - int var4 = 0; - int var5 = 0; - if (var0.type == 0) { - var1 = UserComparator3.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 1) { - var1 = UserComparator3.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 2) { - var1 = UserComparator3.scene.getGameObjectTag(var0.plane, var0.x, var0.y); - } - - if (var0.type == 3) { - var1 = UserComparator3.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); - } - - if (var1 != 0L) { - int var6 = UserComparator3.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); - var3 = Language.Entity_unpackID(var1); - var4 = var6 & 31; - var5 = var6 >> 6 & 3; - } - - var0.objectId = var3; - var0.field957 = var4; - var0.field956 = var5; - } + } // L: 14 } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index ce4b2a5ea4..518af23b56 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -1,139 +1,140 @@ -import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hj") +@ObfuscatedName("hb") @Implements("MusicPatchPcmStream") public class MusicPatchPcmStream extends PcmStream { - @ObfuscatedName("aw") - @Export("garbageCollector") - static GarbageCollectorMXBean garbageCollector; - @ObfuscatedName("m") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Llr;" + ) + static Bounds field2519; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lge;" ) @Export("superStream") MidiPcmStream superStream; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("queue") NodeDeque queue; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Ldh;" ) @Export("mixer") PcmStreamMixer mixer; @ObfuscatedSignature( - descriptor = "(Lgw;)V" + descriptor = "(Lge;)V" ) MusicPatchPcmStream(MidiPcmStream var1) { - this.queue = new NodeDeque(); - this.mixer = new PcmStreamMixer(); - this.superStream = var1; - } + this.queue = new NodeDeque(); // L: 11 + this.mixer = new PcmStreamMixer(); // L: 12 + this.superStream = var1; // L: 15 + } // L: 16 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lhm;[IIIIB)V", - garbageValue = "7" + descriptor = "(Lhe;[IIIII)V", + garbageValue = "770177978" ) - void method4040(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { - if ((this.superStream.field2460[var1.field2479] & 4) != 0 && var1.field2490 < 0) { - int var6 = this.superStream.field2454[var1.field2479] / class237.field3113; + void method3993(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) { + if ((this.superStream.field2453[var1.field2484] & 4) != 0 && var1.field2483 < 0) { // L: 73 + int var6 = this.superStream.field2442[var1.field2484] / PcmPlayer.field1447; // L: 74 while (true) { - int var7 = (var6 + 1048575 - var1.field2478) / var6; - if (var7 > var4) { - var1.field2478 += var4 * var6; + int var7 = (var6 + 1048575 - var1.field2486) / var6; // L: 76 + if (var7 > var4) { // L: 77 + var1.field2486 += var4 * var6; // L: 99 break; } - var1.stream.fill(var2, var3, var7); - var3 += var7; - var4 -= var7; - var1.field2478 += var7 * var6 - 1048576; - int var8 = class237.field3113 / 100; - int var9 = 262144 / var6; - if (var9 < var8) { + var1.stream.fill(var2, var3, var7); // L: 78 + var3 += var7; // L: 79 + var4 -= var7; // L: 80 + var1.field2486 += var7 * var6 - 1048576; // L: 81 + int var8 = PcmPlayer.field1447 / 100; // L: 82 + int var9 = 262144 / var6; // L: 83 + if (var9 < var8) { // L: 84 var8 = var9; } - RawPcmStream var10 = var1.stream; - if (this.superStream.field2463[var1.field2479] == 0) { - var1.stream = RawPcmStream.method2674(var1.rawSound, var10.method2747(), var10.method2680(), var10.method2710()); + RawPcmStream var10 = var1.stream; // L: 85 + if (this.superStream.field2441[var1.field2484] == 0) { // L: 86 + var1.stream = RawPcmStream.method2638(var1.rawSound, var10.method2687(), var10.method2644(), var10.method2675()); // L: 87 } else { - var1.stream = RawPcmStream.method2674(var1.rawSound, var10.method2747(), 0, var10.method2710()); - this.superStream.method3852(var1, var1.patch.field2521[var1.field2481] < 0); - var1.stream.method2685(var8, var10.method2680()); + var1.stream = RawPcmStream.method2638(var1.rawSound, var10.method2687(), 0, var10.method2675()); // L: 90 + this.superStream.method3817(var1, var1.patch.field2510[var1.field2474] < 0); // L: 91 + var1.stream.method2744(var8, var10.method2644()); // L: 92 } - if (var1.patch.field2521[var1.field2481] < 0) { + if (var1.patch.field2510[var1.field2474] < 0) { // L: 94 var1.stream.setNumLoops(-1); } - var10.method2732(var8); - var10.fill(var2, var3, var5 - var3); - if (var10.method2691()) { + var10.method2681(var8); // L: 95 + var10.fill(var2, var3, var5 - var3); // L: 96 + if (var10.method2655()) { // L: 97 this.mixer.addSubStream(var10); } } } - var1.stream.fill(var2, var3, var4); - } + var1.stream.fill(var2, var3, var4); // L: 101 + } // L: 102 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lhm;II)V", - garbageValue = "948558076" + descriptor = "(Lhe;II)V", + garbageValue = "-1243702200" ) - void method4041(MusicPatchNode var1, int var2) { - if ((this.superStream.field2460[var1.field2479] & 4) != 0 && var1.field2490 < 0) { - int var3 = this.superStream.field2454[var1.field2479] / class237.field3113; - int var4 = (var3 + 1048575 - var1.field2478) / var3; - var1.field2478 = var3 * var2 + var1.field2478 & 1048575; - if (var4 <= var2) { - if (this.superStream.field2463[var1.field2479] == 0) { - var1.stream = RawPcmStream.method2674(var1.rawSound, var1.stream.method2747(), var1.stream.method2680(), var1.stream.method2710()); + void method3998(MusicPatchNode var1, int var2) { + if ((this.superStream.field2453[var1.field2484] & 4) != 0 && var1.field2483 < 0) { // L: 105 + int var3 = this.superStream.field2442[var1.field2484] / PcmPlayer.field1447; // L: 106 + int var4 = (var3 + 1048575 - var1.field2486) / var3; // L: 107 + var1.field2486 = var3 * var2 + var1.field2486 & 1048575; // L: 108 + if (var4 <= var2) { // L: 109 + if (this.superStream.field2441[var1.field2484] == 0) { // L: 110 + var1.stream = RawPcmStream.method2638(var1.rawSound, var1.stream.method2687(), var1.stream.method2644(), var1.stream.method2675()); // L: 111 } else { - var1.stream = RawPcmStream.method2674(var1.rawSound, var1.stream.method2747(), 0, var1.stream.method2710()); - this.superStream.method3852(var1, var1.patch.field2521[var1.field2481] < 0); + var1.stream = RawPcmStream.method2638(var1.rawSound, var1.stream.method2687(), 0, var1.stream.method2675()); // L: 114 + this.superStream.method3817(var1, var1.patch.field2510[var1.field2474] < 0); // L: 115 } - if (var1.patch.field2521[var1.field2481] < 0) { + if (var1.patch.field2510[var1.field2474] < 0) { // L: 117 var1.stream.setNumLoops(-1); } - var2 = var1.field2478 / var3; + var2 = var1.field2486 / var3; // L: 118 } } - var1.stream.skip(var2); - } + var1.stream.skip(var2); // L: 121 + } // L: 122 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Ldf;" + descriptor = "()Ldc;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); - if (var1 == null) { + MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); // L: 19 + if (var1 == null) { // L: 20 return null; } else { return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); } } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "()Ldf;" + descriptor = "()Ldc;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { @@ -141,77 +142,87 @@ public class MusicPatchPcmStream extends PcmStream { do { var1 = (MusicPatchNode)this.queue.previous(); if (var1 == null) { - return null; + return null; // L: 28 } - } while(var1.stream == null); + } while(var1.stream == null); // L: 29 return var1.stream; } - @ObfuscatedName("u") - protected int vmethod4037() { - return 0; + @ObfuscatedName("w") + protected int vmethod3987() { + return 0; // L: 34 } - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("fill") protected void fill(int[] var1, int var2, int var3) { - this.mixer.fill(var1, var2, var3); + this.mixer.fill(var1, var2, var3); // L: 40 - for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method3870(var6)) { - int var4 = var2; - int var5 = var3; + for (MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) { // L: 41 + if (!this.superStream.method3838(var6)) { // L: 42 + int var4 = var2; // L: 43 + int var5 = var3; // L: 44 do { - if (var5 <= var6.field2495) { - this.method4040(var6, var1, var4, var5, var4 + var5); - var6.field2495 -= var5; + if (var5 <= var6.field2488) { // L: 45 + this.method3993(var6, var1, var4, var5, var5 + var4); // L: 51 + var6.field2488 -= var5; // L: 52 break; } - this.method4040(var6, var1, var4, var6.field2495, var5 + var4); - var4 += var6.field2495; - var5 -= var6.field2495; - } while(!this.superStream.method3897(var6, var1, var4, var5)); + this.method3993(var6, var1, var4, var6.field2488, var5 + var4); // L: 46 + var4 += var6.field2488; // L: 47 + var5 -= var6.field2488; // L: 48 + } while(!this.superStream.method3839(var6, var1, var4, var5)); // L: 49 } } - } + } // L: 54 - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("skip") protected void skip(int var1) { - this.mixer.skip(var1); + this.mixer.skip(var1); // L: 58 - for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { - if (!this.superStream.method3870(var3)) { - int var2 = var1; + for (MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) { // L: 59 + if (!this.superStream.method3838(var3)) { // L: 60 + int var2 = var1; // L: 61 do { - if (var2 <= var3.field2495) { - this.method4041(var3, var2); - var3.field2495 -= var2; + if (var2 <= var3.field2488) { // L: 62 + this.method3998(var3, var2); // L: 67 + var3.field2488 -= var2; // L: 68 break; } - this.method4041(var3, var3.field2495); - var2 -= var3.field2495; - } while(!this.superStream.method3897(var3, (int[])null, 0, var2)); + this.method3998(var3, var3.field2488); // L: 63 + var2 -= var3.field2488; // L: 64 + } while(!this.superStream.method3839(var3, (int[])null, 0, var2)); // L: 65 } } - } + } // L: 70 - @ObfuscatedName("w") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-836395445" + descriptor = "(II)Liq;", + garbageValue = "-367277844" ) - @Export("setLoginResponseString") - static void setLoginResponseString(String var0, String var1, String var2) { - Login.Login_response1 = var0; - Login.Login_response2 = var1; - Login.Login_response3 = var2; + @Export("getInvDefinition") + public static InvDefinition getInvDefinition(int var0) { + InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; + } else { + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); // L: 23 + var1 = new InvDefinition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); // L: 26 + return var1; // L: 27 + } } } diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java index e5127f5b1a..63ef5338f0 100644 --- a/runescape-client/src/main/java/MusicTrack.java +++ b/runescape-client/src/main/java/MusicTrack.java @@ -3,130 +3,130 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hz") +@ObfuscatedName("hj") @Implements("MusicTrack") public class MusicTrack extends Node { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("table") NodeHashTable table; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("midi") byte[] midi; @ObfuscatedSignature( - descriptor = "(Lkn;)V" + descriptor = "(Lkf;)V" ) MusicTrack(Buffer var1) { - var1.offset = var1.array.length - 3; - int var2 = var1.readUnsignedByte(); - int var3 = var1.readUnsignedShort(); - int var4 = var2 * 10 + 14; - var1.offset = 0; - int var5 = 0; - int var6 = 0; - int var7 = 0; - int var8 = 0; - int var9 = 0; - int var10 = 0; - int var11 = 0; - int var12 = 0; + var1.offset = var1.array.length - 3; // L: 22 + int var2 = var1.readUnsignedByte(); // L: 23 + int var3 = var1.readUnsignedShort(); // L: 24 + int var4 = var2 * 10 + 14; // L: 25 + var1.offset = 0; // L: 26 + int var5 = 0; // L: 27 + int var6 = 0; // L: 28 + int var7 = 0; // L: 29 + int var8 = 0; // L: 30 + int var9 = 0; // L: 31 + int var10 = 0; // L: 32 + int var11 = 0; // L: 33 + int var12 = 0; // L: 34 int var13; int var14; int var15; - for (var13 = 0; var13 < var2; ++var13) { - var14 = -1; + for (var13 = 0; var13 < var2; ++var13) { // L: 35 + var14 = -1; // L: 36 while (true) { - var15 = var1.readUnsignedByte(); - if (var15 != var14) { + var15 = var1.readUnsignedByte(); // L: 38 + if (var15 != var14) { // L: 39 ++var4; } - var14 = var15 & 15; - if (var15 == 7) { + var14 = var15 & 15; // L: 40 + if (var15 == 7) { // L: 41 break; } - if (var15 == 23) { - ++var5; - } else if (var14 == 0) { - ++var7; - } else if (var14 == 1) { - ++var8; - } else if (var14 == 2) { - ++var6; - } else if (var14 == 3) { - ++var9; - } else if (var14 == 4) { - ++var10; - } else if (var14 == 5) { - ++var11; + if (var15 == 23) { // L: 42 + ++var5; // L: 43 + } else if (var14 == 0) { // L: 46 + ++var7; // L: 47 + } else if (var14 == 1) { // L: 50 + ++var8; // L: 51 + } else if (var14 == 2) { // L: 54 + ++var6; // L: 55 + } else if (var14 == 3) { // L: 58 + ++var9; // L: 59 + } else if (var14 == 4) { // L: 62 + ++var10; // L: 63 + } else if (var14 == 5) { // L: 66 + ++var11; // L: 67 } else { - if (var14 != 6) { - throw new RuntimeException(); + if (var14 != 6) { // L: 70 + throw new RuntimeException(); // L: 74 } - ++var12; + ++var12; // L: 71 } } } - var4 += var5 * 5; - var4 += (var7 + var8 + var6 + var9 + var11) * 2; - var4 = var4 + var10 + var12; - var13 = var1.offset; - var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12; + var4 += var5 * 5; // L: 77 + var4 += (var7 + var8 + var6 + var9 + var11) * 2; // L: 78 + var4 = var4 + var10 + var12; // L: 79 + var13 = var1.offset; // L: 80 + var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12; // L: 81 - for (var15 = 0; var15 < var14; ++var15) { + for (var15 = 0; var15 < var14; ++var15) { // L: 82 var1.readVarInt(); } - var4 += var1.offset - var13; - var15 = var1.offset; - int var16 = 0; - int var17 = 0; - int var18 = 0; - int var19 = 0; - int var20 = 0; - int var21 = 0; - int var22 = 0; - int var23 = 0; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; + var4 += var1.offset - var13; // L: 83 + var15 = var1.offset; // L: 84 + int var16 = 0; // L: 85 + int var17 = 0; // L: 86 + int var18 = 0; // L: 87 + int var19 = 0; // L: 88 + int var20 = 0; // L: 89 + int var21 = 0; // L: 90 + int var22 = 0; // L: 91 + int var23 = 0; // L: 92 + int var24 = 0; // L: 93 + int var25 = 0; // L: 94 + int var26 = 0; // L: 95 + int var27 = 0; // L: 96 + int var28 = 0; // L: 97 int var29; - for (var29 = 0; var29 < var6; ++var29) { - var28 = var28 + var1.readUnsignedByte() & 127; - if (var28 != 0 && var28 != 32) { - if (var28 == 1) { + for (var29 = 0; var29 < var6; ++var29) { // L: 98 + var28 = var28 + var1.readUnsignedByte() & 127; // L: 99 + if (var28 != 0 && var28 != 32) { // L: 100 + if (var28 == 1) { // L: 101 ++var16; - } else if (var28 == 33) { + } else if (var28 == 33) { // L: 102 ++var17; - } else if (var28 == 7) { + } else if (var28 == 7) { // L: 103 ++var18; - } else if (var28 == 39) { + } else if (var28 == 39) { // L: 104 ++var19; - } else if (var28 == 10) { + } else if (var28 == 10) { // L: 105 ++var20; - } else if (var28 == 42) { + } else if (var28 == 42) { // L: 106 ++var21; - } else if (var28 == 99) { + } else if (var28 == 99) { // L: 107 ++var22; - } else if (var28 == 98) { + } else if (var28 == 98) { // L: 108 ++var23; - } else if (var28 == 101) { + } else if (var28 == 101) { // L: 109 ++var24; - } else if (var28 == 100) { + } else if (var28 == 100) { // L: 110 ++var25; - } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { - ++var27; + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { // L: 111 + ++var27; // L: 112 } else { ++var26; } @@ -135,153 +135,153 @@ public class MusicTrack extends Node { } } - var29 = 0; - int var30 = var1.offset; - var1.offset += var26; - int var31 = var1.offset; - var1.offset += var11; - int var32 = var1.offset; - var1.offset += var10; - int var33 = var1.offset; - var1.offset += var9; - int var34 = var1.offset; - var1.offset += var16; - int var35 = var1.offset; - var1.offset += var18; - int var36 = var1.offset; - var1.offset += var20; - int var37 = var1.offset; - var1.offset += var7 + var8 + var11; - int var38 = var1.offset; - var1.offset += var7; - int var39 = var1.offset; - var1.offset += var27; - int var40 = var1.offset; - var1.offset += var8; - int var41 = var1.offset; - var1.offset += var17; - int var42 = var1.offset; - var1.offset += var19; - int var43 = var1.offset; - var1.offset += var21; - int var44 = var1.offset; - var1.offset += var12; - int var45 = var1.offset; - var1.offset += var9; - int var46 = var1.offset; - var1.offset += var22; - int var47 = var1.offset; - var1.offset += var23; - int var48 = var1.offset; - var1.offset += var24; - int var49 = var1.offset; - var1.offset += var25; - int var50 = var1.offset; - var1.offset += var5 * 3; - this.midi = new byte[var4]; - Buffer var51 = new Buffer(this.midi); - var51.writeInt(1297377380); - var51.writeInt(6); - var51.writeShort(var2 > 1 ? 1 : 0); - var51.writeShort(var2); - var51.writeShort(var3); - var1.offset = var13; - int var52 = 0; - int var53 = 0; - int var54 = 0; - int var55 = 0; - int var56 = 0; - int var57 = 0; - int var58 = 0; - int[] var59 = new int[128]; - var28 = 0; + var29 = 0; // L: 114 + int var30 = var1.offset; // L: 115 + var1.offset += var26; // L: 116 + int var31 = var1.offset; // L: 117 + var1.offset += var11; // L: 118 + int var32 = var1.offset; // L: 119 + var1.offset += var10; // L: 120 + int var33 = var1.offset; // L: 121 + var1.offset += var9; // L: 122 + int var34 = var1.offset; // L: 123 + var1.offset += var16; // L: 124 + int var35 = var1.offset; // L: 125 + var1.offset += var18; // L: 126 + int var36 = var1.offset; // L: 127 + var1.offset += var20; // L: 128 + int var37 = var1.offset; // L: 129 + var1.offset += var7 + var8 + var11; // L: 130 + int var38 = var1.offset; // L: 131 + var1.offset += var7; // L: 132 + int var39 = var1.offset; // L: 133 + var1.offset += var27; // L: 134 + int var40 = var1.offset; // L: 135 + var1.offset += var8; // L: 136 + int var41 = var1.offset; // L: 137 + var1.offset += var17; // L: 138 + int var42 = var1.offset; // L: 139 + var1.offset += var19; // L: 140 + int var43 = var1.offset; // L: 141 + var1.offset += var21; // L: 142 + int var44 = var1.offset; // L: 143 + var1.offset += var12; // L: 144 + int var45 = var1.offset; // L: 145 + var1.offset += var9; // L: 146 + int var46 = var1.offset; // L: 147 + var1.offset += var22; // L: 148 + int var47 = var1.offset; // L: 149 + var1.offset += var23; // L: 150 + int var48 = var1.offset; // L: 151 + var1.offset += var24; // L: 152 + int var49 = var1.offset; // L: 153 + var1.offset += var25; // L: 154 + int var50 = var1.offset; // L: 155 + var1.offset += var5 * 3; // L: 156 + this.midi = new byte[var4]; // L: 157 + Buffer var51 = new Buffer(this.midi); // L: 158 + var51.writeInt(1297377380); // L: 159 + var51.writeInt(6); // L: 160 + var51.writeShort(var2 > 1 ? 1 : 0); // L: 161 + var51.writeShort(var2); // L: 162 + var51.writeShort(var3); // L: 163 + var1.offset = var13; // L: 164 + int var52 = 0; // L: 165 + int var53 = 0; // L: 166 + int var54 = 0; // L: 167 + int var55 = 0; // L: 168 + int var56 = 0; // L: 169 + int var57 = 0; // L: 170 + int var58 = 0; // L: 171 + int[] var59 = new int[128]; // L: 172 + var28 = 0; // L: 173 - label221: - for (int var60 = 0; var60 < var2; ++var60) { - var51.writeInt(1297379947); - var51.offset += 4; - int var61 = var51.offset; - int var62 = -1; + label243: + for (int var60 = 0; var60 < var2; ++var60) { // L: 174 + var51.writeInt(1297379947); // L: 175 + var51.offset += 4; // L: 176 + int var61 = var51.offset; // L: 177 + int var62 = -1; // L: 178 while (true) { while (true) { - int var63 = var1.readVarInt(); - var51.writeVarInt(var63); - int var64 = var1.array[var29++] & 255; - boolean var65 = var64 != var62; - var62 = var64 & 15; - if (var64 == 7) { - if (var65) { + int var63 = var1.readVarInt(); // L: 180 + var51.writeVarInt(var63); // L: 181 + int var64 = var1.array[var29++] & 255; // L: 182 + boolean var65 = var64 != var62; // L: 183 + var62 = var64 & 15; // L: 184 + if (var64 == 7) { // L: 185 + if (var65) { // L: 186 var51.writeByte(255); } - var51.writeByte(47); - var51.writeByte(0); - var51.writeLengthInt(var51.offset - var61); - continue label221; + var51.writeByte(47); // L: 187 + var51.writeByte(0); // L: 188 + var51.writeLengthInt(var51.offset - var61); // L: 269 + continue label243; } - if (var64 == 23) { - if (var65) { + if (var64 == 23) { // L: 191 + if (var65) { // L: 192 var51.writeByte(255); } - var51.writeByte(81); - var51.writeByte(3); - var51.writeByte(var1.array[var50++]); - var51.writeByte(var1.array[var50++]); - var51.writeByte(var1.array[var50++]); + var51.writeByte(81); // L: 193 + var51.writeByte(3); // L: 194 + var51.writeByte(var1.array[var50++]); // L: 195 + var51.writeByte(var1.array[var50++]); // L: 196 + var51.writeByte(var1.array[var50++]); // L: 197 } else { - var52 ^= var64 >> 4; - if (var62 == 0) { - if (var65) { + var52 ^= var64 >> 4; // L: 200 + if (var62 == 0) { // L: 201 + if (var65) { // L: 202 var51.writeByte(var52 + 144); } - var53 += var1.array[var37++]; - var54 += var1.array[var38++]; - var51.writeByte(var53 & 127); - var51.writeByte(var54 & 127); - } else if (var62 == 1) { - if (var65) { + var53 += var1.array[var37++]; // L: 203 + var54 += var1.array[var38++]; // L: 204 + var51.writeByte(var53 & 127); // L: 205 + var51.writeByte(var54 & 127); // L: 206 + } else if (var62 == 1) { // L: 209 + if (var65) { // L: 210 var51.writeByte(var52 + 128); } - var53 += var1.array[var37++]; - var55 += var1.array[var40++]; - var51.writeByte(var53 & 127); - var51.writeByte(var55 & 127); - } else if (var62 == 2) { - if (var65) { + var53 += var1.array[var37++]; // L: 211 + var55 += var1.array[var40++]; // L: 212 + var51.writeByte(var53 & 127); // L: 213 + var51.writeByte(var55 & 127); // L: 214 + } else if (var62 == 2) { // L: 217 + if (var65) { // L: 218 var51.writeByte(var52 + 176); } - var28 = var28 + var1.array[var15++] & 127; - var51.writeByte(var28); + var28 = var28 + var1.array[var15++] & 127; // L: 219 + var51.writeByte(var28); // L: 220 byte var66; - if (var28 != 0 && var28 != 32) { - if (var28 == 1) { + if (var28 != 0 && var28 != 32) { // L: 222 + if (var28 == 1) { // L: 223 var66 = var1.array[var34++]; - } else if (var28 == 33) { + } else if (var28 == 33) { // L: 224 var66 = var1.array[var41++]; - } else if (var28 == 7) { + } else if (var28 == 7) { // L: 225 var66 = var1.array[var35++]; - } else if (var28 == 39) { + } else if (var28 == 39) { // L: 226 var66 = var1.array[var42++]; - } else if (var28 == 10) { + } else if (var28 == 10) { // L: 227 var66 = var1.array[var36++]; - } else if (var28 == 42) { + } else if (var28 == 42) { // L: 228 var66 = var1.array[var43++]; - } else if (var28 == 99) { + } else if (var28 == 99) { // L: 229 var66 = var1.array[var46++]; - } else if (var28 == 98) { + } else if (var28 == 98) { // L: 230 var66 = var1.array[var47++]; - } else if (var28 == 101) { + } else if (var28 == 101) { // L: 231 var66 = var1.array[var48++]; - } else if (var28 == 100) { + } else if (var28 == 100) { // L: 232 var66 = var1.array[var49++]; - } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { - var66 = var1.array[var39++]; + } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) { // L: 233 + var66 = var1.array[var39++]; // L: 234 } else { var66 = var1.array[var30++]; } @@ -289,146 +289,146 @@ public class MusicTrack extends Node { var66 = var1.array[var44++]; } - int var67 = var66 + var59[var28]; - var59[var28] = var67; - var51.writeByte(var67 & 127); - } else if (var62 == 3) { - if (var65) { + int var67 = var66 + var59[var28]; // L: 235 + var59[var28] = var67; // L: 236 + var51.writeByte(var67 & 127); // L: 237 + } else if (var62 == 3) { // L: 240 + if (var65) { // L: 241 var51.writeByte(var52 + 224); } - var56 += var1.array[var45++]; - var56 += var1.array[var33++] << 7; - var51.writeByte(var56 & 127); - var51.writeByte(var56 >> 7 & 127); - } else if (var62 == 4) { - if (var65) { + var56 += var1.array[var45++]; // L: 242 + var56 += var1.array[var33++] << 7; // L: 243 + var51.writeByte(var56 & 127); // L: 244 + var51.writeByte(var56 >> 7 & 127); // L: 245 + } else if (var62 == 4) { // L: 248 + if (var65) { // L: 249 var51.writeByte(var52 + 208); } - var57 += var1.array[var32++]; - var51.writeByte(var57 & 127); - } else if (var62 == 5) { - if (var65) { + var57 += var1.array[var32++]; // L: 250 + var51.writeByte(var57 & 127); // L: 251 + } else if (var62 == 5) { // L: 254 + if (var65) { // L: 255 var51.writeByte(var52 + 160); } - var53 += var1.array[var37++]; - var58 += var1.array[var31++]; - var51.writeByte(var53 & 127); - var51.writeByte(var58 & 127); + var53 += var1.array[var37++]; // L: 256 + var58 += var1.array[var31++]; // L: 257 + var51.writeByte(var53 & 127); // L: 258 + var51.writeByte(var58 & 127); // L: 259 } else { - if (var62 != 6) { - throw new RuntimeException(); + if (var62 != 6) { // L: 262 + throw new RuntimeException(); // L: 267 } - if (var65) { + if (var65) { // L: 263 var51.writeByte(var52 + 192); } - var51.writeByte(var1.array[var44++]); + var51.writeByte(var1.array[var44++]); // L: 264 } } } } } - } + } // L: 271 - @ObfuscatedName("o") - void method4057() { - if (this.table == null) { - this.table = new NodeHashTable(16); - int[] var1 = new int[16]; - int[] var2 = new int[16]; - var2[9] = 128; - var1[9] = 128; - MidiFileReader var4 = new MidiFileReader(this.midi); - int var5 = var4.trackCount(); + @ObfuscatedName("k") + void method4008() { + if (this.table == null) { // L: 274 + this.table = new NodeHashTable(16); // L: 275 + int[] var1 = new int[16]; // L: 276 + int[] var2 = new int[16]; // L: 277 + var2[9] = 128; // L: 279 + var1[9] = 128; // L: 280 + MidiFileReader var4 = new MidiFileReader(this.midi); // L: 281 + int var5 = var4.trackCount(); // L: 282 int var6; - for (var6 = 0; var6 < var5; ++var6) { - var4.gotoTrack(var6); - var4.readTrackLength(var6); - var4.markTrackPosition(var6); + for (var6 = 0; var6 < var5; ++var6) { // L: 283 + var4.gotoTrack(var6); // L: 284 + var4.readTrackLength(var6); // L: 285 + var4.markTrackPosition(var6); // L: 286 } - label53: + label56: do { while (true) { - var6 = var4.getPrioritizedTrack(); - int var7 = var4.trackLengths[var6]; + var6 = var4.getPrioritizedTrack(); // L: 289 + int var7 = var4.trackLengths[var6]; // L: 290 - while (var7 == var4.trackLengths[var6]) { - var4.gotoTrack(var6); - int var8 = var4.readMessage(var6); - if (var8 == 1) { - var4.setTrackDone(); - var4.markTrackPosition(var6); - continue label53; + while (var7 == var4.trackLengths[var6]) { // L: 291 + var4.gotoTrack(var6); // L: 292 + int var8 = var4.readMessage(var6); // L: 293 + if (var8 == 1) { // L: 294 + var4.setTrackDone(); // L: 295 + var4.markTrackPosition(var6); // L: 296 + continue label56; } - int var9 = var8 & 240; + int var9 = var8 & 240; // L: 300 int var10; int var11; int var12; - if (var9 == 176) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var12 = var8 >> 16 & 127; - if (var11 == 0) { + if (var9 == 176) { // L: 301 + var10 = var8 & 15; // L: 302 + var11 = var8 >> 8 & 127; // L: 303 + var12 = var8 >> 16 & 127; // L: 304 + if (var11 == 0) { // L: 305 var1[var10] = (var12 << 14) + (var1[var10] & -2080769); } - if (var11 == 32) { + if (var11 == 32) { // L: 306 var1[var10] = (var1[var10] & -16257) + (var12 << 7); } } - if (var9 == 192) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var2[var10] = var11 + var1[var10]; + if (var9 == 192) { // L: 308 + var10 = var8 & 15; // L: 309 + var11 = var8 >> 8 & 127; // L: 310 + var2[var10] = var11 + var1[var10]; // L: 311 } - if (var9 == 144) { - var10 = var8 & 15; - var11 = var8 >> 8 & 127; - var12 = var8 >> 16 & 127; - if (var12 > 0) { - int var13 = var2[var10]; - ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13); - if (var14 == null) { - var14 = new ByteArrayNode(new byte[128]); - this.table.put(var14, (long)var13); + if (var9 == 144) { // L: 313 + var10 = var8 & 15; // L: 314 + var11 = var8 >> 8 & 127; // L: 315 + var12 = var8 >> 16 & 127; // L: 316 + if (var12 > 0) { // L: 317 + int var13 = var2[var10]; // L: 318 + ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13); // L: 319 + if (var14 == null) { // L: 320 + var14 = new ByteArrayNode(new byte[128]); // L: 321 + this.table.put(var14, (long)var13); // L: 322 } - var14.byteArray[var11] = 1; + var14.byteArray[var11] = 1; // L: 324 } } - var4.readTrackLength(var6); - var4.markTrackPosition(var6); + var4.readTrackLength(var6); // L: 327 + var4.markTrackPosition(var6); // L: 328 } } - } while(!var4.isDone()); + } while(!var4.isDone()); // L: 297 } - } + } // L: 331 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("clear") void clear() { - this.table = null; - } + this.table = null; // L: 334 + } // L: 335 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lic;II)Lhz;" + descriptor = "(Lic;II)Lhj;" ) @Export("readTrack") - public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new MusicTrack(new Buffer(var3)); + static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) { + byte[] var3 = var0.takeFile(var1, var2); // L: 16 + return var3 == null ? null : new MusicTrack(new Buffer(var3)); // L: 17 } } diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index 684e0ab72c..ceca11c199 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -3,207 +3,165 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cv") +@ObfuscatedName("cw") @Implements("NPC") public final class NPC extends Actor { - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lic;" - ) - @Export("SpotAnimationDefinition_modelArchive") - static AbstractArchive SpotAnimationDefinition_modelArchive; - @ObfuscatedName("p") - @Export("SpriteBuffer_yOffsets") - static int[] SpriteBuffer_yOffsets; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Ljz;" + descriptor = "Ljx;" ) @Export("definition") NPCDefinition definition; NPC() { - } + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(IBI)V", - garbageValue = "-676669615" + garbageValue = "307957287" ) - final void method2150(int var1, byte var2) { - int var3 = super.pathX[0]; - int var4 = super.pathY[0]; - if (var1 == 0) { - --var3; + final void method2115(int var1, byte var2) { + int var3 = super.pathX[0]; // L: 15 + int var4 = super.pathY[0]; // L: 16 + if (var1 == 0) { // L: 17 + --var3; // L: 18 + ++var4; // L: 19 + } + + if (var1 == 1) { // L: 21 ++var4; } - if (var1 == 1) { - ++var4; + if (var1 == 2) { // L: 22 + ++var3; // L: 23 + ++var4; // L: 24 } - if (var1 == 2) { - ++var3; - ++var4; - } - - if (var1 == 3) { + if (var1 == 3) { // L: 26 --var3; } - if (var1 == 4) { + if (var1 == 4) { // L: 27 ++var3; } - if (var1 == 5) { - --var3; + if (var1 == 5) { // L: 28 + --var3; // L: 29 + --var4; // L: 30 + } + + if (var1 == 6) { // L: 32 --var4; } - if (var1 == 6) { - --var4; + if (var1 == 7) { // L: 33 + ++var3; // L: 34 + --var4; // L: 35 } - if (var1 == 7) { - ++var3; - --var4; + if (super.sequence != -1 && WorldMapRegion.SequenceDefinition_get(super.sequence).field3541 == 1) { + super.sequence = -1; // L: 37 } - if (super.sequence != -1 && NetSocket.SequenceDefinition_get(super.sequence).field3560 == 1) { - super.sequence = -1; - } - - if (super.pathLength < 9) { + if (super.pathLength < 9) { // L: 38 ++super.pathLength; } - for (int var5 = super.pathLength; var5 > 0; --var5) { - super.pathX[var5] = super.pathX[var5 - 1]; - super.pathY[var5] = super.pathY[var5 - 1]; - super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; + for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39 + super.pathX[var5] = super.pathX[var5 - 1]; // L: 40 + super.pathY[var5] = super.pathY[var5 - 1]; // L: 41 + super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 42 } - super.pathX[0] = var3; - super.pathY[0] = var4; - super.pathTraversed[0] = var2; - } + super.pathX[0] = var3; // L: 44 + super.pathY[0] = var4; // L: 45 + super.pathTraversed[0] = var2; // L: 46 + } // L: 47 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IIZI)V", - garbageValue = "-1996954385" + garbageValue = "-1230759297" ) - final void method2142(int var1, int var2, boolean var3) { - if (super.sequence != -1 && NetSocket.SequenceDefinition_get(super.sequence).field3560 == 1) { + final void method2121(int var1, int var2, boolean var3) { + if (super.sequence != -1 && WorldMapRegion.SequenceDefinition_get(super.sequence).field3541 == 1) { // L: 50 super.sequence = -1; } - if (!var3) { - int var4 = var1 - super.pathX[0]; - int var5 = var2 - super.pathY[0]; - if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { - if (super.pathLength < 9) { + if (!var3) { // L: 51 + int var4 = var1 - super.pathX[0]; // L: 52 + int var5 = var2 - super.pathY[0]; // L: 53 + if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { // L: 54 + if (super.pathLength < 9) { // L: 55 ++super.pathLength; } - for (int var6 = super.pathLength; var6 > 0; --var6) { - super.pathX[var6] = super.pathX[var6 - 1]; - super.pathY[var6] = super.pathY[var6 - 1]; - super.pathTraversed[var6] = super.pathTraversed[var6 - 1]; + for (int var6 = super.pathLength; var6 > 0; --var6) { // L: 56 + super.pathX[var6] = super.pathX[var6 - 1]; // L: 57 + super.pathY[var6] = super.pathY[var6 - 1]; // L: 58 + super.pathTraversed[var6] = super.pathTraversed[var6 - 1]; // L: 59 } - super.pathX[0] = var1; - super.pathY[0] = var2; - super.pathTraversed[0] = 1; - return; + super.pathX[0] = var1; // L: 61 + super.pathY[0] = var2; // L: 62 + super.pathTraversed[0] = 1; // L: 63 + return; // L: 64 } } - super.pathLength = 0; - super.field1023 = 0; - super.field1022 = 0; - super.pathX[0] = var1; - super.pathY[0] = var2; - super.x = super.pathX[0] * 128 + super.field967 * 64; - super.y = super.field967 * 64 + super.pathY[0] * 128; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)Lef;", - garbageValue = "1832696685" - ) - @Export("getModel") - protected final Model getModel() { - if (this.definition == null) { - return null; - } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? NetSocket.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? NetSocket.SequenceDefinition_get(super.movementSequence) : null; - Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { - return null; - } else { - var3.calculateBoundsCylinder(); - super.defaultHeight = var3.height; - if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = class4.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.field1005, 0); - Model[] var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); - } - } - - if (this.definition.size == 1) { - var3.isSingleTile = true; - } - - return var3; - } - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" - ) - @Export("isVisible") - final boolean isVisible() { - return this.definition != null; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lkn;I)Ljava/lang/String;", - garbageValue = "1758966720" - ) - public static String method2157(Buffer var0) { - return UserComparator5.method3534(var0, 32767); - } + super.pathLength = 0; // L: 67 + super.field973 = 0; // L: 68 + super.field1032 = 0; // L: 69 + super.pathX[0] = var1; // L: 70 + super.pathY[0] = var2; // L: 71 + super.x = super.pathX[0] * 128 + super.field1014 * 64; // L: 72 + super.y = super.pathY[0] * 128 + super.field1014 * 64; // L: 73 + } // L: 74 @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "-25347" + descriptor = "(I)Ler;", + garbageValue = "-2026237468" ) - static void method2156() { - Players.Players_count = 0; + @Export("getModel") + protected final Model getModel() { + if (this.definition == null) { // L: 77 + return null; + } else { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapRegion.SequenceDefinition_get(super.sequence) : null; // L: 78 + SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : WorldMapRegion.SequenceDefinition_get(super.movementSequence); // L: 79 + Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80 + if (var3 == null) { // L: 81 + return null; + } else { + var3.calculateBoundsCylinder(); // L: 82 + super.defaultHeight = var3.height; // L: 83 + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84 + Model var4 = Tiles.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85 + if (var4 != null) { // L: 86 + var4.offsetBy(0, -super.field1003, 0); // L: 87 + Model[] var5 = new Model[]{var3, var4}; // L: 88 + var3 = new Model(var5, 2); // L: 89 + } + } - for (int var0 = 0; var0 < 2048; ++var0) { - Players.field1279[var0] = null; - Players.field1278[var0] = 1; + if (this.definition.size == 1) { // L: 92 + var3.isSingleTile = true; + } + + return var3; // L: 93 + } } - } - @ObfuscatedName("ai") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ldh;I)V", - garbageValue = "2097901447" + descriptor = "(I)Z", + garbageValue = "68470795" ) - public static final void method2144(PlayerProvider var0) { - HealthBarUpdate.pcmPlayerProvider = var0; + @Export("isVisible") + final boolean isVisible() { + return this.definition != null; // L: 97 } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index 5f4d2086b5..c4272967ba 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -3,715 +3,581 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jz") +@ObfuscatedName("jx") @Implements("NPCDefinition") public class NPCDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("NpcDefinition_archive") public static AbstractArchive NpcDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("NpcDefinition_modelArchive") public static AbstractArchive NpcDefinition_modelArchive; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("NpcDefinition_cached") public static EvictingDualNodeHashTable NpcDefinition_cached; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("NpcDefinition_cachedModels") public static EvictingDualNodeHashTable NpcDefinition_cachedModels; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1039013971 + intValue = -851756363 ) @Export("id") public int id; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("name") public String name; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 784542157 + intValue = -1762851059 ) @Export("size") public int size; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("models") int[] models; - @ObfuscatedName("a") - int[] field3497; - @ObfuscatedName("z") + @ObfuscatedName("g") + int[] field3492; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1307303139 + intValue = 594093455 ) @Export("idleSequence") public int idleSequence; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -677524767 + intValue = 1970335799 ) @Export("turnLeftSequence") public int turnLeftSequence; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1895421903 + intValue = 136881499 ) @Export("turnRightSequence") public int turnRightSequence; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -1701932667 + intValue = -1497603669 ) @Export("walkSequence") public int walkSequence; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -456399597 + intValue = -1405079749 ) @Export("walkBackSequence") public int walkBackSequence; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1996665451 + intValue = -950124131 ) @Export("walkLeftSequence") public int walkLeftSequence; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 49834029 + intValue = -1378189657 ) @Export("walkRightSequence") public int walkRightSequence; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("l") + @ObfuscatedName("r") @Export("actions") public String[] actions; - @ObfuscatedName("t") + @ObfuscatedName("u") @Export("drawMapDot") public boolean drawMapDot; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1641745369 + intValue = -442899961 ) @Export("combatLevel") public int combatLevel; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 610196697 + intValue = -337235261 ) @Export("widthScale") int widthScale; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -689457805 + intValue = -541213457 ) @Export("heightScale") int heightScale; - @ObfuscatedName("f") + @ObfuscatedName("e") @Export("isVisible") public boolean isVisible; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -1624183581 + intValue = -888518163 ) @Export("ambient") int ambient; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -2126781909 + intValue = -405765695 ) @Export("contrast") int contrast; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 155267533 + intValue = -1421208063 ) @Export("headIconPrayer") public int headIconPrayer; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -125141041 + intValue = 754705433 ) @Export("rotation") public int rotation; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("transforms") public int[] transforms; - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 618925133 + intValue = -1534025905 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1800109047 + intValue = -1959008785 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("isInteractable") public boolean isInteractable; - @ObfuscatedName("ak") + @ObfuscatedName("aa") @Export("isClickable") public boolean isClickable; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @Export("isFollower") public boolean isFollower; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llq;" ) @Export("params") IterableNodeHashTable params; static { - NpcDefinition_cached = new EvictingDualNodeHashTable(64); - NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); + NpcDefinition_cached = new EvictingDualNodeHashTable(64); // L: 18 + NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50); // L: 19 } NPCDefinition() { - this.name = "null"; - this.size = 1; - this.idleSequence = -1; - this.turnLeftSequence = -1; - this.turnRightSequence = -1; - this.walkSequence = -1; - this.walkBackSequence = -1; - this.walkLeftSequence = -1; - this.walkRightSequence = -1; - this.actions = new String[5]; - this.drawMapDot = true; - this.combatLevel = -1; - this.widthScale = 128; - this.heightScale = 128; - this.isVisible = false; - this.ambient = 0; - this.contrast = 0; - this.headIconPrayer = -1; - this.rotation = 32; - this.transformVarbit = -1; - this.transformVarp = -1; - this.isInteractable = true; - this.isClickable = true; - this.isFollower = false; - } + this.name = "null"; // L: 21 + this.size = 1; // L: 22 + this.idleSequence = -1; // L: 25 + this.turnLeftSequence = -1; // L: 26 + this.turnRightSequence = -1; // L: 27 + this.walkSequence = -1; // L: 28 + this.walkBackSequence = -1; // L: 29 + this.walkLeftSequence = -1; // L: 30 + this.walkRightSequence = -1; // L: 31 + this.actions = new String[5]; // L: 36 + this.drawMapDot = true; // L: 37 + this.combatLevel = -1; // L: 38 + this.widthScale = 128; // L: 39 + this.heightScale = 128; // L: 40 + this.isVisible = false; // L: 41 + this.ambient = 0; // L: 42 + this.contrast = 0; // L: 43 + this.headIconPrayer = -1; // L: 44 + this.rotation = 32; // L: 45 + this.transformVarbit = -1; // L: 47 + this.transformVarp = -1; // L: 48 + this.isInteractable = true; // L: 49 + this.isClickable = true; // L: 50 + this.isFollower = false; // L: 51 + } // L: 54 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-515379309" + garbageValue = "-1451445441" ) @Export("postDecode") void postDecode() { - } + } // L: 68 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1111522508" + descriptor = "(Lkf;I)V", + garbageValue = "289970781" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 72 + if (var2 == 0) { // L: 73 + return; // L: 76 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 74 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "-1876580246" + descriptor = "(Lkf;II)V", + garbageValue = "-1568291099" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { - var3 = var1.readUnsignedByte(); - this.models = new int[var3]; + if (var2 == 1) { // L: 79 + var3 = var1.readUnsignedByte(); // L: 80 + this.models = new int[var3]; // L: 81 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 82 this.models[var4] = var1.readUnsignedShort(); } - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 84 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 12) { + } else if (var2 == 12) { // L: 85 this.size = var1.readUnsignedByte(); - } else if (var2 == 13) { + } else if (var2 == 13) { // L: 86 this.idleSequence = var1.readUnsignedShort(); - } else if (var2 == 14) { + } else if (var2 == 14) { // L: 87 this.walkSequence = var1.readUnsignedShort(); - } else if (var2 == 15) { + } else if (var2 == 15) { // L: 88 this.turnLeftSequence = var1.readUnsignedShort(); - } else if (var2 == 16) { + } else if (var2 == 16) { // L: 89 this.turnRightSequence = var1.readUnsignedShort(); - } else if (var2 == 17) { - this.walkSequence = var1.readUnsignedShort(); - this.walkBackSequence = var1.readUnsignedShort(); - this.walkLeftSequence = var1.readUnsignedShort(); - this.walkRightSequence = var1.readUnsignedShort(); - } else if (var2 >= 30 && var2 < 35) { - this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); - if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { + } else if (var2 == 17) { // L: 90 + this.walkSequence = var1.readUnsignedShort(); // L: 91 + this.walkBackSequence = var1.readUnsignedShort(); // L: 92 + this.walkLeftSequence = var1.readUnsignedShort(); // L: 93 + this.walkRightSequence = var1.readUnsignedShort(); // L: 94 + } else if (var2 >= 30 && var2 < 35) { // L: 96 + this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 97 + if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 98 this.actions[var2 - 30] = null; } - } else if (var2 == 40) { - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + } else if (var2 == 40) { // L: 100 + var3 = var1.readUnsignedByte(); // L: 101 + this.recolorFrom = new short[var3]; // L: 102 + this.recolorTo = new short[var3]; // L: 103 - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 104 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 105 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 106 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 109 + var3 = var1.readUnsignedByte(); // L: 110 + this.retextureFrom = new short[var3]; // L: 111 + this.retextureTo = new short[var3]; // L: 112 - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 113 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 114 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 115 } - } else if (var2 == 60) { - var3 = var1.readUnsignedByte(); - this.field3497 = new int[var3]; + } else if (var2 == 60) { // L: 118 + var3 = var1.readUnsignedByte(); // L: 119 + this.field3492 = new int[var3]; // L: 120 - for (var4 = 0; var4 < var3; ++var4) { - this.field3497[var4] = var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 121 + this.field3492[var4] = var1.readUnsignedShort(); } - } else if (var2 == 93) { + } else if (var2 == 93) { // L: 123 this.drawMapDot = false; - } else if (var2 == 95) { + } else if (var2 == 95) { // L: 124 this.combatLevel = var1.readUnsignedShort(); - } else if (var2 == 97) { + } else if (var2 == 97) { // L: 125 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 98) { + } else if (var2 == 98) { // L: 126 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 99) { + } else if (var2 == 99) { // L: 127 this.isVisible = true; - } else if (var2 == 100) { + } else if (var2 == 100) { // L: 128 this.ambient = var1.readByte(); - } else if (var2 == 101) { + } else if (var2 == 101) { // L: 129 this.contrast = var1.readByte() * 5; - } else if (var2 == 102) { + } else if (var2 == 102) { // L: 130 this.headIconPrayer = var1.readUnsignedShort(); - } else if (var2 == 103) { + } else if (var2 == 103) { // L: 131 this.rotation = var1.readUnsignedShort(); - } else if (var2 != 106 && var2 != 118) { - if (var2 == 107) { + } else if (var2 != 106 && var2 != 118) { // L: 132 + if (var2 == 107) { // L: 150 this.isInteractable = false; - } else if (var2 == 109) { + } else if (var2 == 109) { // L: 151 this.isClickable = false; - } else if (var2 == 111) { + } else if (var2 == 111) { // L: 152 this.isFollower = true; - } else if (var2 == 249) { - this.params = WorldMapElement.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 153 + this.params = PacketWriter.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { + this.transformVarbit = var1.readUnsignedShort(); // L: 133 + if (this.transformVarbit == 65535) { // L: 134 this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { + this.transformVarp = var1.readUnsignedShort(); // L: 135 + if (this.transformVarp == 65535) { // L: 136 this.transformVarp = -1; } - var3 = -1; - if (var2 == 118) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { + var3 = -1; // L: 137 + if (var2 == 118) { // L: 138 + var3 = var1.readUnsignedShort(); // L: 139 + if (var3 == 65535) { // L: 140 var3 = -1; } } - var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; + var4 = var1.readUnsignedByte(); // L: 142 + this.transforms = new int[var4 + 2]; // L: 143 - for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.readUnsignedShort(); - if (this.transforms[var5] == 65535) { + for (int var5 = 0; var5 <= var4; ++var5) { // L: 144 + this.transforms[var5] = var1.readUnsignedShort(); // L: 145 + if (this.transforms[var5] == 65535) { // L: 146 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; + this.transforms[var4 + 1] = var3; // L: 148 } - } + } // L: 155 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljm;ILjm;II)Lef;", - garbageValue = "645123474" + descriptor = "(Ljm;ILjm;IB)Ler;", + garbageValue = "112" ) @Export("getModel") public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.transforms != null) { - NPCDefinition var12 = this.transform(); - return var12 == null ? null : var12.getModel(var1, var2, var3, var4); + if (this.transforms != null) { // L: 158 + NPCDefinition var12 = this.transform(); // L: 159 + return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 160 161 } else { - Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); - if (var5 == null) { - boolean var6 = false; + Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); // L: 163 + if (var5 == null) { // L: 164 + boolean var6 = false; // L: 165 - for (int var7 = 0; var7 < this.models.length; ++var7) { + for (int var7 = 0; var7 < this.models.length; ++var7) { // L: 166 if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { var6 = true; } } - if (var6) { + if (var6) { // L: 167 return null; } - ModelData[] var8 = new ModelData[this.models.length]; + ModelData[] var8 = new ModelData[this.models.length]; // L: 169 int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { + for (var9 = 0; var9 < this.models.length; ++var9) { // L: 170 var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0); } - ModelData var11; - if (var8.length == 1) { - var11 = var8[0]; + ModelData var10; + if (var8.length == 1) { // L: 171 + var10 = var8[0]; } else { - var11 = new ModelData(var8, var8.length); + var10 = new ModelData(var8, var8.length); // L: 172 } - if (this.recolorFrom != null) { - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]); + if (this.recolorFrom != null) { // L: 173 + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 174 + var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 175 } } - if (this.retextureFrom != null) { - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + if (this.retextureFrom != null) { // L: 178 + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 179 + var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 180 } } - var5 = var11.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); - NpcDefinition_cachedModels.put(var5, (long)this.id); + var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 183 + NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 184 } - Model var10; - if (var1 != null && var3 != null) { - var10 = var1.applyTransformations(var5, var2, var3, var4); - } else if (var1 != null) { - var10 = var1.transformActorModel(var5, var2); - } else if (var3 != null) { - var10 = var3.transformActorModel(var5, var4); + Model var11; + if (var1 != null && var3 != null) { // L: 187 + var11 = var1.applyTransformations(var5, var2, var3, var4); + } else if (var1 != null) { // L: 188 + var11 = var1.transformActorModel(var5, var2); + } else if (var3 != null) { // L: 189 + var11 = var3.transformActorModel(var5, var4); } else { - var10 = var5.toSharedSequenceModel(true); + var11 = var5.toSharedSequenceModel(true); // L: 190 } - if (this.widthScale != 128 || this.heightScale != 128) { - var10.scale(this.widthScale, this.heightScale, this.widthScale); + if (this.widthScale != 128 || this.heightScale != 128) { // L: 191 + var11.scale(this.widthScale, this.heightScale, this.widthScale); } - return var10; + return var11; // L: 192 } } - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Lek;", - garbageValue = "1862538614" + descriptor = "(I)Lee;", + garbageValue = "1421247419" ) @Export("getModelData") public final ModelData getModelData() { - if (this.transforms != null) { - NPCDefinition var1 = this.transform(); - return var1 == null ? null : var1.getModelData(); - } else if (this.field3497 == null) { + if (this.transforms != null) { // L: 196 + NPCDefinition var7 = this.transform(); // L: 197 + return var7 == null ? null : var7.getModelData(); // L: 198 199 + } else if (this.field3492 == null) { // L: 201 return null; } else { - boolean var5 = false; + boolean var1 = false; // L: 202 - for (int var2 = 0; var2 < this.field3497.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3497[var2], 0)) { - var5 = true; + for (int var2 = 0; var2 < this.field3492.length; ++var2) { // L: 203 + if (!NpcDefinition_modelArchive.tryLoadFile(this.field3492[var2], 0)) { + var1 = true; } } - if (var5) { + if (var1) { // L: 204 return null; } else { - ModelData[] var6 = new ModelData[this.field3497.length]; + ModelData[] var5 = new ModelData[this.field3492.length]; // L: 205 - for (int var3 = 0; var3 < this.field3497.length; ++var3) { - var6[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3497[var3], 0); + for (int var3 = 0; var3 < this.field3492.length; ++var3) { // L: 206 + var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field3492[var3], 0); } - ModelData var7; - if (var6.length == 1) { - var7 = var6[0]; + ModelData var6; + if (var5.length == 1) { + var6 = var5[0]; // L: 208 } else { - var7 = new ModelData(var6, var6.length); + var6 = new ModelData(var5, var5.length); // L: 209 } int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + if (this.recolorFrom != null) { // L: 210 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 211 + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 212 } } - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + if (this.retextureFrom != null) { // L: 215 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 216 + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 217 } } - return var7; + return var6; // L: 220 } } } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)Ljz;", - garbageValue = "478343419" + descriptor = "(I)Ljx;", + garbageValue = "795812200" ) @Export("transform") public final NPCDefinition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = Widget.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 224 + if (this.transformVarbit != -1) { // L: 225 + var1 = WorldMapSection1.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 226 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { - var2 = this.transforms[var1]; + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 228 + var2 = this.transforms[var1]; // L: 229 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? StudioGame.getNpcDefinition(var2) : null; + return var2 != -1 ? Skeleton.getNpcDefinition(var2) : null; // L: 230 231 } - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "140148621" ) @Export("transformIsVisible") public boolean transformIsVisible() { - if (this.transforms == null) { + if (this.transforms == null) { // L: 235 return true; } else { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = Widget.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 236 + if (this.transformVarbit != -1) { // L: 237 + var1 = WorldMapSection1.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 238 var1 = Varps.Varps_main[this.transformVarp]; } - if (var1 >= 0 && var1 < this.transforms.length) { - return this.transforms[var1] != -1; + if (var1 >= 0 && var1 < this.transforms.length) { // L: 239 + return this.transforms[var1] != -1; // L: 240 } else { return this.transforms[this.transforms.length - 1] != -1; } } } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-3" + descriptor = "(III)I", + garbageValue = "1359705510" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return Language.method3801(this.params, var1, var2); + return Username.method5309(this.params, var1, var2); // L: 244 } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1927040360" + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "77" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return FloorUnderlayDefinition.method4612(this.params, var1, var2); - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1804514310" - ) - static int method4922(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; - return 1; + IterableNodeHashTable var4 = this.params; // L: 249 + String var3; + if (var4 == null) { // L: 251 + var3 = var2; // L: 252 } else { - int var12; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 255 + if (var5 == null) { // L: 256 + var3 = var2; // L: 257 } else { - boolean var13; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var13 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (WorldMapIcon_0.grandExchangeEvents != null) { - WorldMapIcon_0.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var13 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (WorldMapIcon_0.grandExchangeEvents != null) { - WorldMapIcon_0.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - UrlRequester.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1] == 1; - if (WorldMapIcon_0.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - WorldMapIcon_0.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var13 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (WorldMapIcon_0.grandExchangeEvents != null) { - WorldMapIcon_0.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var13 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (WorldMapIcon_0.grandExchangeEvents != null) { - WorldMapIcon_0.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapIcon_0.grandExchangeEvents == null ? 0 : WorldMapIcon_0.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.world; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); - long var5 = MilliClock.currentTimeMillis() - GraphicsObject.field1139 - var11.age; - int var7 = (int)(var5 / 3600000L); - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)WorldMapIcon_0.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else { - return 2; - } - } + var3 = (String)var5.obj; // L: 260 } } + + return var3; // L: 262 } } diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java index ff9b680e9b..b38edb2b10 100644 --- a/runescape-client/src/main/java/NanoClock.java +++ b/runescape-client/src/main/java/NanoClock.java @@ -4,64 +4,55 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fs") +@ObfuscatedName("fy") @Implements("NanoClock") public class NanoClock extends Clock { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = -6841910125641657071L + longValue = -6496299108672843091L ) @Export("lastTimeNano") long lastTimeNano; - public NanoClock() { - this.lastTimeNano = System.nanoTime(); - } + NanoClock() { + this.lastTimeNano = System.nanoTime(); // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1017447827" + garbageValue = "208275261" ) @Export("mark") public void mark() { - this.lastTimeNano = System.nanoTime(); - } + this.lastTimeNano = System.nanoTime(); // L: 14 + } // L: 15 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1786752641" + garbageValue = "-16016139" ) @Export("wait") public int wait(int var1, int var2) { - long var3 = (long)var2 * 1000000L; - long var5 = this.lastTimeNano - System.nanoTime(); - if (var5 < var3) { + long var3 = 1000000L * (long)var2; // L: 18 + long var5 = this.lastTimeNano - System.nanoTime(); // L: 19 + if (var5 < var3) { // L: 20 var5 = var3; } - long var7 = var5 / 1000000L; - if (var7 > 0L) { - if (0L == var7 % 10L) { - SpriteMask.sleepExact(var7 - 1L); - SpriteMask.sleepExact(1L); - } else { - SpriteMask.sleepExact(var7); - } + class227.sleepExact(var5 / 1000000L); // L: 21 + long var7 = System.nanoTime(); // L: 22 + + int var9; + for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26 + ++var9; // L: 25 } - long var9 = System.nanoTime(); - - int var11; - for (var11 = 0; var11 < 10 && (var11 < 1 || this.lastTimeNano < var9); this.lastTimeNano += (long)var1 * 1000000L) { - ++var11; + if (this.lastTimeNano < var7) { // L: 28 + this.lastTimeNano = var7; } - if (this.lastTimeNano < var9) { - this.lastTimeNano = var9; - } - - return var11; + return var9; // L: 29 } } diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java index 8b3f8559e9..e67a958cff 100644 --- a/runescape-client/src/main/java/NetCache.java +++ b/runescape-client/src/main/java/NetCache.java @@ -5,129 +5,132 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("it") +@ObfuscatedName("ii") @Implements("NetCache") public class NetCache { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Llj;" + descriptor = "Lln;" ) @Export("NetCache_socket") public static AbstractSocket NetCache_socket; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1369664309 + intValue = 570306795 ) @Export("NetCache_loadTime") - public static int NetCache_loadTime; - @ObfuscatedName("j") + static int NetCache_loadTime; + @ObfuscatedName("s") + @ObfuscatedGetter( + longValue = -7527120128916335365L + ) + static long field3195; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("NetCache_pendingPriorityWrites") - public static NodeHashTable NetCache_pendingPriorityWrites; - @ObfuscatedName("p") + static NodeHashTable NetCache_pendingPriorityWrites; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -357267319 + intValue = -1894418175 ) @Export("NetCache_pendingPriorityWritesCount") public static int NetCache_pendingPriorityWritesCount; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("NetCache_pendingPriorityResponses") - public static NodeHashTable NetCache_pendingPriorityResponses; - @ObfuscatedName("n") + static NodeHashTable NetCache_pendingPriorityResponses; + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1385595783 + intValue = 994594523 ) @Export("NetCache_pendingPriorityResponsesCount") public static int NetCache_pendingPriorityResponsesCount; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Ljd;" + descriptor = "Ljl;" ) @Export("NetCache_pendingWritesQueue") - public static DualNodeDeque NetCache_pendingWritesQueue; - @ObfuscatedName("a") + static DualNodeDeque NetCache_pendingWritesQueue; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("NetCache_pendingWrites") - public static NodeHashTable NetCache_pendingWrites; - @ObfuscatedName("z") + static NodeHashTable NetCache_pendingWrites; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2008436555 + intValue = -1420450011 ) @Export("NetCache_pendingWritesCount") public static int NetCache_pendingWritesCount; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("NetCache_pendingResponses") - public static NodeHashTable NetCache_pendingResponses; - @ObfuscatedName("y") + static NodeHashTable NetCache_pendingResponses; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 764472147 + intValue = -1710151389 ) @Export("NetCache_pendingResponsesCount") public static int NetCache_pendingResponsesCount; - @ObfuscatedName("c") - public static boolean field3208; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkf;" ) @Export("NetCache_responseHeaderBuffer") - public static Buffer NetCache_responseHeaderBuffer; - @ObfuscatedName("s") + static Buffer NetCache_responseHeaderBuffer; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -534324197 + intValue = -657334189 ) - public static int field3214; - @ObfuscatedName("d") + static int field3205; + @ObfuscatedName("v") @Export("NetCache_crc") - public static CRC32 NetCache_crc; - @ObfuscatedName("l") + static CRC32 NetCache_crc; + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "[Lig;" + descriptor = "[Liw;" ) @Export("NetCache_archives") - public static Archive[] NetCache_archives; - @ObfuscatedName("t") - public static byte field3213; - @ObfuscatedName("x") + static Archive[] NetCache_archives; + @ObfuscatedName("u") + static byte field3208; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -1163120283 + intValue = 888421105 ) @Export("NetCache_crcMismatches") public static int NetCache_crcMismatches; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1725551387 + intValue = -1735021825 ) @Export("NetCache_ioExceptions") public static int NetCache_ioExceptions; static { - NetCache_loadTime = 0; - NetCache_pendingPriorityWrites = new NodeHashTable(4096); - NetCache_pendingPriorityWritesCount = 0; - NetCache_pendingPriorityResponses = new NodeHashTable(32); - NetCache_pendingPriorityResponsesCount = 0; - NetCache_pendingWritesQueue = new DualNodeDeque(); - NetCache_pendingWrites = new NodeHashTable(4096); - NetCache_pendingWritesCount = 0; - NetCache_pendingResponses = new NodeHashTable(4096); - NetCache_pendingResponsesCount = 0; - NetCache_responseHeaderBuffer = new Buffer(8); - field3214 = 0; - NetCache_crc = new CRC32(); - NetCache_archives = new Archive[256]; - field3213 = 0; - NetCache_crcMismatches = 0; - NetCache_ioExceptions = 0; + NetCache_loadTime = 0; // L: 13 + NetCache_pendingPriorityWrites = new NodeHashTable(4096); // L: 15 + NetCache_pendingPriorityWritesCount = 0; // L: 16 + NetCache_pendingPriorityResponses = new NodeHashTable(32); // L: 17 + NetCache_pendingPriorityResponsesCount = 0; // L: 18 + NetCache_pendingWritesQueue = new DualNodeDeque(); // L: 19 + NetCache_pendingWrites = new NodeHashTable(4096); // L: 20 + NetCache_pendingWritesCount = 0; // L: 21 + NetCache_pendingResponses = new NodeHashTable(4096); // L: 22 + NetCache_pendingResponsesCount = 0; // L: 23 + NetCache_responseHeaderBuffer = new Buffer(8); // L: 26 + field3205 = 0; // L: 28 + NetCache_crc = new CRC32(); // L: 30 + NetCache_archives = new Archive[256]; // L: 32 + field3208 = 0; // L: 33 + NetCache_crcMismatches = 0; // L: 34 + NetCache_ioExceptions = 0; // L: 35 } } diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java index 69990c3153..2f8569a1fa 100644 --- a/runescape-client/src/main/java/NetFileRequest.java +++ b/runescape-client/src/main/java/NetFileRequest.java @@ -4,67 +4,31 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iq") +@ObfuscatedName("io") @Implements("NetFileRequest") public class NetFileRequest extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("ds") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Liw;" + ) + @Export("archive2") + static Archive archive2; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Liw;" ) @Export("archive") - public Archive archive; - @ObfuscatedName("o") + Archive archive; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 2064764775 + intValue = -1779411329 ) @Export("crc") - public int crc; - @ObfuscatedName("q") + int crc; + @ObfuscatedName("s") @Export("padding") - public byte padding; + byte padding; NetFileRequest() { - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-612356648" - ) - static boolean method4304(char var0) { - for (int var1 = 0; var1 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var1) { - if (var0 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var1)) { - return true; - } - } - - return false; - } - - @ObfuscatedName("ij") - @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-1145163576" - ) - @Export("drawWidgets") - static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (UserComparator4.loadInterface(var0)) { - class25.field124 = null; - Tiles.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); - if (class25.field124 != null) { - Tiles.drawInterface(class25.field124, -1412584499, var1, var2, var3, var4, Clock.field2092, Client.field950, var7); - class25.field124 = null; - } - - } else { - if (var7 != -1) { - Client.field813[var7] = true; - } else { - for (int var8 = 0; var8 < 100; ++var8) { - Client.field813[var8] = true; - } - } - - } - } + } // L: 10 } diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index 23c794cb52..7ce35ff1d1 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -12,224 +12,224 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("fh") @Implements("NetSocket") public final class NetSocket extends AbstractSocket implements Runnable { - @ObfuscatedName("st") + @ObfuscatedName("er") @ObfuscatedSignature( - descriptor = "Lcz;" + descriptor = "Llb;" ) - @Export("clientPreferences") - static ClientPreferences clientPreferences; - @ObfuscatedName("m") + @Export("spriteIds") + static GraphicsDefaults spriteIds; + @ObfuscatedName("z") @Export("inputStream") InputStream inputStream; - @ObfuscatedName("o") - @Export("socket") - Socket socket; - @ObfuscatedName("q") + @ObfuscatedName("k") @Export("outputStream") OutputStream outputStream; - @ObfuscatedName("j") + @ObfuscatedName("s") + @Export("socket") + Socket socket; + @ObfuscatedName("t") @Export("isClosed") boolean isClosed; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lfm;" + descriptor = "Lfo;" ) @Export("taskHandler") TaskHandler taskHandler; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lfl;" ) @Export("task") Task task; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("outBuffer") byte[] outBuffer; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1562381729 + intValue = -43739121 ) @Export("outLength") int outLength; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -171573129 + intValue = -1877498573 ) @Export("outOffset") int outOffset; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("exceptionWriting") boolean exceptionWriting; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -881465833 + intValue = -1318092279 ) @Export("bufferLength") final int bufferLength; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1622692111 + intValue = 202627819 ) @Export("maxPacketLength") final int maxPacketLength; @ObfuscatedSignature( - descriptor = "(Ljava/net/Socket;Lfm;I)V" + descriptor = "(Ljava/net/Socket;Lfo;I)V" ) public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException { - this.isClosed = false; - this.outLength = 0; - this.outOffset = 0; - this.exceptionWriting = false; + this.isClosed = false; // L: 16 + this.outLength = 0; // L: 20 + this.outOffset = 0; // L: 21 + this.exceptionWriting = false; // L: 22 this.taskHandler = var2; this.socket = var1; this.bufferLength = var3; this.maxPacketLength = var3 - 100; this.socket.setSoTimeout(30000); this.socket.setTcpNoDelay(true); - this.socket.setReceiveBufferSize(65536); + this.socket.setReceiveBufferSize(65536); // L: 34 this.socket.setSendBufferSize(65536); - this.inputStream = this.socket.getInputStream(); - this.outputStream = this.socket.getOutputStream(); - } + this.inputStream = this.socket.getInputStream(); // L: 36 + this.outputStream = this.socket.getOutputStream(); // L: 37 + } // L: 38 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-768493590" + garbageValue = "-147773206" ) @Export("close") public void close() { - if (!this.isClosed) { - synchronized(this) { - this.isClosed = true; - this.notifyAll(); - } + if (!this.isClosed) { // L: 41 + synchronized(this) { // L: 42 + this.isClosed = true; // L: 43 + this.notifyAll(); // L: 44 + } // L: 45 if (this.task != null) { while (this.task.status == 0) { - SpriteMask.sleepExact(1L); + class227.sleepExact(1L); // L: 48 } - if (this.task.status == 1) { + if (this.task.status == 1) { // L: 50 try { - ((Thread)this.task.result).join(); - } catch (InterruptedException var3) { + ((Thread)this.task.result).join(); // L: 52 + } catch (InterruptedException var3) { // L: 54 } } } - this.task = null; + this.task = null; // L: 57 + } + } // L: 58 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "-99" + ) + @Export("readUnsignedByte") + public int readUnsignedByte() throws IOException { + return this.isClosed ? 0 : this.inputStream.read(); // L: 65 66 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "12" + ) + @Export("available") + public int available() throws IOException { + return this.isClosed ? 0 : this.inputStream.available(); // L: 70 71 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "-78" + ) + @Export("isAvailable") + public boolean isAvailable(int var1) throws IOException { + if (this.isClosed) { // L: 75 + return false; + } else { + return this.inputStream.available() >= var1; // L: 76 + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "([BIII)I", + garbageValue = "-1533815985" + ) + @Export("read") + public int read(byte[] var1, int var2, int var3) throws IOException { + if (this.isClosed) { // L: 80 + return 0; + } else { + int var4; + int var5; + for (var4 = var3; var3 > 0; var3 -= var5) { // L: 81 82 86 + var5 = this.inputStream.read(var1, var2, var3); // L: 83 + if (var5 <= 0) { // L: 84 + throw new EOFException(); + } + + var2 += var5; // L: 85 + } + + return var4; // L: 88 } } @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "-8" - ) - @Export("readUnsignedByte") - public int readUnsignedByte() throws IOException { - return this.isClosed ? 0 : this.inputStream.read(); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1942767880" - ) - @Export("available") - public int available() throws IOException { - return this.isClosed ? 0 : this.inputStream.available(); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1355091335" - ) - @Export("isAvailable") - public boolean isAvailable(int var1) throws IOException { - if (this.isClosed) { - return false; - } else { - return this.inputStream.available() >= var1; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "([BIIB)I", - garbageValue = "37" - ) - @Export("read") - public int read(byte[] var1, int var2, int var3) throws IOException { - if (this.isClosed) { - return 0; - } else { - int var4; - int var5; - for (var4 = var3; var3 > 0; var3 -= var5) { - var5 = this.inputStream.read(var1, var2, var3); - if (var5 <= 0) { - throw new EOFException(); - } - - var2 += var5; - } - - return var4; - } - } - - @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "-950578253" + garbageValue = "-588582807" ) @Export("write0") void write0(byte[] var1, int var2, int var3) throws IOException { - if (!this.isClosed) { - if (this.exceptionWriting) { - this.exceptionWriting = false; - throw new IOException(); + if (!this.isClosed) { // L: 92 + if (this.exceptionWriting) { // L: 93 + this.exceptionWriting = false; // L: 94 + throw new IOException(); // L: 95 } else { - if (this.outBuffer == null) { + if (this.outBuffer == null) { // L: 97 this.outBuffer = new byte[this.bufferLength]; } - synchronized(this) { - for (int var5 = 0; var5 < var3; ++var5) { - this.outBuffer[this.outOffset] = var1[var5 + var2]; - this.outOffset = (this.outOffset + 1) % this.bufferLength; - if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { - throw new IOException(); + synchronized(this) { // L: 98 + for (int var5 = 0; var5 < var3; ++var5) { // L: 99 + this.outBuffer[this.outOffset] = var1[var5 + var2]; // L: 100 + this.outOffset = (this.outOffset + 1) % this.bufferLength; // L: 101 + if ((this.maxPacketLength + this.outLength) % this.bufferLength == this.outOffset) { // L: 102 + throw new IOException(); // L: 103 } } - if (this.task == null) { - this.task = this.taskHandler.newThreadTask(this, 3); + if (this.task == null) { // L: 106 + this.task = this.taskHandler.newThreadTask(this, 3); // L: 107 } - this.notifyAll(); + this.notifyAll(); // L: 109 } } } - } + } // L: 111 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "([BIIB)V", - garbageValue = "-105" + garbageValue = "52" ) @Export("write") public void write(byte[] var1, int var2, int var3) throws IOException { - this.write0(var1, var2, var3); - } + this.write0(var1, var2, var3); // L: 160 + } // L: 161 protected void finalize() { - this.close(); - } + this.close(); // L: 61 + } // L: 62 public void run() { try { @@ -237,180 +237,160 @@ public final class NetSocket extends AbstractSocket implements Runnable { label84: { int var1; int var2; - synchronized(this) { - if (this.outLength == this.outOffset) { - if (this.isClosed) { + synchronized(this) { // L: 118 + if (this.outLength == this.outOffset) { // L: 119 + if (this.isClosed) { // L: 120 break label84; } try { - this.wait(); - } catch (InterruptedException var10) { + this.wait(); // L: 122 + } catch (InterruptedException var10) { // L: 124 } } - var2 = this.outLength; - if (this.outOffset >= this.outLength) { + var2 = this.outLength; // L: 126 + if (this.outOffset >= this.outLength) { // L: 127 var1 = this.outOffset - this.outLength; } else { - var1 = this.bufferLength - this.outLength; + var1 = this.bufferLength - this.outLength; // L: 128 } } - if (var1 <= 0) { + if (var1 <= 0) { // L: 130 continue; } try { - this.outputStream.write(this.outBuffer, var2, var1); - } catch (IOException var9) { - this.exceptionWriting = true; + this.outputStream.write(this.outBuffer, var2, var1); // L: 132 + } catch (IOException var9) { // L: 134 + this.exceptionWriting = true; // L: 135 } - this.outLength = (var1 + this.outLength) % this.bufferLength; + this.outLength = (var1 + this.outLength) % this.bufferLength; // L: 137 try { - if (this.outLength == this.outOffset) { + if (this.outOffset == this.outLength) { // L: 139 this.outputStream.flush(); } - } catch (IOException var8) { - this.exceptionWriting = true; + } catch (IOException var8) { // L: 141 + this.exceptionWriting = true; // L: 142 } continue; } try { - if (this.inputStream != null) { + if (this.inputStream != null) { // L: 147 this.inputStream.close(); } - if (this.outputStream != null) { + if (this.outputStream != null) { // L: 148 this.outputStream.close(); } - if (this.socket != null) { + if (this.socket != null) { // L: 149 this.socket.close(); } - } catch (IOException var7) { + } catch (IOException var7) { // L: 151 } - this.outBuffer = null; + this.outBuffer = null; // L: 152 break; } - } catch (Exception var12) { - class197.RunException_sendStackTrace((String)null, var12); + } catch (Exception var12) { // L: 154 + Decimator.RunException_sendStackTrace((String)null, var12); // L: 155 } - } + } // L: 157 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Ljm;", - garbageValue = "67" + descriptor = "(II)Ljj;", + garbageValue = "2080665133" ) - @Export("SequenceDefinition_get") - public static SequenceDefinition SequenceDefinition_get(int var0) { - SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); - if (var1 != null) { + @Export("StructDefinition_getStructDefinition") + public static StructDefinition StructDefinition_getStructDefinition(int var0) { + StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 return var1; } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { + byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); // L: 25 + var1 = new StructDefinition(); // L: 26 + if (var2 != null) { // L: 27 var1.decode(new Buffer(var2)); } var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + StructDefinition.StructDefinition_cached.put(var1, (long)var0); return var1; } } - @ObfuscatedName("u") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;J)V" + descriptor = "(III)I", + garbageValue = "2086304619" ) - static void method3677(Buffer var0, long var1) { - var1 /= 10L; - if (var1 < 0L) { - var1 = 0L; - } else if (var1 > 65535L) { - var1 = 65535L; - } - - var0.writeShort((int)var1); - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(II)Leg;", - garbageValue = "-1650164099" - ) - @Export("getFrames") - static Frames getFrames(int var0) { - Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); - if (var1 != null) { - return var1; + static int method3628(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 28 + if (var2 == null) { // L: 29 + return 0; + } else if (var1 == -1) { // L: 30 + return 0; } else { - AbstractArchive var3 = SequenceDefinition.SequenceDefinition_animationsArchive; - AbstractArchive var4 = SequenceDefinition.SequenceDefinition_skeletonsArchive; - boolean var5 = true; - int[] var6 = var3.getGroupFileIds(var0); + int var3 = 0; // L: 31 - for (int var7 = 0; var7 < var6.length; ++var7) { - byte[] var8 = var3.getFile(var0, var6[var7]); - if (var8 == null) { - var5 = false; - } else { - int var9 = (var8[0] & 255) << 8 | var8[1] & 255; - byte[] var10 = var4.getFile(var9, 0); - if (var10 == null) { - var5 = false; - } + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { // L: 32 + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; // L: 33 } } - Frames var2; - if (!var5) { - var2 = null; - } else { - try { - var2 = new Frames(var3, var4, var0, false); - } catch (Exception var12) { - var2 = null; - } - } - - if (var2 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var2, (long)var0); - } - - return var2; + return var3; // L: 35 } } - @ObfuscatedName("ko") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2085444453" + garbageValue = "1873415823" ) - static void method3674() { - if (Client.field756 && class60.localPlayer != null) { - int var0 = class60.localPlayer.pathX[0]; - int var1 = class60.localPlayer.pathY[0]; - if (var0 < 0 || var1 < 0 || var0 >= 104 || var1 >= 104) { - return; + public static void method3626() { + VarbitDefinition.VarbitDefinition_cached.clear(); // L: 46 + } // L: 47 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(Lhq;I[B[BI)V", + garbageValue = "-421721574" + ) + @Export("Widget_setKey") + static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { + if (var0.field2626 == null) { // L: 902 + if (var2 == null) { // L: 903 + return; // L: 909 } - class225.oculusOrbFocalPointX = class60.localPlayer.x; - int var2 = Language.getTileHeight(class60.localPlayer.x, class60.localPlayer.y, TileItemPile.Client_plane) - Client.camFollowHeight; - if (var2 < WorldMapDecoration.field234) { - WorldMapDecoration.field234 = var2; - } - - HealthBarDefinition.oculusOrbFocalPointY = class60.localPlayer.y; - Client.field756 = false; + var0.field2626 = new byte[11][]; // L: 904 + var0.field2719 = new byte[11][]; // L: 905 + var0.field2682 = new int[11]; // L: 906 + var0.field2683 = new int[11]; // L: 907 } - } + var0.field2626[var1] = var2; // L: 911 + if (var2 != null) { + var0.field2676 = true; // L: 912 + } else { + var0.field2676 = false; // L: 914 + + for (int var4 = 0; var4 < var0.field2626.length; ++var4) { // L: 915 + if (var0.field2626[var4] != null) { // L: 916 + var0.field2676 = true; // L: 917 + break; + } + } + } + + var0.field2719[var1] = var3; // L: 922 + } // L: 923 } diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java index 8d049737b9..090f2ea20f 100644 --- a/runescape-client/src/main/java/Node.java +++ b/runescape-client/src/main/java/Node.java @@ -3,39 +3,39 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gr") +@ObfuscatedName("gw") @Implements("Node") public class Node { - @ObfuscatedName("cm") + @ObfuscatedName("cp") @Export("key") public long key; - @ObfuscatedName("cf") + @ObfuscatedName("ch") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("previous") public Node previous; - @ObfuscatedName("ct") + @ObfuscatedName("cs") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("next") public Node next; - @ObfuscatedName("fx") + @ObfuscatedName("fa") @Export("remove") public void remove() { - if (this.next != null) { - this.next.previous = this.previous; - this.previous.next = this.next; - this.previous = null; - this.next = null; + if (this.next != null) { // L: 9 + this.next.previous = this.previous; // L: 10 + this.previous.next = this.next; // L: 11 + this.previous = null; // L: 12 + this.next = null; // L: 13 } - } + } // L: 14 - @ObfuscatedName("fy") + @ObfuscatedName("fh") @Export("hasNext") public boolean hasNext() { - return this.next != null; + return this.next != null; // L: 17 } } diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index 38b78fcfaa..b1a9e4e0f9 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -3,181 +3,181 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jp") +@ObfuscatedName("ji") @Implements("NodeDeque") public class NodeDeque { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("sentinel") public Node sentinel; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("current") Node current; public NodeDeque() { - this.sentinel = new Node(); - this.sentinel.previous = this.sentinel; - this.sentinel.next = this.sentinel; - } + this.sentinel = new Node(); // L: 6 + this.sentinel.previous = this.sentinel; // L: 10 + this.sentinel.next = this.sentinel; // L: 11 + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("clear") public void clear() { while (true) { - Node var1 = this.sentinel.previous; - if (var1 == this.sentinel) { - this.current = null; - return; + Node var1 = this.sentinel.previous; // L: 16 + if (var1 == this.sentinel) { // L: 17 + this.current = null; // L: 20 + return; // L: 21 } + var1.remove(); // L: 18 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lgw;)V" + ) + @Export("addFirst") + public void addFirst(Node var1) { + if (var1.next != null) { // L: 24 var1.remove(); } + + var1.next = this.sentinel.next; // L: 25 + var1.previous = this.sentinel; // L: 26 + var1.next.previous = var1; // L: 27 + var1.previous.next = var1; // L: 28 + } // L: 29 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lgw;)V" + ) + @Export("addLast") + public void addLast(Node var1) { + if (var1.next != null) { // L: 32 + var1.remove(); + } + + var1.next = this.sentinel; // L: 33 + var1.previous = this.sentinel.previous; // L: 34 + var1.next.previous = var1; // L: 35 + var1.previous.next = var1; // L: 36 + } // L: 37 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "()Lgw;" + ) + @Export("removeLast") + public Node removeLast() { + Node var1 = this.sentinel.previous; // L: 48 + if (var1 == this.sentinel) { + return null; // L: 49 + } else { + var1.remove(); // L: 50 + return var1; // L: 51 + } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lgr;)V" + descriptor = "()Lgw;" ) - @Export("addFirst") - public void addFirst(Node var1) { - if (var1.next != null) { - var1.remove(); - } - - var1.next = this.sentinel.next; - var1.previous = this.sentinel; - var1.next.previous = var1; - var1.previous.next = var1; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lgr;)V" - ) - @Export("addLast") - public void addLast(Node var1) { - if (var1.next != null) { - var1.remove(); - } - - var1.next = this.sentinel; - var1.previous = this.sentinel.previous; - var1.next.previous = var1; - var1.previous.next = var1; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "()Lgr;" - ) - @Export("removeLast") - public Node removeLast() { - Node var1 = this.sentinel.previous; + @Export("removeFirst") + public Node removeFirst() { + Node var1 = this.sentinel.next; // L: 55 if (var1 == this.sentinel) { - return null; + return null; // L: 56 } else { - var1.remove(); - return var1; + var1.remove(); // L: 57 + return var1; // L: 58 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "()Lgw;" + ) + @Export("last") + public Node last() { + Node var1 = this.sentinel.previous; // L: 62 + if (var1 == this.sentinel) { // L: 63 + this.current = null; // L: 64 + return null; // L: 65 + } else { + this.current = var1.previous; // L: 67 + return var1; // L: 68 + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "()Lgw;" + ) + @Export("first") + public Node first() { + Node var1 = this.sentinel.next; // L: 72 + if (var1 == this.sentinel) { // L: 73 + this.current = null; // L: 74 + return null; // L: 75 + } else { + this.current = var1.next; // L: 77 + return var1; // L: 78 } } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "()Lgr;" - ) - @Export("removeFirst") - public Node removeFirst() { - Node var1 = this.sentinel.next; - if (var1 == this.sentinel) { - return null; - } else { - var1.remove(); - return var1; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "()Lgr;" - ) - @Export("last") - public Node last() { - Node var1 = this.sentinel.previous; - if (var1 == this.sentinel) { - this.current = null; - return null; - } else { - this.current = var1.previous; - return var1; - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "()Lgr;" - ) - @Export("first") - public Node first() { - Node var1 = this.sentinel.next; - if (var1 == this.sentinel) { - this.current = null; - return null; - } else { - this.current = var1.next; - return var1; - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "()Lgw;" ) @Export("previous") public Node previous() { - Node var1 = this.current; - if (var1 == this.sentinel) { - this.current = null; - return null; + Node var1 = this.current; // L: 82 + if (var1 == this.sentinel) { // L: 83 + this.current = null; // L: 84 + return null; // L: 85 } else { - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 87 + return var1; // L: 88 } } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "()Lgw;" ) @Export("next") public Node next() { - Node var1 = this.current; - if (var1 == this.sentinel) { - this.current = null; - return null; + Node var1 = this.current; // L: 92 + if (var1 == this.sentinel) { // L: 93 + this.current = null; // L: 94 + return null; // L: 95 } else { - this.current = var1.next; - return var1; + this.current = var1.next; // L: 97 + return var1; // L: 98 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lgr;Lgr;)V" + descriptor = "(Lgw;Lgw;)V" ) @Export("NodeDeque_addBefore") public static void NodeDeque_addBefore(Node var0, Node var1) { - if (var0.next != null) { + if (var0.next != null) { // L: 40 var0.remove(); } - var0.next = var1.next; - var0.previous = var1; - var0.next.previous = var0; - var0.previous.next = var0; - } + var0.next = var1.next; // L: 41 + var0.previous = var1; // L: 42 + var0.next.previous = var0; // L: 43 + var0.previous.next = var0; // L: 44 + } // L: 45 } diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index 4c302f3f2b..0d20533df9 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -3,117 +3,117 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("le") +@ObfuscatedName("lc") @Implements("NodeHashTable") public final class NodeHashTable { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("size") int size; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Lgr;" + descriptor = "[Lgw;" ) @Export("buckets") Node[] buckets; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("currentGet") Node currentGet; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgr;" + descriptor = "Lgw;" ) @Export("current") Node current; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("index") int index; public NodeHashTable(int var1) { - this.index = 0; - this.size = var1; - this.buckets = new Node[var1]; + this.index = 0; // L: 10 + this.size = var1; // L: 13 + this.buckets = new Node[var1]; // L: 14 - for (int var2 = 0; var2 < var1; ++var2) { - Node var3 = this.buckets[var2] = new Node(); - var3.previous = var3; - var3.next = var3; + for (int var2 = 0; var2 < var1; ++var2) { // L: 15 + Node var3 = this.buckets[var2] = new Node(); // L: 16 + var3.previous = var3; // L: 17 + var3.next = var3; // L: 18 } - } + } // L: 20 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(J)Lgr;" + descriptor = "(J)Lgw;" ) @Export("get") public Node get(long var1) { - Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; + Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))]; // L: 23 - for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { - if (this.currentGet.key == var1) { - Node var4 = this.currentGet; - this.currentGet = this.currentGet.previous; - return var4; + for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) { // L: 24 25 31 + if (this.currentGet.key == var1) { // L: 26 + Node var4 = this.currentGet; // L: 27 + this.currentGet = this.currentGet.previous; // L: 28 + return var4; // L: 29 } } - this.currentGet = null; - return null; + this.currentGet = null; // L: 33 + return null; // L: 34 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lgr;J)V" + descriptor = "(Lgw;J)V" ) @Export("put") public void put(Node var1, long var2) { - if (var1.next != null) { + if (var1.next != null) { // L: 38 var1.remove(); } - Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; - var1.next = var4.next; - var1.previous = var4; - var1.next.previous = var1; - var1.previous.next = var1; - var1.key = var2; - } + Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))]; // L: 39 + var1.next = var4.next; // L: 40 + var1.previous = var4; // L: 41 + var1.next.previous = var1; // L: 42 + var1.previous.next = var1; // L: 43 + var1.key = var2; // L: 44 + } // L: 45 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "()Lgw;" ) @Export("first") public Node first() { - this.index = 0; - return this.next(); + this.index = 0; // L: 48 + return this.next(); // L: 49 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "()Lgr;" + descriptor = "()Lgw;" ) @Export("next") public Node next() { Node var1; - if (this.index > 0 && this.buckets[this.index - 1] != this.current) { - var1 = this.current; - this.current = var1.previous; - return var1; + if (this.index > 0 && this.buckets[this.index - 1] != this.current) { // L: 53 + var1 = this.current; // L: 54 + this.current = var1.previous; // L: 55 + return var1; // L: 56 } else { do { - if (this.index >= this.size) { - return null; + if (this.index >= this.size) { // L: 58 + return null; // L: 65 } - var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); + var1 = this.buckets[this.index++].previous; // L: 59 + } while(var1 == this.buckets[this.index - 1]); // L: 60 - this.current = var1.previous; - return var1; + this.current = var1.previous; // L: 61 + return var1; // L: 62 } } } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index a21080f21d..2574bb9ed6 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -7,137 +7,137 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jg") @Implements("ObjectDefinition") public class ObjectDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("ObjectDefinition_isLowDetail") public static boolean ObjectDefinition_isLowDetail; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("ObjectDefinition_archive") public static AbstractArchive ObjectDefinition_archive; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lic;" + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -316763003 ) - @Export("ObjectDefinition_modelsArchive") - public static AbstractArchive ObjectDefinition_modelsArchive; - @ObfuscatedName("j") + @Export("RunException_revision") + public static int RunException_revision; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("ObjectDefinition_cached") - public static EvictingDualNodeHashTable ObjectDefinition_cached; - @ObfuscatedName("p") + static EvictingDualNodeHashTable ObjectDefinition_cached; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("ObjectDefinition_cachedModelData") public static EvictingDualNodeHashTable ObjectDefinition_cachedModelData; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("ObjectDefinition_cachedEntities") - public static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; - @ObfuscatedName("n") + static EvictingDualNodeHashTable ObjectDefinition_cachedEntities; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("ObjectDefinition_cachedModels") - public static EvictingDualNodeHashTable ObjectDefinition_cachedModels; - @ObfuscatedName("u") + static EvictingDualNodeHashTable ObjectDefinition_cachedModels; + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Lek;" + descriptor = "[Lee;" ) - static ModelData[] field3387; - @ObfuscatedName("a") + static ModelData[] field3377; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -881332587 + intValue = 1213282055 ) @Export("id") public int id; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("modelIds") int[] modelIds; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("models") int[] models; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("name") public String name; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("s") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1877659379 + intValue = 1077626397 ) @Export("sizeX") public int sizeX; - @ObfuscatedName("v") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 903583129 + intValue = -2025374519 ) @Export("sizeY") public int sizeY; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 159236517 + intValue = 890541759 ) @Export("interactType") public int interactType; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("boolean1") public boolean boolean1; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 697092551 + intValue = -372778753 ) @Export("int1") public int int1; - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 536412795 + intValue = 1406792895 ) @Export("clipType") int clipType; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("nonFlatShading") boolean nonFlatShading; @ObfuscatedName("b") @Export("modelClipped") public boolean modelClipped; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = 1667858493 + intValue = -1020675379 ) @Export("animationId") public int animationId; - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 488202247 + intValue = 926776109 ) @Export("int2") public int int2; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = -2034457279 + intValue = 1365611553 ) @Export("ambient") int ambient; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 804091907 + intValue = -1927272841 ) @Export("contrast") int contrast; @@ -146,194 +146,194 @@ public class ObjectDefinition extends DualNode { public String[] actions; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = 797905341 + intValue = 668674641 ) @Export("mapIconId") public int mapIconId; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 154491837 + intValue = -889777445 ) @Export("mapSceneId") public int mapSceneId; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("isRotated") boolean isRotated; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @Export("clipped") public boolean clipped; - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -1244215605 + intValue = -772733315 ) @Export("modelSizeX") int modelSizeX; - @ObfuscatedName("ak") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -1166856585 + intValue = 616774407 ) @Export("modelHeight") int modelHeight; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = -1237051145 + intValue = 967285395 ) @Export("modelSizeY") int modelSizeY; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -443055951 + intValue = 574968885 ) @Export("offsetX") int offsetX; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = 1065825993 + intValue = 1686483135 ) @Export("offsetHeight") int offsetHeight; - @ObfuscatedName("ap") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 95865511 + intValue = 1033480045 ) @Export("offsetY") int offsetY; - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("boolean2") public boolean boolean2; - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("isSolid") boolean isSolid; - @ObfuscatedName("ac") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = -994480181 + intValue = -1249127107 ) @Export("int3") public int int3; - @ObfuscatedName("av") + @ObfuscatedName("as") @Export("transforms") public int[] transforms; - @ObfuscatedName("af") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = 398971045 + intValue = -654003283 ) @Export("transformVarbit") int transformVarbit; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = 1441611153 + intValue = 528036607 ) @Export("transformVarp") int transformVarp; - @ObfuscatedName("aa") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = 1854066097 + intValue = -241145981 ) @Export("ambientSoundId") public int ambientSoundId; - @ObfuscatedName("aw") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -1852678193 + intValue = 719354007 ) @Export("int4") public int int4; - @ObfuscatedName("az") + @ObfuscatedName("aj") @ObfuscatedGetter( - intValue = 26951059 + intValue = -402900319 ) @Export("int5") public int int5; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -623946511 + intValue = 1265456877 ) @Export("int6") public int int6; - @ObfuscatedName("ay") + @ObfuscatedName("af") @Export("soundEffectIds") public int[] soundEffectIds; - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llq;" ) @Export("params") IterableNodeHashTable params; static { - ObjectDefinition_isLowDetail = false; - ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); - ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); - ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); - ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); - field3387 = new ModelData[4]; + ObjectDefinition_isLowDetail = false; // L: 17 + ObjectDefinition_cached = new EvictingDualNodeHashTable(4096); // L: 20 + ObjectDefinition_cachedModelData = new EvictingDualNodeHashTable(500); // L: 21 + ObjectDefinition_cachedEntities = new EvictingDualNodeHashTable(30); // L: 22 + ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 23 + field3377 = new ModelData[4]; // L: 24 } ObjectDefinition() { - this.name = "null"; - this.sizeX = 1; - this.sizeY = 1; - this.interactType = 2; - this.boolean1 = true; - this.int1 = -1; - this.clipType = -1; - this.nonFlatShading = false; - this.modelClipped = false; - this.animationId = -1; - this.int2 = 16; - this.ambient = 0; - this.contrast = 0; - this.actions = new String[5]; - this.mapIconId = -1; - this.mapSceneId = -1; - this.isRotated = false; - this.clipped = true; - this.modelSizeX = 128; - this.modelHeight = 128; - this.modelSizeY = 128; - this.offsetX = 0; - this.offsetHeight = 0; - this.offsetY = 0; - this.boolean2 = false; - this.isSolid = false; - this.int3 = -1; - this.transformVarbit = -1; - this.transformVarp = -1; - this.ambientSoundId = -1; - this.int4 = 0; - this.int5 = 0; - this.int6 = 0; - } + this.name = "null"; // L: 28 + this.sizeX = 1; // L: 33 + this.sizeY = 1; // L: 34 + this.interactType = 2; // L: 35 + this.boolean1 = true; // L: 36 + this.int1 = -1; // L: 37 + this.clipType = -1; // L: 38 + this.nonFlatShading = false; // L: 39 + this.modelClipped = false; // L: 40 + this.animationId = -1; // L: 41 + this.int2 = 16; // L: 42 + this.ambient = 0; // L: 43 + this.contrast = 0; // L: 44 + this.actions = new String[5]; // L: 45 + this.mapIconId = -1; // L: 46 + this.mapSceneId = -1; // L: 47 + this.isRotated = false; // L: 48 + this.clipped = true; // L: 49 + this.modelSizeX = 128; // L: 50 + this.modelHeight = 128; // L: 51 + this.modelSizeY = 128; // L: 52 + this.offsetX = 0; // L: 53 + this.offsetHeight = 0; // L: 54 + this.offsetY = 0; // L: 55 + this.boolean2 = false; // L: 56 + this.isSolid = false; // L: 57 + this.int3 = -1; // L: 58 + this.transformVarbit = -1; // L: 60 + this.transformVarp = -1; // L: 61 + this.ambientSoundId = -1; // L: 62 + this.int4 = 0; // L: 63 + this.int5 = 0; // L: 64 + this.int6 = 0; // L: 65 + } // L: 69 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2073183413" + garbageValue = "1906131064" ) @Export("postDecode") void postDecode() { - if (this.int1 == -1) { - this.int1 = 0; - if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { + if (this.int1 == -1) { // L: 88 + this.int1 = 0; // L: 89 + if (this.modelIds != null && (this.models == null || this.models[0] == 10)) { // L: 90 this.int1 = 1; } - for (int var1 = 0; var1 < 5; ++var1) { + for (int var1 = 0; var1 < 5; ++var1) { // L: 91 if (this.actions[var1] != null) { this.int1 = 1; } } } - if (this.int3 == -1) { + if (this.int3 == -1) { // L: 93 this.int3 = this.interactType != 0 ? 1 : 0; } - } + } // L: 94 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1769897725" + descriptor = "(Lkf;B)V", + garbageValue = "81" ) @Export("decode") void decode(Buffer var1) { @@ -347,10 +347,10 @@ public class ObjectDefinition extends DualNode { } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "1890862568" + descriptor = "(Lkf;II)V", + garbageValue = "1904388143" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { @@ -360,13 +360,13 @@ public class ObjectDefinition extends DualNode { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += 3 * var3; + var1.offset += var3 * 3; } else { this.models = new int[var3]; this.modelIds = new int[var3]; - for (var4 = 0; var4 < var3; ++var4) { - this.modelIds[var4] = var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 111 + this.modelIds[var4] = var1.readUnsignedShort(); // L: 112 this.models[var4] = var1.readUnsignedByte(); } } @@ -377,10 +377,10 @@ public class ObjectDefinition extends DualNode { var3 = var1.readUnsignedByte(); if (var3 > 0) { if (this.modelIds != null && !ObjectDefinition_isLowDetail) { - var1.offset += var3 * 2; + var1.offset += 2 * var3; } else { this.models = null; - this.modelIds = new int[var3]; + this.modelIds = new int[var3]; // L: 125 for (var4 = 0; var4 < var3; ++var4) { this.modelIds[var4] = var1.readUnsignedShort(); @@ -391,7 +391,7 @@ public class ObjectDefinition extends DualNode { this.sizeX = var1.readUnsignedByte(); } else if (var2 == 15) { this.sizeY = var1.readUnsignedByte(); - } else if (var2 == 17) { + } else if (var2 == 17) { // L: 133 this.interactType = 0; this.boolean1 = false; } else if (var2 == 18) { @@ -400,7 +400,7 @@ public class ObjectDefinition extends DualNode { this.int1 = var1.readUnsignedByte(); } else if (var2 == 21) { this.clipType = 0; - } else if (var2 == 22) { + } else if (var2 == 22) { // L: 140 this.nonFlatShading = true; } else if (var2 == 23) { this.modelClipped = true; @@ -411,7 +411,7 @@ public class ObjectDefinition extends DualNode { } } else if (var2 == 27) { this.interactType = 1; - } else if (var2 == 28) { + } else if (var2 == 28) { // L: 147 this.int2 = var1.readUnsignedByte(); } else if (var2 == 29) { this.ambient = var1.readByte(); @@ -422,7 +422,7 @@ public class ObjectDefinition extends DualNode { if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { this.actions[var2 - 30] = null; } - } else if (var2 == 40) { + } else if (var2 == 40) { // L: 154 var3 = var1.readUnsignedByte(); this.recolorFrom = new short[var3]; this.recolorTo = new short[var3]; @@ -437,7 +437,7 @@ public class ObjectDefinition extends DualNode { this.retextureTo = new short[var3]; for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 168 this.retextureTo[var4] = (short)var1.readUnsignedShort(); } } else if (var2 == 62) { @@ -446,7 +446,7 @@ public class ObjectDefinition extends DualNode { this.clipped = false; } else if (var2 == 65) { this.modelSizeX = var1.readUnsignedShort(); - } else if (var2 == 66) { + } else if (var2 == 66) { // L: 175 this.modelHeight = var1.readUnsignedShort(); } else if (var2 == 67) { this.modelSizeY = var1.readUnsignedShort(); @@ -456,9 +456,9 @@ public class ObjectDefinition extends DualNode { var1.readUnsignedByte(); } else if (var2 == 70) { this.offsetX = var1.readShort(); - } else if (var2 == 71) { + } else if (var2 == 71) { // L: 182 this.offsetHeight = var1.readShort(); - } else if (var2 == 72) { + } else if (var2 == 72) { // L: 183 this.offsetY = var1.readShort(); } else if (var2 == 73) { this.boolean2 = true; @@ -466,437 +466,784 @@ public class ObjectDefinition extends DualNode { this.isSolid = true; } else if (var2 == 75) { this.int3 = var1.readUnsignedByte(); - } else if (var2 != 77 && var2 != 92) { - if (var2 == 78) { - this.ambientSoundId = var1.readUnsignedShort(); - this.int4 = var1.readUnsignedByte(); - } else if (var2 == 79) { - this.int5 = var1.readUnsignedShort(); - this.int6 = var1.readUnsignedShort(); - this.int4 = var1.readUnsignedByte(); - var3 = var1.readUnsignedByte(); - this.soundEffectIds = new int[var3]; + } else if (var2 != 77 && var2 != 92) { // L: 187 + if (var2 == 78) { // L: 205 + this.ambientSoundId = var1.readUnsignedShort(); // L: 206 + this.int4 = var1.readUnsignedByte(); // L: 207 + } else if (var2 == 79) { // L: 209 + this.int5 = var1.readUnsignedShort(); // L: 210 + this.int6 = var1.readUnsignedShort(); // L: 211 + this.int4 = var1.readUnsignedByte(); // L: 212 + var3 = var1.readUnsignedByte(); // L: 213 + this.soundEffectIds = new int[var3]; // L: 214 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 215 this.soundEffectIds[var4] = var1.readUnsignedShort(); } - } else if (var2 == 81) { + } else if (var2 == 81) { // L: 217 this.clipType = var1.readUnsignedByte() * 256; - } else if (var2 == 82) { + } else if (var2 == 82) { // L: 218 this.mapIconId = var1.readUnsignedShort(); - } else if (var2 == 249) { - this.params = WorldMapElement.readStringIntParameters(var1, this.params); + } else if (var2 == 249) { // L: 219 + this.params = PacketWriter.readStringIntParameters(var1, this.params); } } else { - this.transformVarbit = var1.readUnsignedShort(); - if (this.transformVarbit == 65535) { + this.transformVarbit = var1.readUnsignedShort(); // L: 188 + if (this.transformVarbit == 65535) { // L: 189 this.transformVarbit = -1; } - this.transformVarp = var1.readUnsignedShort(); - if (this.transformVarp == 65535) { + this.transformVarp = var1.readUnsignedShort(); // L: 190 + if (this.transformVarp == 65535) { // L: 191 this.transformVarp = -1; } - var3 = -1; - if (var2 == 92) { - var3 = var1.readUnsignedShort(); - if (var3 == 65535) { + var3 = -1; // L: 192 + if (var2 == 92) { // L: 193 + var3 = var1.readUnsignedShort(); // L: 194 + if (var3 == 65535) { // L: 195 var3 = -1; } } - var4 = var1.readUnsignedByte(); - this.transforms = new int[var4 + 2]; + var4 = var1.readUnsignedByte(); // L: 197 + this.transforms = new int[var4 + 2]; // L: 198 - for (int var5 = 0; var5 <= var4; ++var5) { - this.transforms[var5] = var1.readUnsignedShort(); - if (this.transforms[var5] == 65535) { + for (int var5 = 0; var5 <= var4; ++var5) { // L: 199 + this.transforms[var5] = var1.readUnsignedShort(); // L: 200 + if (this.transforms[var5] == 65535) { // L: 201 this.transforms[var5] = -1; } } - this.transforms[var4 + 1] = var3; + this.transforms[var4 + 1] = var3; // L: 203 } - } + } // L: 221 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(II)Z", - garbageValue = "-582355792" + garbageValue = "-1733975131" ) - public final boolean method4786(int var1) { - if (this.models != null) { - for (int var4 = 0; var4 < this.models.length; ++var4) { - if (this.models[var4] == var1) { - return ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); + public final boolean method4703(int var1) { + if (this.models != null) { // L: 224 + for (int var4 = 0; var4 < this.models.length; ++var4) { // L: 234 + if (this.models[var4] == var1) { // L: 235 + return DirectByteArrayCopier.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var4] & 65535, 0); } } + return true; // L: 237 + } else if (this.modelIds == null) { // L: 225 return true; - } else if (this.modelIds == null) { - return true; - } else if (var1 != 10) { + } else if (var1 != 10) { // L: 226 return true; } else { - boolean var2 = true; + boolean var2 = true; // L: 227 - for (int var3 = 0; var3 < this.modelIds.length; ++var3) { - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); + for (int var3 = 0; var3 < this.modelIds.length; ++var3) { // L: 228 + var2 &= DirectByteArrayCopier.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var3] & 65535, 0); // L: 229 } - return var2; + return var2; // L: 231 } } - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "285356335" + garbageValue = "-1059534809" ) @Export("needsModelFiles") public final boolean needsModelFiles() { - if (this.modelIds == null) { + if (this.modelIds == null) { // L: 242 return true; } else { - boolean var1 = true; + boolean var1 = true; // L: 243 - for (int var2 = 0; var2 < this.modelIds.length; ++var2) { - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); + for (int var2 = 0; var2 < this.modelIds.length; ++var2) { // L: 244 + var1 &= DirectByteArrayCopier.ObjectDefinition_modelsArchive.tryLoadFile(this.modelIds[var2] & 65535, 0); // L: 245 } - return var1; + return var1; // L: 247 } } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(II[[IIIIS)Lel;", - garbageValue = "20314" + descriptor = "(II[[IIIIB)Lez;", + garbageValue = "14" ) @Export("getEntity") public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if (this.models == null) { + if (this.models == null) { // L: 252 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 253 } - Object var9 = (Entity)ObjectDefinition_cachedEntities.get(var7); - if (var9 == null) { - ModelData var10 = this.getModelData(var1, var2); - if (var10 == null) { + Object var9 = (Entity)ObjectDefinition_cachedEntities.get(var7); // L: 254 + if (var9 == null) { // L: 255 + ModelData var10 = this.getModelData(var1, var2); // L: 256 + if (var10 == null) { // L: 257 return null; } - if (!this.nonFlatShading) { + if (!this.nonFlatShading) { // L: 258 var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); } else { - var10.ambient = (short)(this.ambient + 64); - var10.contrast = (short)(this.contrast + 768); - var10.calculateVertexNormals(); - var9 = var10; + var10.ambient = (short)(this.ambient + 64); // L: 260 + var10.contrast = (short)(this.contrast + 768); // L: 261 + var10.calculateVertexNormals(); // L: 262 + var9 = var10; // L: 263 } - ObjectDefinition_cachedEntities.put((DualNode)var9, var7); + ObjectDefinition_cachedEntities.put((DualNode)var9, var7); // L: 265 } - if (this.nonFlatShading) { - var9 = ((ModelData)var9).method2938(); + if (this.nonFlatShading) { // L: 267 + var9 = ((ModelData)var9).method2945(); // L: 268 } - if (this.clipType >= 0) { - if (var9 instanceof Model) { + if (this.clipType >= 0) { // L: 270 + if (var9 instanceof Model) { // L: 271 var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2912(var3, var4, var5, var6, true, this.clipType); + var9 = ((ModelData)var9).method2883(var3, var4, var5, var6, true, this.clipType); // L: 272 } } - return (Entity)var9; + return (Entity)var9; // L: 274 } - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(II[[IIIII)Lef;", - garbageValue = "-1099346237" + descriptor = "(II[[IIIIB)Ler;", + garbageValue = "-34" ) @Export("getModel") public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { long var7; - if (this.models == null) { + if (this.models == null) { // L: 279 var7 = (long)(var2 + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 280 } - Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); - if (var9 == null) { - ModelData var10 = this.getModelData(var1, var2); - if (var10 == null) { + Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); // L: 281 + if (var9 == null) { // L: 282 + ModelData var10 = this.getModelData(var1, var2); // L: 283 + if (var10 == null) { // L: 284 return null; } - var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - ObjectDefinition_cachedModels.put(var9, var7); + var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 285 + ObjectDefinition_cachedModels.put(var9, var7); // L: 286 } if (this.clipType >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); + var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType); // L: 288 } - return var9; + return var9; // L: 289 } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(II[[IIIILjm;II)Lef;", - garbageValue = "132862520" + descriptor = "(II[[IIIILjm;II)Ler;", + garbageValue = "929962963" ) @Export("getModelDynamic") public final Model getModelDynamic(int var1, int var2, int[][] var3, int var4, int var5, int var6, SequenceDefinition var7, int var8) { long var9; - if (this.models == null) { + if (this.models == null) { // L: 294 var9 = (long)(var2 + (this.id << 10)); } else { - var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var9 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 295 } - Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); - if (var11 == null) { - ModelData var12 = this.getModelData(var1, var2); - if (var12 == null) { + Model var11 = (Model)ObjectDefinition_cachedModels.get(var9); // L: 296 + if (var11 == null) { // L: 297 + ModelData var12 = this.getModelData(var1, var2); // L: 298 + if (var12 == null) { // L: 299 return null; } - var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - ObjectDefinition_cachedModels.put(var11, var9); + var11 = var12.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); // L: 300 + ObjectDefinition_cachedModels.put(var11, var9); // L: 301 } - if (var7 == null && this.clipType == -1) { + if (var7 == null && this.clipType == -1) { // L: 303 return var11; } else { - if (var7 != null) { + if (var7 != null) { // L: 304 var11 = var7.transformObjectModel(var11, var8, var2); } else { - var11 = var11.toSharedSequenceModel(true); + var11 = var11.toSharedSequenceModel(true); // L: 305 } - if (this.clipType >= 0) { + if (this.clipType >= 0) { // L: 306 var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType); } - return var11; + return var11; // L: 307 } } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIB)Lek;", - garbageValue = "0" + descriptor = "(III)Lee;", + garbageValue = "1848667865" ) @Export("getModelData") final ModelData getModelData(int var1, int var2) { - ModelData var3 = null; + ModelData var3 = null; // L: 311 boolean var4; int var5; int var7; - if (this.models == null) { - if (var1 != 10) { + if (this.models == null) { // L: 312 + if (var1 != 10) { // L: 313 return null; } - if (this.modelIds == null) { + if (this.modelIds == null) { // L: 314 return null; } - var4 = this.isRotated; - if (var1 == 2 && var2 > 3) { + var4 = this.isRotated; // L: 315 + if (var1 == 2 && var2 > 3) { // L: 316 var4 = !var4; } - var5 = this.modelIds.length; + var5 = this.modelIds.length; // L: 317 - for (int var6 = 0; var6 < var5; ++var6) { - var7 = this.modelIds[var6]; - if (var4) { + for (int var6 = 0; var6 < var5; ++var6) { // L: 318 + var7 = this.modelIds[var6]; // L: 319 + if (var4) { // L: 320 var7 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); - if (var3 == null) { - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var7 & 65535, 0); - if (var3 == null) { + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var7); // L: 321 + if (var3 == null) { // L: 322 + var3 = ModelData.ModelData_get(DirectByteArrayCopier.ObjectDefinition_modelsArchive, var7 & 65535, 0); // L: 323 + if (var3 == null) { // L: 324 return null; } - if (var4) { - var3.method2919(); + if (var4) { // L: 325 + var3.method2892(); } - ObjectDefinition_cachedModelData.put(var3, (long)var7); + ObjectDefinition_cachedModelData.put(var3, (long)var7); // L: 326 } - if (var5 > 1) { - field3387[var6] = var3; + if (var5 > 1) { // L: 328 + field3377[var6] = var3; } } - if (var5 > 1) { - var3 = new ModelData(field3387, var5); + if (var5 > 1) { // L: 330 + var3 = new ModelData(field3377, var5); } } else { - int var9 = -1; + int var9 = -1; // L: 333 - for (var5 = 0; var5 < this.models.length; ++var5) { - if (this.models[var5] == var1) { - var9 = var5; + for (var5 = 0; var5 < this.models.length; ++var5) { // L: 334 + if (this.models[var5] == var1) { // L: 335 + var9 = var5; // L: 336 break; } } - if (var9 == -1) { + if (var9 == -1) { // L: 340 return null; } - var5 = this.modelIds[var9]; - boolean var10 = this.isRotated ^ var2 > 3; - if (var10) { + var5 = this.modelIds[var9]; // L: 341 + boolean var10 = this.isRotated ^ var2 > 3; // L: 342 + if (var10) { // L: 343 var5 += 65536; } - var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); - if (var3 == null) { - var3 = ModelData.ModelData_get(ObjectDefinition_modelsArchive, var5 & 65535, 0); - if (var3 == null) { + var3 = (ModelData)ObjectDefinition_cachedModelData.get((long)var5); // L: 344 + if (var3 == null) { // L: 345 + var3 = ModelData.ModelData_get(DirectByteArrayCopier.ObjectDefinition_modelsArchive, var5 & 65535, 0); // L: 346 + if (var3 == null) { // L: 347 return null; } - if (var10) { - var3.method2919(); + if (var10) { // L: 348 + var3.method2892(); } - ObjectDefinition_cachedModelData.put(var3, (long)var5); + ObjectDefinition_cachedModelData.put(var3, (long)var5); // L: 349 } } - if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { - var4 = false; + if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) { // L: 353 + var4 = false; // L: 354 } else { var4 = true; } boolean var11; - if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { - var11 = false; + if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) { // L: 356 + var11 = false; // L: 357 } else { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); - if (var1 == 4 && var2 > 3) { - var8.method2968(256); - var8.changeOffset(45, 0, -45); + ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, null == this.retextureFrom, true); // L: 358 + if (var1 == 4 && var2 > 3) { // L: 359 + var8.method2888(256); // L: 360 + var8.changeOffset(45, 0, -45); // L: 361 } - var2 &= 3; - if (var2 == 1) { - var8.method2914(); - } else if (var2 == 2) { - var8.method2944(); - } else if (var2 == 3) { - var8.method2915(); + var2 &= 3; // L: 363 + if (var2 == 1) { // L: 364 + var8.method2885(); + } else if (var2 == 2) { // L: 365 + var8.method2886(); + } else if (var2 == 3) { // L: 366 + var8.method2881(); } - if (this.recolorFrom != null) { - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { - var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); + if (this.recolorFrom != null) { // L: 367 + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { // L: 368 + var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]); // L: 369 } } - if (this.retextureFrom != null) { - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { - var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); + if (this.retextureFrom != null) { // L: 372 + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { // L: 373 + var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]); // L: 374 } } - if (var4) { + if (var4) { // L: 377 var8.resize(this.modelSizeX, this.modelHeight, this.modelSizeY); } - if (var11) { + if (var11) { // L: 378 var8.changeOffset(this.offsetX, this.offsetHeight, this.offsetY); } - return var8; + return var8; // L: 379 } - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Ljg;", - garbageValue = "-511896021" + garbageValue = "1360246605" ) @Export("transform") public final ObjectDefinition transform() { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = Widget.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { + int var1 = -1; // L: 383 + if (this.transformVarbit != -1) { // L: 384 + var1 = WorldMapSection1.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { // L: 385 var1 = Varps.Varps_main[this.transformVarp]; } int var2; - if (var1 >= 0 && var1 < this.transforms.length - 1) { - var2 = this.transforms[var1]; + if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 387 + var2 = this.transforms[var1]; // L: 388 } else { var2 = this.transforms[this.transforms.length - 1]; } - return var2 != -1 ? Canvas.getObjectDefinition(var2) : null; + return var2 != -1 ? MidiPcmStream.getObjectDefinition(var2) : null; // L: 389 390 } - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1846557749" + descriptor = "(IIB)I", + garbageValue = "1" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return Language.method3801(this.params, var1, var2); - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "494622179" - ) - @Export("getStringParam") - public String getStringParam(int var1, String var2) { - return FloorUnderlayDefinition.method4612(this.params, var1, var2); + return Username.method5309(this.params, var1, var2); // L: 394 } @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "389489469" + descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", + garbageValue = "1714990387" + ) + @Export("getStringParam") + public String getStringParam(int var1, String var2) { + IterableNodeHashTable var4 = this.params; // L: 399 + String var3; + if (var4 == null) { // L: 401 + var3 = var2; // L: 402 + } else { + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 405 + if (var5 == null) { // L: 406 + var3 = var2; // L: 407 + } else { + var3 = (String)var5.obj; // L: 410 + } + } + + return var3; // L: 412 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-95" ) @Export("hasSound") public boolean hasSound() { - if (this.transforms == null) { + if (this.transforms == null) { // L: 423 return this.ambientSoundId != -1 || this.soundEffectIds != null; } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { - if (this.transforms[var1] != -1) { - ObjectDefinition var2 = Canvas.getObjectDefinition(this.transforms[var1]); - if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { + for (int var1 = 0; var1 < this.transforms.length; ++var1) { // L: 424 + if (this.transforms[var1] != -1) { // L: 425 + ObjectDefinition var2 = MidiPcmStream.getObjectDefinition(this.transforms[var1]); // L: 426 + if (var2.ambientSoundId != -1 || var2.soundEffectIds != null) { // L: 427 return true; } } } - return false; + return false; // L: 430 } } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IILgk;Lft;I)Z", + garbageValue = "-47009249" + ) + static final boolean method4747(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; // L: 98 + int var5 = var1; // L: 99 + byte var6 = 64; // L: 100 + byte var7 = 64; // L: 101 + int var8 = var0 - var6; // L: 102 + int var9 = var1 - var7; // L: 103 + class182.directions[var6][var7] = 99; // L: 104 + class182.distances[var6][var7] = 0; // L: 105 + byte var10 = 0; // L: 106 + int var11 = 0; // L: 107 + class182.bufferX[var10] = var0; // L: 108 + byte var10001 = var10; + int var18 = var10 + 1; + class182.bufferY[var10001] = var1; // L: 109 + int[][] var12 = var3.flags; // L: 110 + + while (var18 != var11) { // L: 113 + var4 = class182.bufferX[var11]; // L: 114 + var5 = class182.bufferY[var11]; // L: 115 + var11 = var11 + 1 & 4095; // L: 116 + int var16 = var4 - var8; // L: 117 + int var17 = var5 - var9; // L: 118 + int var13 = var4 - var3.xInset; // L: 119 + int var14 = var5 - var3.yInset; // L: 120 + if (var2.hasArrived(1, var4, var5, var3)) { // L: 121 + class182.field2135 = var4; // L: 122 + class182.field2136 = var5; // L: 123 + return true; // L: 124 + } + + int var15 = class182.distances[var16][var17] + 1; // L: 126 + if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136776) == 0) { // L: 127 + class182.bufferX[var18] = var4 - 1; // L: 128 + class182.bufferY[var18] = var5; // L: 129 + var18 = var18 + 1 & 4095; // L: 130 + class182.directions[var16 - 1][var17] = 2; // L: 131 + class182.distances[var16 - 1][var17] = var15; // L: 132 + } + + if (var16 < 127 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 1][var14] & 19136896) == 0) { // L: 134 + class182.bufferX[var18] = var4 + 1; // L: 135 + class182.bufferY[var18] = var5; // L: 136 + var18 = var18 + 1 & 4095; // L: 137 + class182.directions[var16 + 1][var17] = 8; // L: 138 + class182.distances[var16 + 1][var17] = var15; // L: 139 + } + + if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 141 + class182.bufferX[var18] = var4; // L: 142 + class182.bufferY[var18] = var5 - 1; // L: 143 + var18 = var18 + 1 & 4095; // L: 144 + class182.directions[var16][var17 - 1] = 1; // L: 145 + class182.distances[var16][var17 - 1] = var15; // L: 146 + } + + if (var17 < 127 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 148 + class182.bufferX[var18] = var4; // L: 149 + class182.bufferY[var18] = var5 + 1; // L: 150 + var18 = var18 + 1 & 4095; // L: 151 + class182.directions[var16][var17 + 1] = 4; // L: 152 + class182.distances[var16][var17 + 1] = var15; // L: 153 + } + + if (var16 > 0 && var17 > 0 && class182.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 155 + class182.bufferX[var18] = var4 - 1; // L: 156 + class182.bufferY[var18] = var5 - 1; // L: 157 + var18 = var18 + 1 & 4095; // L: 158 + class182.directions[var16 - 1][var17 - 1] = 3; // L: 159 + class182.distances[var16 - 1][var17 - 1] = var15; // L: 160 + } + + if (var16 < 127 && var17 > 0 && class182.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 - 1] & 19136770) == 0) { // L: 162 + class182.bufferX[var18] = var4 + 1; // L: 163 + class182.bufferY[var18] = var5 - 1; // L: 164 + var18 = var18 + 1 & 4095; // L: 165 + class182.directions[var16 + 1][var17 - 1] = 9; // L: 166 + class182.distances[var16 + 1][var17 - 1] = var15; // L: 167 + } + + if (var16 > 0 && var17 < 127 && class182.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0 && (var12[var13 - 1][var14] & 19136776) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 169 + class182.bufferX[var18] = var4 - 1; // L: 170 + class182.bufferY[var18] = var5 + 1; // L: 171 + var18 = var18 + 1 & 4095; // L: 172 + class182.directions[var16 - 1][var17 + 1] = 6; // L: 173 + class182.distances[var16 - 1][var17 + 1] = var15; // L: 174 + } + + if (var16 < 127 && var17 < 127 && class182.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 1] & 19136992) == 0 && (var12[var13 + 1][var14] & 19136896) == 0 && (var12[var13][var14 + 1] & 19136800) == 0) { // L: 176 + class182.bufferX[var18] = var4 + 1; // L: 177 + class182.bufferY[var18] = var5 + 1; // L: 178 + var18 = var18 + 1 & 4095; // L: 179 + class182.directions[var16 + 1][var17 + 1] = 12; // L: 180 + class182.distances[var16 + 1][var17 + 1] = var15; // L: 181 + } + } + + class182.field2135 = var4; // L: 184 + class182.field2136 = var5; // L: 185 + return false; // L: 186 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(IIIIIIILec;Lft;B)V", + garbageValue = "-53" + ) + static final void method4699(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) { + ObjectDefinition var9 = MidiPcmStream.getObjectDefinition(var4); // L: 893 + int var10; + int var11; + if (var5 != 1 && var5 != 3) { // L: 896 + var10 = var9.sizeX; // L: 901 + var11 = var9.sizeY; // L: 902 + } else { + var10 = var9.sizeY; // L: 897 + var11 = var9.sizeX; // L: 898 + } + + int var12; + int var13; + if (var10 + var2 <= 104) { // L: 908 + var12 = (var10 >> 1) + var2; // L: 909 + var13 = var2 + (var10 + 1 >> 1); // L: 910 + } else { + var12 = var2; // L: 913 + var13 = var2 + 1; // L: 914 + } + + int var14; + int var15; + if (var3 + var11 <= 104) { // L: 916 + var14 = var3 + (var11 >> 1); // L: 917 + var15 = var3 + (var11 + 1 >> 1); // L: 918 + } else { + var14 = var3; // L: 921 + var15 = var3 + 1; // L: 922 + } + + int[][] var16 = Tiles.Tiles_heights[var1]; // L: 924 + int var17 = var16[var13][var15] + var16[var12][var15] + var16[var12][var14] + var16[var13][var14] >> 2; // L: 925 + int var18 = (var2 << 7) + (var10 << 6); // L: 926 + int var19 = (var3 << 7) + (var11 << 6); // L: 927 + long var20 = class227.calculateTag(var2, var3, 2, var9.int1 == 0, var4); // L: 928 + int var22 = (var5 << 6) + var6; // L: 929 + if (var9.int3 == 1) { // L: 930 + var22 += 256; + } + + Object var30; + if (var6 == 22) { // L: 931 + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(22, var5, var16, var18, var17, var19); // L: 933 + } else { + var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 934 + } + + var7.newFloorDecoration(var0, var2, var3, var17, (Entity)var30, var20, var22); // L: 935 + if (var9.interactType == 1) { // L: 936 + var8.setBlockedByFloorDec(var2, var3); + } + + } else if (var6 != 10 && var6 != 11) { // L: 939 + if (var6 >= 12) { // L: 947 + if (var9.animationId == -1 && var9.transforms == null) { // L: 949 + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 950 + } + + var7.method3263(var0, var2, var3, var17, 1, 1, (Entity)var30, 0, var20, var22); // L: 951 + if (var9.interactType != 0) { // L: 952 + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 0) { // L: 955 + if (var9.animationId == -1 && var9.transforms == null) { // L: 957 + var30 = var9.getModel(0, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 958 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field524[var5], 0, var20, var22); // L: 959 + if (var9.interactType != 0) { // L: 960 + var8.method3630(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 1) { // L: 963 + if (var9.animationId == -1 && var9.transforms == null) { // L: 965 + var30 = var9.getModel(1, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 966 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field525[var5], 0, var20, var22); // L: 967 + if (var9.interactType != 0) { // L: 968 + var8.method3630(var2, var3, var6, var5, var9.boolean1); + } + + } else { + int var23; + if (var6 == 2) { // L: 971 + var23 = var5 + 1 & 3; // L: 972 + Object var25; + Object var31; + if (var9.animationId == -1 && var9.transforms == null) { // L: 975 + var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 976 + var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 977 + } else { + var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 980 + var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 981 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var31, (Entity)var25, Tiles.field524[var5], Tiles.field524[var23], var20, var22); // L: 983 + if (var9.interactType != 0) { // L: 984 + var8.method3630(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 3) { // L: 987 + if (var9.animationId == -1 && var9.transforms == null) { // L: 989 + var30 = var9.getModel(3, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 990 + } + + var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field525[var5], 0, var20, var22); // L: 991 + if (var9.interactType != 0) { // L: 992 + var8.method3630(var2, var3, var6, var5, var9.boolean1); + } + + } else if (var6 == 9) { // L: 995 + if (var9.animationId == -1 && var9.transforms == null) { // L: 997 + var30 = var9.getModel(var6, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 998 + } + + var7.method3263(var0, var2, var3, var17, 1, 1, (Entity)var30, 0, var20, var22); // L: 999 + if (var9.interactType != 0) { // L: 1000 + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } else if (var6 == 4) { // L: 1003 + if (var9.animationId == -1 && var9.transforms == null) { + var30 = var9.getModel(4, var5, var16, var18, var17, var19); // L: 1005 + } else { + var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1006 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field524[var5], 0, 0, 0, var20, var22); // L: 1007 + } else { + long var24; + Object var26; + if (var6 == 5) { // L: 1010 + var23 = 16; // L: 1011 + var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1012 + if (var24 != 0L) { // L: 1013 + var23 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var24)).int2; + } + + if (var9.animationId == -1 && var9.transforms == null) { // L: 1015 + var26 = var9.getModel(4, var5, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1016 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, Tiles.field524[var5], 0, var23 * Tiles.field517[var5], var23 * Tiles.field527[var5], var20, var22); // L: 1017 + } else if (var6 == 6) { // L: 1020 + var23 = 8; // L: 1021 + var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1022 + if (var24 != 0L) { // L: 1023 + var23 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var24)).int2 / 2; + } + + if (var9.animationId == -1 && var9.transforms == null) { // L: 1025 + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1026 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, 256, var5, var23 * Tiles.field534[var5], var23 * Tiles.field529[var5], var20, var22); // L: 1027 + } else if (var6 == 7) { // L: 1030 + int var29 = var5 + 2 & 3; // L: 1032 + if (var9.animationId == -1 && var9.transforms == null) { // L: 1033 + var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1034 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var30, (Entity)null, 256, var29, 0, 0, var20, var22); // L: 1035 + } else if (var6 == 8) { // L: 1038 + var23 = 8; // L: 1039 + var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1040 + if (var24 != 0L) { // L: 1041 + var23 = MidiPcmStream.getObjectDefinition(UserComparator9.Entity_unpackID(var24)).int2 / 2; + } + + int var28 = var5 + 2 & 3; // L: 1044 + Object var27; + if (var9.animationId == -1 && var9.transforms == null) { // L: 1045 + var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1046 + var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1047 + } else { + var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1050 + var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 1051 + } + + var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)var27, 256, var5, var23 * Tiles.field534[var5], var23 * Tiles.field529[var5], var20, var22); // L: 1053 + } + } + } + } else { + if (var9.animationId == -1 && var9.transforms == null) { // L: 941 + var30 = var9.getModel(10, var5, var16, var18, var17, var19); + } else { + var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, true, (Entity)null); // L: 942 + } + + if (var30 != null) { // L: 943 + var7.method3263(var0, var2, var3, var17, var10, var11, (Entity)var30, var6 == 11 ? 256 : 0, var20, var22); + } + + if (var9.interactType != 0) { // L: 944 + var8.addGameObject(var2, var3, var10, var11, var9.boolean1); + } + + } + } // L: 937 945 953 961 969 985 993 1001 1008 1018 1028 1036 1054 1056 } diff --git a/runescape-client/src/main/java/ObjectNode.java b/runescape-client/src/main/java/ObjectNode.java index 758e66756c..bb953a4ff0 100644 --- a/runescape-client/src/main/java/ObjectNode.java +++ b/runescape-client/src/main/java/ObjectNode.java @@ -2,14 +2,14 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gq") +@ObfuscatedName("gj") @Implements("ObjectNode") public class ObjectNode extends Node { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("obj") public final Object obj; public ObjectNode(Object var1) { - this.obj = var1; - } + this.obj = var1; // L: 7 + } // L: 8 } diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 0f1f13022f..f6d6f4b7d5 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -7,88 +7,82 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("cn") @Implements("ObjectSound") public final class ObjectSound extends Node { - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("objectSounds") static NodeDeque objectSounds; - @ObfuscatedName("hx") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1274287771 + intValue = -709307059 ) - @Export("cameraZ") - static int cameraZ; - @ObfuscatedName("o") + int field1106; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 979067629 + intValue = 397681607 + ) + int field1109; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -2039655179 ) @Export("plane") int plane; - @ObfuscatedName("q") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -107293807 + intValue = -1121925225 ) @Export("x") int x; - @ObfuscatedName("j") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1886851705 + intValue = -1814534079 ) @Export("y") int y; - @ObfuscatedName("p") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1922393949 + intValue = -1874123539 ) - int field1103; + int field1117; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 159221067 + ) + int field1108; @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 371547415 - ) - int field1104; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1292781509 - ) - int field1105; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -1063635793 + intValue = -34287423 ) @Export("soundEffectId") int soundEffectId; - @ObfuscatedName("a") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Ldm;" ) @Export("stream1") RawPcmStream stream1; - @ObfuscatedName("z") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -654816811 - ) - int field1108; - @ObfuscatedName("w") - @ObfuscatedGetter( - intValue = 648336705 + intValue = -793765363 ) int field1115; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("soundEffectIds") int[] soundEffectIds; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -1339220777 - ) - int field1111; @ObfuscatedName("h") + @ObfuscatedGetter( + intValue = 1493720003 + ) + int field1118; + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Ldk;" + descriptor = "Ldm;" ) @Export("stream2") RawPcmStream stream2; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "Ljg;" ) @@ -96,16 +90,16 @@ public final class ObjectSound extends Node { ObjectDefinition obj; static { - objectSounds = new NodeDeque(); + objectSounds = new NodeDeque(); // L: 11 } ObjectSound() { } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2014471583" + descriptor = "(S)V", + garbageValue = "23141" ) @Export("set") void set() { @@ -113,68 +107,198 @@ public final class ObjectSound extends Node { ObjectDefinition var2 = this.obj.transform(); if (var2 != null) { this.soundEffectId = var2.ambientSoundId; - this.field1105 = var2.int4 * 128; - this.field1108 = var2.int5; + this.field1108 = var2.int4 * 128; + this.field1109 = var2.int5; this.field1115 = var2.int6; this.soundEffectIds = var2.soundEffectIds; } else { this.soundEffectId = -1; - this.field1105 = 0; this.field1108 = 0; + this.field1109 = 0; this.field1115 = 0; this.soundEffectIds = null; } - if (var1 != this.soundEffectId && this.stream1 != null) { - class60.pcmStreamMixer.removeSubStream(this.stream1); - this.stream1 = null; + if (var1 != this.soundEffectId && this.stream1 != null) { // L: 60 + Players.pcmStreamMixer.removeSubStream(this.stream1); // L: 61 + this.stream1 = null; // L: 62 } - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-997797111" - ) - @Export("addGameMessage") - static void addGameMessage(int var0, String var1, String var2) { - WorldMapID.addChatMessage(var0, var1, var2, (String)null); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lic;I)V", - garbageValue = "1163495687" - ) - public static void method1999(AbstractArchive var0) { - FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; - } + } // L: 64 @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "23035" + descriptor = "(IIILgk;Lft;Z[I[II)I", + garbageValue = "585346810" ) - public static void method2007() { - PlayerAppearance.PlayerAppearance_cachedModels.clear(); + public static int method1986(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) { + int var9; + for (int var8 = 0; var8 < 128; ++var8) { // L: 19 + for (var9 = 0; var9 < 128; ++var9) { // L: 20 + class182.directions[var8][var9] = 0; // L: 21 + class182.distances[var8][var9] = 99999999; // L: 22 + } + } + + boolean var27; + if (var2 == 1) { // L: 26 + var27 = ObjectDefinition.method4747(var0, var1, var3, var4); + } else if (var2 == 2) { // L: 27 + var27 = class41.method619(var0, var1, var3, var4); + } else { + var27 = FriendSystem.method1976(var0, var1, var2, var3, var4); // L: 28 + } + + var9 = var0 - 64; // L: 29 + int var10 = var1 - 64; // L: 30 + int var11 = class182.field2135; // L: 31 + int var12 = class182.field2136; // L: 32 + int var13; + int var14; + int var16; + if (!var27) { // L: 33 + var13 = Integer.MAX_VALUE; // L: 35 + var14 = Integer.MAX_VALUE; // L: 36 + byte var15 = 10; // L: 37 + var16 = var3.approxDestinationX; // L: 38 + int var17 = var3.approxDestinationY; // L: 39 + int var18 = var3.approxDestinationSizeX; // L: 40 + int var19 = var3.approxDestinationSizeY; // L: 41 + + for (int var20 = var16 - var15; var20 <= var15 + var16; ++var20) { // L: 42 + for (int var21 = var17 - var15; var21 <= var17 + var15; ++var21) { // L: 43 + int var22 = var20 - var9; // L: 44 + int var23 = var21 - var10; // L: 45 + if (var22 >= 0 && var23 >= 0 && var22 < 128 && var23 < 128 && class182.distances[var22][var23] < 100) { // L: 46 47 + int var24 = 0; // L: 48 + if (var20 < var16) { + var24 = var16 - var20; // L: 49 + } else if (var20 > var16 + var18 - 1) { // L: 50 + var24 = var20 - (var18 + var16 - 1); + } + + int var25 = 0; // L: 51 + if (var21 < var17) { // L: 52 + var25 = var17 - var21; + } else if (var21 > var17 + var19 - 1) { // L: 53 + var25 = var21 - (var17 + var19 - 1); + } + + int var26 = var25 * var25 + var24 * var24; // L: 54 + if (var26 < var13 || var26 == var13 && class182.distances[var22][var23] < var14) { // L: 55 + var13 = var26; // L: 56 + var14 = class182.distances[var22][var23]; // L: 57 + var11 = var20; // L: 58 + var12 = var21; // L: 59 + } + } + } + } + + if (var13 == Integer.MAX_VALUE) { // L: 65 + return -1; + } + } + + if (var0 == var11 && var12 == var1) { // L: 69 + return 0; + } else { + byte var28 = 0; // L: 70 + class182.bufferX[var28] = var11; // L: 73 + var13 = var28 + 1; + class182.bufferY[var28] = var12; // L: 74 + + int var29; + for (var14 = var29 = class182.directions[var11 - var9][var12 - var10]; var0 != var11 || var12 != var1; var14 = class182.directions[var11 - var9][var12 - var10]) { // L: 75 76 86 + if (var14 != var29) { // L: 77 + var29 = var14; // L: 78 + class182.bufferX[var13] = var11; // L: 79 + class182.bufferY[var13++] = var12; // L: 80 + } + + if ((var14 & 2) != 0) { // L: 82 + ++var11; + } else if ((var14 & 8) != 0) { // L: 83 + --var11; + } + + if ((var14 & 1) != 0) { // L: 84 + ++var12; + } else if ((var14 & 4) != 0) { // L: 85 + --var12; + } + } + + var16 = 0; // L: 88 + + while (var13-- > 0) { // L: 89 + var6[var16] = class182.bufferX[var13]; // L: 90 + var7[var16++] = class182.bufferY[var13]; // L: 91 + if (var16 >= var6.length) { // L: 92 + break; + } + } + + return var16; // L: 94 + } } - @ObfuscatedName("w") - @Export("addEntityUnderMouse") - static final void addEntityUnderMouse(long var0) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0; - } - - @ObfuscatedName("r") + @ObfuscatedName("is") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1381107864" + descriptor = "(IIIIIIB)V", + garbageValue = "-62" ) - public static void method2008() { - Widget.Widget_cachedSprites.clear(); - Widget.Widget_cachedModels.clear(); - Widget.Widget_cachedFonts.clear(); - Widget.Widget_cachedSpriteMasks.clear(); - } + static final void method1987(int var0, int var1, int var2, int var3, int var4, int var5) { + int var6 = var2 - var0; // L: 9130 + int var7 = var3 - var1; // L: 9131 + int var8 = var6 >= 0 ? var6 : -var6; // L: 9132 + int var9 = var7 >= 0 ? var7 : -var7; // L: 9133 + int var10 = var8; // L: 9134 + if (var8 < var9) { // L: 9135 + var10 = var9; + } + + if (var10 != 0) { // L: 9136 + int var11 = (var6 << 16) / var10; // L: 9137 + int var12 = (var7 << 16) / var10; // L: 9138 + if (var12 <= var11) { // L: 9139 + var11 = -var11; + } else { + var12 = -var12; // L: 9140 + } + + int var13 = var5 * var12 >> 17; // L: 9141 + int var14 = var5 * var12 + 1 >> 17; // L: 9142 + int var15 = var5 * var11 >> 17; // L: 9143 + int var16 = var5 * var11 + 1 >> 17; // L: 9144 + var0 -= Rasterizer2D.Rasterizer2D_xClipStart; // L: 9145 + var1 -= Rasterizer2D.Rasterizer2D_yClipStart; // L: 9146 + int var17 = var0 + var13; // L: 9147 + int var18 = var0 - var14; // L: 9148 + int var19 = var0 + var6 - var14; // L: 9149 + int var20 = var0 + var13 + var6; // L: 9150 + int var21 = var15 + var1; // L: 9151 + int var22 = var1 - var16; // L: 9152 + int var23 = var7 + var1 - var16; // L: 9153 + int var24 = var15 + var7 + var1; // L: 9154 + Rasterizer3D.method3120(var17, var18, var19); // L: 9155 + Rasterizer3D.method3172(var21, var22, var23, var17, var18, var19, var4); // L: 9156 + Rasterizer3D.method3120(var17, var19, var20); // L: 9157 + Rasterizer3D.method3172(var21, var23, var24, var17, var19, var20, var4); // L: 9158 + } + } // L: 9159 + + @ObfuscatedName("jx") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-457226799" + ) + static void method1983(int var0) { + TaskHandler.tempMenuAction = new MenuAction(); // L: 10245 + TaskHandler.tempMenuAction.param0 = Client.menuArguments1[var0]; // L: 10246 + TaskHandler.tempMenuAction.param1 = Client.menuArguments2[var0]; // L: 10247 + TaskHandler.tempMenuAction.opcode = Client.menuOpcodes[var0]; // L: 10248 + TaskHandler.tempMenuAction.identifier = Client.menuIdentifiers[var0]; // L: 10249 + TaskHandler.tempMenuAction.action = Client.menuActions[var0]; // L: 10250 + } // L: 10251 } diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java index 283753adbf..cb84d41091 100644 --- a/runescape-client/src/main/java/Occluder.java +++ b/runescape-client/src/main/java/Occluder.java @@ -2,112 +2,196 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ew") @Implements("Occluder") public final class Occluder { - @ObfuscatedName("m") + @ObfuscatedName("dn") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive10") + static Archive archive10; + @ObfuscatedName("le") + @ObfuscatedSignature( + descriptor = "Lhq;" + ) + static Widget field1950; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1770488455 + intValue = 299619711 ) @Export("minTileX") int minTileX; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -981753975 + intValue = 1317670669 ) @Export("maxTileX") int maxTileX; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1475510333 + intValue = -322147255 ) @Export("minTileY") int minTileY; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1573452277 + intValue = -2083623235 ) @Export("maxTileY") int maxTileY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 775496851 + intValue = 2131844695 ) @Export("type") int type; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 2113694595 + intValue = -453208547 ) @Export("minX") int minX; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1622455341 + intValue = -985593835 ) @Export("maxX") int maxX; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1900446281 + intValue = 1472483077 ) @Export("minZ") int minZ; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 520274005 + intValue = 459569369 ) @Export("maxZ") int maxZ; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -2040068515 + intValue = -2090994579 ) @Export("minY") int minY; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1182984941 + intValue = 1349976535 ) @Export("maxY") int maxY; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -773527471 + intValue = 686332819 ) - int field1927; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -386186759 - ) - int field1920; + int field1941; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1451159679 + intValue = -2005053087 ) - int field1929; - @ObfuscatedName("k") + int field1946; + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -2143405945 + intValue = -909874575 ) - int field1926; - @ObfuscatedName("r") + int field1943; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -1008084553 + intValue = -327653701 ) - int field1931; - @ObfuscatedName("s") + int field1944; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -591721105 + intValue = -1910772051 ) - int field1932; - @ObfuscatedName("v") + int field1945; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1716029637 + intValue = 1391395895 ) - int field1928; + int field1930; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 34718795 + ) + int field1947; Occluder() { - } + } // L: 23 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "([BB)V", + garbageValue = "-61" + ) + @Export("SpriteBuffer_decode") + static void SpriteBuffer_decode(byte[] var0) { + Buffer var1 = new Buffer(var0); // L: 229 + var1.offset = var0.length - 2; // L: 230 + class335.SpriteBuffer_spriteCount = var1.readUnsignedShort(); // L: 231 + Username.SpriteBuffer_xOffsets = new int[class335.SpriteBuffer_spriteCount]; // L: 232 + class335.SpriteBuffer_yOffsets = new int[class335.SpriteBuffer_spriteCount]; // L: 233 + class335.SpriteBuffer_spriteWidths = new int[class335.SpriteBuffer_spriteCount]; // L: 234 + class335.SpriteBuffer_spriteHeights = new int[class335.SpriteBuffer_spriteCount]; // L: 235 + class92.SpriteBuffer_pixels = new byte[class335.SpriteBuffer_spriteCount][]; // L: 236 + var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8; // L: 237 + class335.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); // L: 238 + class335.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); // L: 239 + int var2 = (var1.readUnsignedByte() & 255) + 1; // L: 240 + + int var3; + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 241 + Username.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 242 + class335.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 243 + class335.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + } + + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 244 + class335.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); + } + + var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; // L: 245 + TaskHandler.SpriteBuffer_spritePalette = new int[var2]; // L: 246 + + for (var3 = 1; var3 < var2; ++var3) { // L: 247 + TaskHandler.SpriteBuffer_spritePalette[var3] = var1.readMedium(); // L: 248 + if (TaskHandler.SpriteBuffer_spritePalette[var3] == 0) { // L: 249 + TaskHandler.SpriteBuffer_spritePalette[var3] = 1; + } + } + + var1.offset = 0; // L: 251 + + for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { // L: 252 + int var4 = class335.SpriteBuffer_spriteWidths[var3]; // L: 253 + int var5 = class335.SpriteBuffer_spriteHeights[var3]; // L: 254 + int var6 = var4 * var5; // L: 255 + byte[] var7 = new byte[var6]; // L: 256 + class92.SpriteBuffer_pixels[var3] = var7; // L: 257 + int var8 = var1.readUnsignedByte(); // L: 258 + int var9; + if (var8 == 0) { // L: 259 + for (var9 = 0; var9 < var6; ++var9) { // L: 260 + var7[var9] = var1.readByte(); + } + } else if (var8 == 1) { // L: 262 + for (var9 = 0; var9 < var4; ++var9) { // L: 263 + for (int var10 = 0; var10 < var5; ++var10) { // L: 264 + var7[var9 + var10 * var4] = var1.readByte(); // L: 265 + } + } + } + } + + } // L: 270 } diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 7134b5a9e9..99aef8feaa 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -1,160 +1,197 @@ +import java.awt.Image; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kb") +@ObfuscatedName("ky") @Implements("PacketBuffer") public class PacketBuffer extends Buffer { - @ObfuscatedName("o") - static final int[] field3728; - @ObfuscatedName("m") + @ObfuscatedName("k") + static final int[] field3729; + @ObfuscatedName("aa") + static Image field3725; + @ObfuscatedName("hu") + @ObfuscatedGetter( + intValue = 1400093691 + ) + @Export("cameraPitch") + static int cameraPitch; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Llb;" + descriptor = "Llh;" ) @Export("isaacCipher") IsaacCipher isaacCipher; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1364238519 + intValue = -1373505985 ) @Export("bitIndex") int bitIndex; static { - field3728 = 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}; + field3729 = 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}; // L: 7 } public PacketBuffer(int var1) { - super(var1); - } + super(var1); // L: 11 + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([II)V", - garbageValue = "-1865727993" + garbageValue = "687379780" ) @Export("newIsaacCipher") public void newIsaacCipher(int[] var1) { - this.isaacCipher = new IsaacCipher(var1); + this.isaacCipher = new IsaacCipher(var1); // L: 15 + } // L: 16 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Llh;I)V", + garbageValue = "-1243349913" + ) + @Export("setIsaacCipher") + public void setIsaacCipher(IsaacCipher var1) { + this.isaacCipher = var1; // L: 19 + } // L: 20 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "28692652" + ) + @Export("writeByteIsaac") + public void writeByteIsaac(int var1) { + super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); // L: 23 + } // L: 24 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "3" + ) + @Export("readByteIsaac") + public int readByteIsaac() { + return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 27 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-345140221" + ) + public boolean method5564() { + int var1 = super.array[super.offset] - this.isaacCipher.method6394() & 255; // L: 31 + return var1 >= 128; // L: 32 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llb;I)V", - garbageValue = "-472683600" - ) - @Export("setIsaacCipher") - public void setIsaacCipher(IsaacCipher var1) { - this.isaacCipher = var1; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2126324259" - ) - @Export("writeByteIsaac") - public void writeByteIsaac(int var1) { - super.array[++super.offset - 1] = (byte)(var1 + this.isaacCipher.nextInt()); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1443887320" - ) - @Export("readByteIsaac") - public int readByteIsaac() { - return super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1957045910" - ) - public boolean method5657() { - int var1 = super.array[super.offset] - this.isaacCipher.method6467() & 255; - return var1 >= 128; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "691786573" + descriptor = "(B)I", + garbageValue = "-121" ) @Export("readSmartByteShortIsaac") public int readSmartByteShortIsaac() { - int var1 = super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; - return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); + int var1 = super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255; // L: 37 + return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.offset - 1] - this.isaacCipher.nextInt() & 255); // L: 38 39 } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "([BIII)V", - garbageValue = "1379772441" + garbageValue = "-1310609105" ) - public void method5680(byte[] var1, int var2, int var3) { - for (int var4 = 0; var4 < var3; ++var4) { + public void method5566(byte[] var1, int var2, int var3) { + for (int var4 = 0; var4 < var3; ++var4) { // L: 43 var1[var4 + var2] = (byte)(super.array[++super.offset - 1] - this.isaacCipher.nextInt()); } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1358588268" - ) - @Export("importIndex") - public void importIndex() { - this.bitIndex = super.offset * 8; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1109143909" - ) - @Export("readBits") - public int readBits(int var1) { - int var2 = this.bitIndex >> 3; - int var3 = 8 - (this.bitIndex & 7); - int var4 = 0; - - for (this.bitIndex += var1; var1 > var3; var3 = 8) { - var4 += (super.array[var2++] & field3728[var3]) << var1 - var3; - var1 -= var3; - } - - if (var3 == var1) { - var4 += super.array[var2] & field3728[var3]; - } else { - var4 += super.array[var2] >> var3 - var1 & field3728[var1]; - } - - return var4; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-15519430" - ) - @Export("exportIndex") - public void exportIndex() { - super.offset = (this.bitIndex + 7) / 8; - } + } // L: 44 @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1646456009" + ) + @Export("importIndex") + public void importIndex() { + this.bitIndex = super.offset * 8; // L: 47 + } // L: 48 + + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "565890213" + garbageValue = "606103556" + ) + @Export("readBits") + public int readBits(int var1) { + int var2 = this.bitIndex >> 3; // L: 51 + int var3 = 8 - (this.bitIndex & 7); // L: 52 + int var4 = 0; // L: 53 + + for (this.bitIndex += var1; var1 > var3; var3 = 8) { // L: 54 55 58 + var4 += (super.array[var2++] & field3729[var3]) << var1 - var3; // L: 56 + var1 -= var3; // L: 57 + } + + if (var3 == var1) { // L: 60 + var4 += super.array[var2] & field3729[var3]; + } else { + var4 += super.array[var2] >> var3 - var1 & field3729[var1]; // L: 61 + } + + return var4; // L: 62 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2092208058" + ) + @Export("exportIndex") + public void exportIndex() { + super.offset = (this.bitIndex + 7) / 8; // L: 66 + } // L: 67 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(IS)I", + garbageValue = "-20679" ) @Export("bitsRemaining") public int bitsRemaining(int var1) { - return var1 * 8 - this.bitIndex; + return var1 * 8 - this.bitIndex; // L: 70 } + + @ObfuscatedName("hb") + @ObfuscatedSignature( + descriptor = "(Lbf;IIBI)V", + garbageValue = "-872449297" + ) + static final void method5598(Player var0, int var1, int var2, byte var3) { + int var4 = var0.pathX[0]; // L: 6982 + int var5 = var0.pathY[0]; // L: 6983 + int var6 = var0.transformedSize(); // L: 6984 + if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) { // L: 6985 + if (var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) { // L: 6986 + int var9 = var0.transformedSize(); // L: 6989 + Client.field950.approxDestinationX = var1; // L: 6992 + Client.field950.approxDestinationY = var2; // L: 6993 + Client.field950.approxDestinationSizeX = 1; // L: 6994 + Client.field950.approxDestinationSizeY = 1; // L: 6995 + ApproximateRouteStrategy var10 = Client.field950; // L: 6996 + int var11 = ObjectSound.method1986(var4, var5, var9, var10, Client.collisionMaps[var0.plane], true, Client.field830, Client.field952); // L: 6998 + if (var11 >= 1) { // L: 6999 + for (int var12 = 0; var12 < var11 - 1; ++var12) { // L: 7000 + var0.method1288(Client.field830[var12], Client.field952[var12], var3); + } + + } + } + } + } // L: 7001 } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 46fe62853e..c0398abb3e 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -4,80 +4,93 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gj") +@ObfuscatedName("gb") @Implements("PacketBufferNode") public class PacketBufferNode extends Node { - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "[Lgj;" + descriptor = "[Lgb;" ) @Export("PacketBufferNode_packetBufferNodes") static PacketBufferNode[] PacketBufferNode_packetBufferNodes; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -477845615 + intValue = 110077839 ) @Export("PacketBufferNode_packetBufferNodeCount") static int PacketBufferNode_packetBufferNodeCount; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgn;" + descriptor = "Lgf;" ) @Export("clientPacket") ClientPacket clientPacket; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1266543353 + intValue = -1747169149 ) @Export("clientPacketLength") int clientPacketLength; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lky;" ) @Export("packetBuffer") public PacketBuffer packetBuffer; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1411425987 + intValue = 1051886947 ) @Export("index") public int index; static { - PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; - PacketBufferNode_packetBufferNodeCount = 0; + PacketBufferNode_packetBufferNodes = new PacketBufferNode[300]; // L: 13 + PacketBufferNode_packetBufferNodeCount = 0; // L: 14 } PacketBufferNode() { - } + } // L: 19 - @ObfuscatedName("q") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-42" + descriptor = "(I)V", + garbageValue = "-1940555210" ) @Export("release") public void release() { - if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { - PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; + if (PacketBufferNode_packetBufferNodeCount < PacketBufferNode_packetBufferNodes.length) { // L: 50 + PacketBufferNode_packetBufferNodes[++PacketBufferNode_packetBufferNodeCount - 1] = this; // L: 51 } - } + } // L: 52 - @ObfuscatedName("a") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1965042826" + descriptor = "(I)V", + garbageValue = "416660759" ) - static final int method3750(int var0, int var1) { - int var2 = VarbitDefinition.method4696(45365 + var0, var1 + 91923, 4) - 128 + (VarbitDefinition.method4696(var0 + 10294, 37821 + var1, 2) - 128 >> 1) + (VarbitDefinition.method4696(var0, var1, 1) - 128 >> 2); - var2 = (int)(0.3D * (double)var2) + 35; - if (var2 < 10) { - var2 = 10; - } else if (var2 > 60) { - var2 = 60; + static void method3726() { + Login.worldSelectOpen = false; // L: 1738 + UserComparator2.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1739 + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1740 + AbstractByteArrayCopier.logoSprite.drawAt(Login.xPadding + 382 - AbstractByteArrayCopier.logoSprite.subWidth / 2, 18); // L: 1741 + } // L: 1742 + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(Ldc;B)V", + garbageValue = "1" + ) + @Export("PcmStream_disable") + static final void PcmStream_disable(PcmStream var0) { + var0.active = false; // L: 266 + if (var0.sound != null) { // L: 267 + var0.sound.position = 0; } - return var2; - } + for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { // L: 268 + PcmStream_disable(var1); + } + + } // L: 269 } diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java index 5ca3526d16..3106627ab6 100644 --- a/runescape-client/src/main/java/PacketWriter.java +++ b/runescape-client/src/main/java/PacketWriter.java @@ -8,188 +8,284 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("dx") @Implements("PacketWriter") public class PacketWriter { - @ObfuscatedName("m") + @ObfuscatedName("cw") + public static char field1350; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Llj;" + descriptor = "Lln;" ) @Export("socket") AbstractSocket socket; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Ljv;" ) @Export("packetBufferNodes") IterableNodeDeque packetBufferNodes; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -315328335 + intValue = -1900413985 ) @Export("bufferSize") int bufferSize; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkf;" ) @Export("buffer") Buffer buffer; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Llb;" + descriptor = "Llh;" ) @Export("isaacCipher") public IsaacCipher isaacCipher; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lkb;" + descriptor = "Lky;" ) @Export("packetBuffer") PacketBuffer packetBuffer; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) @Export("serverPacket") ServerPacket serverPacket; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1069759871 + intValue = 1678952517 ) @Export("serverPacketLength") int serverPacketLength; - @ObfuscatedName("a") - boolean field1347; - @ObfuscatedName("z") + @ObfuscatedName("g") + boolean field1344; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1004833869 + intValue = 2044305253 ) - int field1348; - @ObfuscatedName("w") + int field1345; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -126397603 + intValue = 2009057559 ) @Export("pendingWrites") int pendingWrites; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - ServerPacket field1350; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - ServerPacket field1351; + ServerPacket field1336; @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - ServerPacket field1342; + ServerPacket field1348; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + ServerPacket field1346; PacketWriter() { this.packetBufferNodes = new IterableNodeDeque(); this.bufferSize = 0; this.buffer = new Buffer(5000); this.packetBuffer = new PacketBuffer(40000); - this.serverPacket = null; + this.serverPacket = null; // L: 20 this.serverPacketLength = 0; - this.field1347 = true; - this.field1348 = 0; - this.pendingWrites = 0; + this.field1344 = true; + this.field1345 = 0; + this.pendingWrites = 0; // L: 24 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "65" + descriptor = "(I)V", + garbageValue = "-256200238" ) @Export("clearBuffer") final void clearBuffer() { - this.packetBufferNodes.rsClear(); - this.bufferSize = 0; - } + this.packetBufferNodes.rsClear(); // L: 32 + this.bufferSize = 0; // L: 33 + } // L: 34 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1917984042" + garbageValue = "-1276124374" ) @Export("flush") final void flush() throws IOException { - if (this.socket != null && this.bufferSize > 0) { - this.buffer.offset = 0; + if (this.socket != null && this.bufferSize > 0) { // L: 37 + this.buffer.offset = 0; // L: 38 while (true) { - PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); - if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { - this.socket.write(this.buffer.array, 0, this.buffer.offset); + PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last(); // L: 40 + if (var1 == null || var1.index > this.buffer.array.length - this.buffer.offset) { // L: 41 42 + this.socket.write(this.buffer.array, 0, this.buffer.offset); // L: 49 this.pendingWrites = 0; break; } - this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); - this.bufferSize -= var1.index; - var1.remove(); - var1.packetBuffer.releaseArray(); - var1.release(); + this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.index); // L: 43 + this.bufferSize -= var1.index; // L: 44 + var1.remove(); // L: 45 + var1.packetBuffer.releaseArray(); // L: 46 + var1.release(); // L: 47 } } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lgj;I)V", - garbageValue = "-251135286" + descriptor = "(Lgb;I)V", + garbageValue = "1906163027" ) @Export("addNode") public final void addNode(PacketBufferNode var1) { this.packetBufferNodes.addFirst(var1); - var1.index = var1.packetBuffer.offset; - var1.packetBuffer.offset = 0; - this.bufferSize += var1.index; - } + var1.index = var1.packetBuffer.offset; // L: 56 + var1.packetBuffer.offset = 0; // L: 57 + this.bufferSize += var1.index; // L: 58 + } // L: 59 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Llj;I)V", - garbageValue = "-1410560856" + descriptor = "(Lln;I)V", + garbageValue = "-666263315" ) @Export("setSocket") void setSocket(AbstractSocket var1) { - this.socket = var1; - } + this.socket = var1; // L: 62 + } // L: 63 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "446694129" + garbageValue = "2058968107" ) @Export("close") void close() { - if (this.socket != null) { - this.socket.close(); - this.socket = null; + if (this.socket != null) { // L: 66 + this.socket.close(); // L: 67 + this.socket = null; // L: 68 } - } + } // L: 70 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2011501008" + descriptor = "(B)V", + garbageValue = "-102" ) @Export("removeSocket") void removeSocket() { - this.socket = null; - } + this.socket = null; // L: 73 + } // L: 74 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)Llj;", - garbageValue = "2137567404" + descriptor = "(B)Lln;", + garbageValue = "43" ) @Export("getSocket") AbstractSocket getSocket() { - return this.socket; + return this.socket; // L: 77 } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(B)J", + garbageValue = "-123" + ) + @Export("currentTimeMillis") + public static final synchronized long currentTimeMillis() { + long var0 = System.currentTimeMillis(); // L: 14 + if (var0 < class306.field3723) { // L: 15 + class217.field2536 += class306.field3723 - var0; + } + + class306.field3723 = var0; + return class217.field2536 + var0; + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lkf;Llq;I)Llq;", + garbageValue = "309027289" + ) + @Export("readStringIntParameters") + static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { + int var2 = var0.readUnsignedByte(); // L: 16 + int var3; + if (var1 == null) { // L: 17 + var3 = class297.method5378(var2); // L: 18 + var1 = new IterableNodeHashTable(var3); // L: 19 + } + + for (var3 = 0; var3 < var2; ++var3) { // L: 21 + boolean var4 = var0.readUnsignedByte() == 1; // L: 22 + int var5 = var0.readMedium(); // L: 23 + Object var6; + if (var4) { + var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); // L: 25 + } else { + var6 = new IntegerNode(var0.readInt()); // L: 26 + } + + var1.put((Node)var6, (long)var5); // L: 27 + } + + return var1; // L: 29 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-371855810" + ) + public static void method2357() { + if (MouseHandler.MouseHandler_instance != null) { // L: 50 + synchronized(MouseHandler.MouseHandler_instance) { // L: 51 + MouseHandler.MouseHandler_instance = null; // L: 52 + } // L: 53 + } + + } // L: 55 + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IS)I", + garbageValue = "-27993" + ) + public static int method2360(int var0) { + if (var0 > 0) { // L: 190 + return 1; + } else { + return var0 < 0 ? -1 : 0; // L: 191 192 + } + } + + @ObfuscatedName("jv") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "82642187" + ) + @Export("Widget_resetModelFrames") + static final void Widget_resetModelFrames(int var0) { + if (WorldMapSprite.loadInterface(var0)) { // L: 10286 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 10287 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 10288 + Widget var3 = var1[var2]; // L: 10289 + if (var3 != null) { // L: 10290 + var3.modelFrame = 0; // L: 10291 + var3.modelFrameCycle = 0; // L: 10292 + } + } + + } + } // L: 10294 } diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index e7f3d67d20..b9277d65fb 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -4,110 +4,113 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ii") +@ObfuscatedName("il") @Implements("ParamDefinition") public class ParamDefinition extends DualNode { - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lic;" + ) + @Export("ParamDefinition_archive") + public static AbstractArchive ParamDefinition_archive; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lel;" ) @Export("ParamDefinition_cached") - public static EvictingDualNodeHashTable ParamDefinition_cached; - @ObfuscatedName("n") - @Export("ByteArrayPool_alternativeSizes") - static int[] ByteArrayPool_alternativeSizes; - @ObfuscatedName("q") + static EvictingDualNodeHashTable ParamDefinition_cached; + @ObfuscatedName("s") @Export("type") char type; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 153668641 + intValue = 2056477959 ) @Export("defaultInt") public int defaultInt; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("defaultStr") public String defaultStr; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("autoDisable") boolean autoDisable; static { - ParamDefinition_cached = new EvictingDualNodeHashTable(64); + ParamDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 } ParamDefinition() { - this.autoDisable = true; - } + this.autoDisable = true; // L: 16 + } // L: 18 - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1718151512" + garbageValue = "964888854" ) @Export("postDecode") void postDecode() { - } + } // L: 31 - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-115197089" + descriptor = "(Lkf;B)V", + garbageValue = "2" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 35 + if (var2 == 0) { // L: 36 + return; // L: 39 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 37 } } - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "-1727060018" + descriptor = "(Lkf;II)V", + garbageValue = "-659243660" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - byte var4 = var1.readByte(); - int var5 = var4 & 255; - if (var5 == 0) { + if (var2 == 1) { // L: 42 + byte var4 = var1.readByte(); // L: 44 + int var5 = var4 & 255; // L: 46 + if (var5 == 0) { // L: 47 throw new IllegalArgumentException("" + Integer.toString(var5, 16)); } - if (var5 >= 128 && var5 < 160) { - char var6 = class297.cp1252AsciiExtension[var5 - 128]; - if (var6 == 0) { + if (var5 >= 128 && var5 < 160) { // L: 48 + char var6 = class297.cp1252AsciiExtension[var5 - 128]; // L: 49 + if (var6 == 0) { // L: 50 var6 = '?'; } - var5 = var6; + var5 = var6; // L: 51 } - char var3 = (char)var5; - this.type = var3; - } else if (var2 == 2) { + char var3 = (char)var5; // L: 53 + this.type = var3; // L: 55 + } else if (var2 == 2) { // L: 57 this.defaultInt = var1.readInt(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 58 this.autoDisable = false; - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 59 this.defaultStr = var1.readStringCp1252NullTerminated(); } - } + } // L: 61 - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "624673738" + garbageValue = "937250031" ) @Export("isString") public boolean isString() { - return this.type == 's'; + return this.type == 's'; // L: 64 } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 64dd059916..982e953496 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -1,470 +1,481 @@ +import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dt") +@ObfuscatedName("dr") @Implements("PcmPlayer") public class PcmPlayer { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Ldg;" + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1149689047 ) - @Export("soundSystem") - static SoundSystem soundSystem; - @ObfuscatedName("h") + public static int field1447; + @ObfuscatedName("o") + @Export("PcmPlayer_stereo") + protected static boolean PcmPlayer_stereo; + @ObfuscatedName("w") + @Export("soundSystemExecutor") + static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("fb") + @ObfuscatedGetter( + longValue = 2634650448797948467L + ) + static long field1430; + @ObfuscatedName("a") @Export("samples") protected int[] samples; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Ldc;" ) @Export("stream") PcmStream stream; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -964785055 + intValue = -1444527341 ) - int field1440; - @ObfuscatedName("s") + int field1435; + @ObfuscatedName("f") @ObfuscatedGetter( - longValue = -5225168782139234627L + longValue = -2930435928401446917L ) @Export("timeMs") long timeMs; - @ObfuscatedName("v") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = 1568507089 + intValue = -149687327 ) @Export("capacity") int capacity; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1378765481 + intValue = -1461747439 ) - int field1443; - @ObfuscatedName("e") + int field1438; + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 338521005 + intValue = 813792905 ) - int field1444; - @ObfuscatedName("l") + int field1451; + @ObfuscatedName("r") @ObfuscatedGetter( - longValue = 6294144091277528537L + longValue = -2022966020506386053L ) - long field1439; - @ObfuscatedName("t") + long field1440; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 83737029 + intValue = 1855020445 ) int field1446; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1549144685 + intValue = -1127622439 ) - int field1447; + int field1442; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -34422633 + intValue = 1705628685 ) - int field1436; - @ObfuscatedName("i") + int field1443; + @ObfuscatedName("l") @ObfuscatedGetter( - longValue = 710865060485688699L + longValue = 4977190421454866475L ) - long field1452; - @ObfuscatedName("f") - boolean field1450; - @ObfuscatedName("ag") + long field1444; + @ObfuscatedName("e") + boolean field1445; + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 2018665007 + intValue = -83389805 ) - int field1448; - @ObfuscatedName("ab") + int field1441; + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "[Ldf;" + descriptor = "[Ldc;" + ) + PcmStream[] field1448; + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "[Ldc;" ) PcmStream[] field1449; - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "[Ldf;" - ) - PcmStream[] field1453; protected PcmPlayer() { - this.field1440 = 32; - this.timeMs = MilliClock.currentTimeMillis(); - this.field1439 = 0L; - this.field1446 = 0; - this.field1447 = 0; - this.field1436 = 0; - this.field1452 = 0L; - this.field1450 = true; - this.field1448 = 0; - this.field1449 = new PcmStream[8]; - this.field1453 = new PcmStream[8]; - } + this.field1435 = 32; // L: 22 + this.timeMs = PacketWriter.currentTimeMillis(); // L: 23 + this.field1440 = 0L; // L: 27 + this.field1446 = 0; // L: 28 + this.field1442 = 0; // L: 29 + this.field1443 = 0; // L: 30 + this.field1444 = 0L; // L: 31 + this.field1445 = true; // L: 32 + this.field1441 = 0; // L: 38 + this.field1448 = new PcmStream[8]; // L: 39 + this.field1449 = new PcmStream[8]; // L: 40 + } // L: 42 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2128910021" + garbageValue = "-841767260" ) @Export("init") protected void init() throws Exception { - } + } // L: 280 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-14" + garbageValue = "-120" ) @Export("open") protected void open(int var1) throws Exception { - } + } // L: 281 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1868944096" + descriptor = "(B)I", + garbageValue = "106" ) @Export("position") protected int position() throws Exception { - return this.capacity; + return this.capacity; // L: 284 } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("write") protected void write() throws Exception { - } + } // L: 287 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1900446281" + garbageValue = "667465439" ) @Export("close") protected void close() { - } + } // L: 288 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "630637593" + garbageValue = "-2027971398" ) @Export("discard") protected void discard() throws Exception { - } + } // L: 289 - @ObfuscatedName("ax") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ldf;I)V", - garbageValue = "204760061" + descriptor = "(Ldc;I)V", + garbageValue = "35825022" ) @Export("setStream") public final synchronized void setStream(PcmStream var1) { - this.stream = var1; - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "277207832" - ) - @Export("run") - public final synchronized void run() { - if (this.samples != null) { - long var1 = MilliClock.currentTimeMillis(); - - try { - if (0L != this.field1439) { - if (var1 < this.field1439) { - return; - } - - this.open(this.capacity); - this.field1439 = 0L; - this.field1450 = true; - } - - int var3 = this.position(); - if (this.field1436 - var3 > this.field1446) { - this.field1446 = this.field1436 - var3; - } - - int var4 = this.field1443 + this.field1444; - if (var4 + 256 > 16384) { - var4 = 16128; - } - - if (var4 + 256 > this.capacity) { - this.capacity += 1024; - if (this.capacity > 16384) { - this.capacity = 16384; - } - - this.close(); - this.open(this.capacity); - var3 = 0; - this.field1450 = true; - if (var4 + 256 > this.capacity) { - var4 = this.capacity - 256; - this.field1444 = var4 - this.field1443; - } - } - - while (var3 < var4) { - this.fill(this.samples, 256); - this.write(); - var3 += 256; - } - - if (var1 > this.field1452) { - if (!this.field1450) { - if (this.field1446 == 0 && this.field1447 == 0) { - this.close(); - this.field1439 = 2000L + var1; - return; - } - - this.field1444 = Math.min(this.field1447, this.field1446); - this.field1447 = this.field1446; - } else { - this.field1450 = false; - } - - this.field1446 = 0; - this.field1452 = var1 + 2000L; - } - - this.field1436 = var3; - } catch (Exception var7) { - this.close(); - this.field1439 = var1 + 2000L; - } - - try { - if (var1 > 500000L + this.timeMs) { - var1 = this.timeMs; - } - - while (var1 > this.timeMs + 5000L) { - this.skip(256); - this.timeMs += (long)(256000 / class237.field3113); - } - } catch (Exception var6) { - this.timeMs = var1; - } - - } - } + this.stream = var1; // L: 79 + } // L: 80 @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-537221049" + garbageValue = "-1677504744" ) - public final void method2560() { - this.field1450 = true; - } + @Export("run") + public final synchronized void run() { + if (this.samples != null) { // L: 83 + long var1 = PacketWriter.currentTimeMillis(); // L: 84 - @ObfuscatedName("am") + try { + if (this.field1440 != 0L) { // L: 86 + if (var1 < this.field1440) { // L: 87 + return; + } + + this.open(this.capacity); // L: 88 + this.field1440 = 0L; // L: 89 + this.field1445 = true; // L: 90 + } + + int var3 = this.position(); // L: 92 + if (this.field1443 - var3 > this.field1446) { // L: 93 + this.field1446 = this.field1443 - var3; + } + + int var4 = this.field1451 + this.field1438; // L: 94 + if (var4 + 256 > 16384) { // L: 95 + var4 = 16128; + } + + if (var4 + 256 > this.capacity) { // L: 96 + this.capacity += 1024; // L: 97 + if (this.capacity > 16384) { // L: 98 + this.capacity = 16384; + } + + this.close(); // L: 99 + this.open(this.capacity); // L: 100 + var3 = 0; // L: 101 + this.field1445 = true; // L: 102 + if (var4 + 256 > this.capacity) { // L: 103 + var4 = this.capacity - 256; // L: 104 + this.field1451 = var4 - this.field1438; // L: 105 + } + } + + while (var3 < var4) { // L: 108 + this.fill(this.samples, 256); // L: 109 + this.write(); // L: 110 + var3 += 256; // L: 111 + } + + if (var1 > this.field1444) { // L: 113 + if (!this.field1445) { // L: 114 + if (this.field1446 == 0 && this.field1442 == 0) { // L: 115 + this.close(); // L: 116 + this.field1440 = 2000L + var1; // L: 117 + return; // L: 118 + } + + this.field1451 = Math.min(this.field1442, this.field1446); // L: 120 + this.field1442 = this.field1446; // L: 121 + } else { + this.field1445 = false; // L: 123 + } + + this.field1446 = 0; // L: 124 + this.field1444 = 2000L + var1; // L: 125 + } + + this.field1443 = var3; // L: 127 + } catch (Exception var7) { // L: 129 + this.close(); // L: 130 + this.field1440 = var1 + 2000L; // L: 131 + } + + try { + if (var1 > this.timeMs + 500000L) { // L: 134 + var1 = this.timeMs; + } + + while (var1 > 5000L + this.timeMs) { // L: 135 + this.skip(256); // L: 136 + this.timeMs += (long)(256000 / field1447); // L: 137 + } + } catch (Exception var6) { // L: 140 + this.timeMs = var1; // L: 141 + } + + } + } // L: 143 + + @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-209566182" + garbageValue = "2142907235" + ) + public final void method2517() { + this.field1445 = true; // L: 146 + } // L: 147 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "30633041" ) @Export("tryDiscard") public final synchronized void tryDiscard() { - this.field1450 = true; + this.field1445 = true; // L: 150 try { - this.discard(); - } catch (Exception var2) { - this.close(); - this.field1439 = MilliClock.currentTimeMillis() + 2000L; + this.discard(); // L: 152 + } catch (Exception var2) { // L: 154 + this.close(); // L: 155 + this.field1440 = PacketWriter.currentTimeMillis() + 2000L; // L: 156 } - } + } // L: 158 - @ObfuscatedName("ak") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "733916097" + garbageValue = "2048322330" ) @Export("shutdown") public final synchronized void shutdown() { - if (soundSystem != null) { - boolean var1 = true; + if (class1.soundSystem != null) { // L: 161 + boolean var1 = true; // L: 162 - for (int var2 = 0; var2 < 2; ++var2) { - if (this == soundSystem.players[var2]) { - soundSystem.players[var2] = null; + for (int var2 = 0; var2 < 2; ++var2) { // L: 163 + if (this == class1.soundSystem.players[var2]) { // L: 164 + class1.soundSystem.players[var2] = null; } - if (soundSystem.players[var2] != null) { + if (class1.soundSystem.players[var2] != null) { // L: 165 var1 = false; } } - if (var1) { - class227.soundSystemExecutor.shutdownNow(); - class227.soundSystemExecutor = null; - soundSystem = null; + if (var1) { // L: 167 + soundSystemExecutor.shutdownNow(); // L: 168 + soundSystemExecutor = null; // L: 169 + class1.soundSystem = null; // L: 170 } } - this.close(); - this.samples = null; - } + this.close(); // L: 173 + this.samples = null; // L: 174 + } // L: 175 - @ObfuscatedName("ad") + @ObfuscatedName("ap") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1841493566" + garbageValue = "2014217671" ) @Export("skip") final void skip(int var1) { - this.field1448 -= var1; - if (this.field1448 < 0) { - this.field1448 = 0; + this.field1441 -= var1; // L: 178 + if (this.field1441 < 0) { + this.field1441 = 0; // L: 179 } if (this.stream != null) { - this.stream.skip(var1); + this.stream.skip(var1); // L: 180 } - } + } // L: 181 - @ObfuscatedName("as") + @ObfuscatedName("au") @Export("fill") final void fill(int[] var1, int var2) { - int var3 = var2; - if (Messages.PcmPlayer_stereo) { + int var3 = var2; // L: 185 + if (PcmPlayer_stereo) { // L: 186 var3 = var2 << 1; } - class310.clearIntArray(var1, 0, var3); - this.field1448 -= var2; - if (this.stream != null && this.field1448 <= 0) { - this.field1448 += class237.field3113 >> 4; - VarcInt.PcmStream_disable(this.stream); - this.method2565(this.stream, this.stream.vmethod2840()); - int var4 = 0; - int var5 = 255; + class310.clearIntArray(var1, 0, var3); // L: 187 + this.field1441 -= var2; // L: 188 + if (this.stream != null && this.field1441 <= 0) { // L: 189 + this.field1441 += field1447 >> 4; // L: 190 + PacketBufferNode.PcmStream_disable(this.stream); // L: 191 + this.method2522(this.stream, this.stream.vmethod2837()); // L: 192 + int var4 = 0; // L: 193 + int var5 = 255; // L: 194 int var6; PcmStream var10; - label104: - for (var6 = 7; var5 != 0; --var6) { + label108: + for (var6 = 7; var5 != 0; --var6) { // L: 195 int var7; int var8; - if (var6 < 0) { - var7 = var6 & 3; - var8 = -(var6 >> 2); + if (var6 < 0) { // L: 198 + var7 = var6 & 3; // L: 199 + var8 = -(var6 >> 2); // L: 200 } else { - var7 = var6; - var8 = 0; + var7 = var6; // L: 203 + var8 = 0; // L: 204 } - for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { - if ((var9 & 1) != 0) { - var5 &= ~(1 << var7); - var10 = null; - PcmStream var11 = this.field1449[var7]; + for (int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) { // L: 206 208 + if ((var9 & 1) != 0) { // L: 211 + var5 &= ~(1 << var7); // L: 214 + var10 = null; // L: 215 + PcmStream var11 = this.field1448[var7]; // L: 216 - label98: + label102: while (true) { while (true) { - if (var11 == null) { - break label98; + if (var11 == null) { // L: 217 + break label102; } - AbstractSound var12 = var11.sound; - if (var12 != null && var12.position > var8) { - var5 |= 1 << var7; - var10 = var11; - var11 = var11.after; + AbstractSound var12 = var11.sound; // L: 218 + if (var12 != null && var12.position > var8) { // L: 219 + var5 |= 1 << var7; // L: 220 + var10 = var11; // L: 221 + var11 = var11.after; // L: 222 } else { - var11.active = true; - int var13 = var11.vmethod4037(); - var4 += var13; + var11.active = true; // L: 225 + int var13 = var11.vmethod3987(); // L: 226 + var4 += var13; // L: 227 if (var12 != null) { - var12.position += var13; + var12.position += var13; // L: 228 } - if (var4 >= this.field1440) { - break label104; + if (var4 >= this.field1435) { // L: 229 + break label108; } - PcmStream var14 = var11.firstSubStream(); - if (var14 != null) { - for (int var15 = var11.field1520; var14 != null; var14 = var11.nextSubStream()) { - this.method2565(var14, var15 * var14.vmethod2840() >> 8); + PcmStream var14 = var11.firstSubStream(); // L: 230 + if (var14 != null) { // L: 231 + for (int var15 = var11.field1519; var14 != null; var14 = var11.nextSubStream()) { // L: 232 233 235 + this.method2522(var14, var15 * var14.vmethod2837() >> 8); // L: 234 } } - PcmStream var18 = var11.after; - var11.after = null; - if (var10 == null) { - this.field1449[var7] = var18; + PcmStream var18 = var11.after; // L: 238 + var11.after = null; // L: 239 + if (var10 == null) { // L: 240 + this.field1448[var7] = var18; } else { - var10.after = var18; + var10.after = var18; // L: 241 } - if (var18 == null) { - this.field1453[var7] = var10; + if (var18 == null) { // L: 242 + this.field1449[var7] = var10; } - var11 = var18; + var11 = var18; // L: 243 } } } } - var7 += 4; + var7 += 4; // L: 207 ++var8; } } - for (var6 = 0; var6 < 8; ++var6) { - PcmStream var16 = this.field1449[var6]; - PcmStream[] var17 = this.field1449; - this.field1453[var6] = null; + for (var6 = 0; var6 < 8; ++var6) { // L: 247 + PcmStream var16 = this.field1448[var6]; // L: 248 + PcmStream[] var17 = this.field1448; // L: 249 + this.field1449[var6] = null; // L: 251 - for (var17[var6] = null; var16 != null; var16 = var10) { - var10 = var16.after; - var16.after = null; + for (var17[var6] = null; var16 != null; var16 = var10) { // L: 252 253 256 + var10 = var16.after; // L: 254 + var16.after = null; // L: 255 } } } - if (this.field1448 < 0) { - this.field1448 = 0; + if (this.field1441 < 0) { // L: 260 + this.field1441 = 0; } if (this.stream != null) { - this.stream.fill(var1, 0, var2); + this.stream.fill(var1, 0, var2); // L: 261 } - this.timeMs = MilliClock.currentTimeMillis(); - } + this.timeMs = PacketWriter.currentTimeMillis(); // L: 262 + } // L: 263 - @ObfuscatedName("ap") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ldf;IB)V", - garbageValue = "45" + descriptor = "(Ldc;II)V", + garbageValue = "-1443703786" ) - final void method2565(PcmStream var1, int var2) { - int var3 = var2 >> 5; - PcmStream var4 = this.field1453[var3]; - if (var4 == null) { - this.field1449[var3] = var1; + final void method2522(PcmStream var1, int var2) { + int var3 = var2 >> 5; // L: 272 + PcmStream var4 = this.field1449[var3]; // L: 273 + if (var4 == null) { // L: 274 + this.field1448[var3] = var1; } else { - var4.after = var1; + var4.after = var1; // L: 275 } - this.field1453[var3] = var1; - var1.field1520 = var2; - } + this.field1449[var3] = var1; // L: 276 + var1.field1519 = var2; // L: 277 + } // L: 278 } diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java index 3263413d3a..aedeb26fbc 100644 --- a/runescape-client/src/main/java/PcmStream.java +++ b/runescape-client/src/main/java/PcmStream.java @@ -3,69 +3,69 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("df") +@ObfuscatedName("dc") @Implements("PcmStream") public abstract class PcmStream extends Node { @ObfuscatedName("w") @Export("active") volatile boolean active; - @ObfuscatedName("s") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Ldf;" + descriptor = "Ldc;" ) @Export("after") PcmStream after; + @ObfuscatedName("y") + int field1519; @ObfuscatedName("v") - int field1520; - @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ldy;" + descriptor = "Ldp;" ) @Export("sound") AbstractSound sound; protected PcmStream() { - this.active = true; - } + this.active = true; // L: 11 + } // L: 13 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Ldf;" + descriptor = "()Ldc;" ) @Export("firstSubStream") protected abstract PcmStream firstSubStream(); - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "()Ldf;" + descriptor = "()Ldc;" ) @Export("nextSubStream") protected abstract PcmStream nextSubStream(); - @ObfuscatedName("u") - protected abstract int vmethod4037(); + @ObfuscatedName("w") + protected abstract int vmethod3987(); - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("fill") protected abstract void fill(int[] var1, int var2, int var3); - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("skip") protected abstract void skip(int var1); - @ObfuscatedName("af") - int vmethod2840() { - return 255; + @ObfuscatedName("aw") + int vmethod2837() { + return 255; // L: 16 } - @ObfuscatedName("ft") + @ObfuscatedName("fd") @Export("update") final void update(int[] var1, int var2, int var3) { - if (this.active) { + if (this.active) { // L: 24 this.fill(var1, var2, var3); } else { - this.skip(var3); + this.skip(var3); // L: 25 } - } + } // L: 26 } diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 1c346300de..ddc254701a 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -3,201 +3,201 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dd") +@ObfuscatedName("dh") @Implements("PcmStreamMixer") public class PcmStreamMixer extends PcmStream { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("subStreams") NodeDeque subStreams; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) - NodeDeque field1373; - @ObfuscatedName("q") - int field1371; - @ObfuscatedName("j") - int field1374; + NodeDeque field1365; + @ObfuscatedName("s") + int field1366; + @ObfuscatedName("t") + int field1368; public PcmStreamMixer() { - this.subStreams = new NodeDeque(); - this.field1373 = new NodeDeque(); - this.field1371 = 0; - this.field1374 = -1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Ldf;)V" - ) - @Export("addSubStream") - public final synchronized void addSubStream(PcmStream var1) { - this.subStreams.addLast(var1); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ldf;)V" - ) - @Export("removeSubStream") - public final synchronized void removeSubStream(PcmStream var1) { - var1.remove(); - } - - @ObfuscatedName("q") - void method2434() { - if (this.field1371 > 0) { - for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1373.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1373.previous()) { - var1.field1476 -= this.field1371; - } - - this.field1374 -= this.field1371; - this.field1371 = 0; - } - - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lgr;Ldb;)V" - ) - void method2423(Node var1, PcmStreamMixerListener var2) { - while (this.field1373.sentinel != var1 && ((PcmStreamMixerListener)var1).field1476 <= var2.field1476) { - var1 = var1.previous; - } - - NodeDeque.NodeDeque_addBefore(var2, var1); - this.field1374 = ((PcmStreamMixerListener)this.field1373.sentinel.previous).field1476; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ldb;)V" - ) - void method2424(PcmStreamMixerListener var1) { - var1.remove(); - var1.remove2(); - Node var2 = this.field1373.sentinel.previous; - if (var2 == this.field1373.sentinel) { - this.field1374 = -1; - } else { - this.field1374 = ((PcmStreamMixerListener)var2).field1476; - } - - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "()Ldf;" - ) - @Export("firstSubStream") - protected PcmStream firstSubStream() { - return (PcmStream)this.subStreams.last(); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "()Ldf;" - ) - @Export("nextSubStream") - protected PcmStream nextSubStream() { - return (PcmStream)this.subStreams.previous(); - } - - @ObfuscatedName("u") - protected int vmethod4037() { - return 0; - } - - @ObfuscatedName("a") - @Export("fill") - public final synchronized void fill(int[] var1, int var2, int var3) { - do { - if (this.field1374 < 0) { - this.updateSubStreams(var1, var2, var3); - return; - } - - if (var3 + this.field1371 < this.field1374) { - this.field1371 += var3; - this.updateSubStreams(var1, var2, var3); - return; - } - - int var4 = this.field1374 - this.field1371; - this.updateSubStreams(var1, var2, var4); - var2 += var4; - var3 -= var4; - this.field1371 += var4; - this.method2434(); - PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1373.last(); - synchronized(var5) { - int var7 = var5.update(); - if (var7 < 0) { - var5.field1476 = 0; - this.method2424(var5); - } else { - var5.field1476 = var7; - this.method2423(var5.previous, var5); - } - } - } while(var3 != 0); - + this.subStreams = new NodeDeque(); // L: 9 + this.field1365 = new NodeDeque(); // L: 10 + this.field1366 = 0; // L: 11 + this.field1368 = -1; // L: 12 } @ObfuscatedName("z") - @Export("updateSubStreams") - void updateSubStreams(int[] var1, int var2, int var3) { - for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { - var4.update(var1, var2, var3); + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + @Export("addSubStream") + public final synchronized void addSubStream(PcmStream var1) { + this.subStreams.addLast(var1); // L: 15 + } // L: 16 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ldc;)V" + ) + @Export("removeSubStream") + public final synchronized void removeSubStream(PcmStream var1) { + var1.remove(); // L: 19 + } // L: 20 + + @ObfuscatedName("s") + void method2385() { + if (this.field1366 > 0) { // L: 23 + for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field1365.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field1365.previous()) { // L: 24 + var1.field1476 -= this.field1366; // L: 25 + } + + this.field1368 -= this.field1366; // L: 27 + this.field1366 = 0; // L: 28 } + } // L: 30 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lgw;Ldi;)V" + ) + void method2408(Node var1, PcmStreamMixerListener var2) { + while (this.field1365.sentinel != var1 && ((PcmStreamMixerListener)var1).field1476 <= var2.field1476) { // L: 33 + var1 = var1.previous; + } + + NodeDeque.NodeDeque_addBefore(var2, var1); // L: 34 + this.field1368 = ((PcmStreamMixerListener)this.field1365.sentinel.previous).field1476; // L: 35 + } // L: 36 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Ldi;)V" + ) + void method2388(PcmStreamMixerListener var1) { + var1.remove(); // L: 39 + var1.remove2(); // L: 40 + Node var2 = this.field1365.sentinel.previous; // L: 41 + if (var2 == this.field1365.sentinel) { + this.field1368 = -1; // L: 42 + } else { + this.field1368 = ((PcmStreamMixerListener)var2).field1476; // L: 43 + } + + } // L: 44 + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "()Ldc;" + ) + @Export("firstSubStream") + protected PcmStream firstSubStream() { + return (PcmStream)this.subStreams.last(); // L: 47 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "()Ldc;" + ) + @Export("nextSubStream") + protected PcmStream nextSubStream() { + return (PcmStream)this.subStreams.previous(); // L: 51 } @ObfuscatedName("w") + protected int vmethod3987() { + return 0; // L: 55 + } + + @ObfuscatedName("g") + @Export("fill") + public final synchronized void fill(int[] var1, int var2, int var3) { + do { + if (this.field1368 < 0) { // L: 60 + this.updateSubStreams(var1, var2, var3); // L: 61 + return; // L: 62 + } + + if (var3 + this.field1366 < this.field1368) { // L: 64 + this.field1366 += var3; // L: 65 + this.updateSubStreams(var1, var2, var3); // L: 66 + return; // L: 67 + } + + int var4 = this.field1368 - this.field1366; // L: 69 + this.updateSubStreams(var1, var2, var4); // L: 70 + var2 += var4; // L: 71 + var3 -= var4; // L: 72 + this.field1366 += var4; // L: 73 + this.method2385(); // L: 74 + PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field1365.last(); // L: 75 + synchronized(var5) { // L: 76 + int var7 = var5.update(); // L: 77 + if (var7 < 0) { // L: 78 + var5.field1476 = 0; // L: 79 + this.method2388(var5); // L: 80 + } else { + var5.field1476 = var7; // L: 83 + this.method2408(var5.previous, var5); // L: 84 + } + } + } while(var3 != 0); // L: 87 + + } + + @ObfuscatedName("m") + @Export("updateSubStreams") + void updateSubStreams(int[] var1, int var2, int var3) { + for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) { // L: 92 + var4.update(var1, var2, var3); // L: 93 + } + + } // L: 95 + + @ObfuscatedName("n") @Export("skip") public final synchronized void skip(int var1) { do { - if (this.field1374 < 0) { - this.skipSubStreams(var1); - return; + if (this.field1368 < 0) { // L: 99 + this.skipSubStreams(var1); // L: 100 + return; // L: 101 } - if (this.field1371 + var1 < this.field1374) { - this.field1371 += var1; - this.skipSubStreams(var1); - return; + if (this.field1366 + var1 < this.field1368) { // L: 103 + this.field1366 += var1; // L: 104 + this.skipSubStreams(var1); // L: 105 + return; // L: 106 } - int var2 = this.field1374 - this.field1371; - this.skipSubStreams(var2); - var1 -= var2; - this.field1371 += var2; - this.method2434(); - PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1373.last(); - synchronized(var3) { - int var5 = var3.update(); - if (var5 < 0) { - var3.field1476 = 0; - this.method2424(var3); + int var2 = this.field1368 - this.field1366; // L: 108 + this.skipSubStreams(var2); // L: 109 + var1 -= var2; // L: 110 + this.field1366 += var2; // L: 111 + this.method2385(); // L: 112 + PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field1365.last(); // L: 113 + synchronized(var3) { // L: 114 + int var5 = var3.update(); // L: 115 + if (var5 < 0) { // L: 116 + var3.field1476 = 0; // L: 117 + this.method2388(var3); // L: 118 } else { - var3.field1476 = var5; - this.method2423(var3.previous, var3); + var3.field1476 = var5; // L: 121 + this.method2408(var3.previous, var3); // L: 122 } } - } while(var1 != 0); + } while(var1 != 0); // L: 125 } - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("skipSubStreams") void skipSubStreams(int var1) { - for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { - var2.skip(var1); + for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) { // L: 130 + var2.skip(var1); // L: 131 } - } + } // L: 133 } diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java index 4b7fb30e90..fa1ac88a6d 100644 --- a/runescape-client/src/main/java/PcmStreamMixerListener.java +++ b/runescape-client/src/main/java/PcmStreamMixerListener.java @@ -3,19 +3,19 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("db") +@ObfuscatedName("di") @Implements("PcmStreamMixerListener") public abstract class PcmStreamMixerListener extends Node { - @ObfuscatedName("m") + @ObfuscatedName("z") int field1476; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("remove2") abstract void remove2(); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ldd;)I" + descriptor = "(Ldh;)I" ) @Export("update") abstract int update(); diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java index 1f0c11b37d..5949fcd78a 100644 --- a/runescape-client/src/main/java/PendingSpawn.java +++ b/runescape-client/src/main/java/PendingSpawn.java @@ -5,153 +5,136 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bt") +@ObfuscatedName("bs") @Implements("PendingSpawn") public final class PendingSpawn extends Node { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1985828823 - ) - @Export("plane") - int plane; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -1983032759 - ) - @Export("type") - int type; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1818060675 - ) - @Export("x") - int x; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1999145911 - ) - @Export("y") - int y; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 386133029 + intValue = -1658510555 ) @Export("objectId") int objectId; - @ObfuscatedName("g") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1588520035 + intValue = 537531937 ) - int field956; - @ObfuscatedName("n") + @Export("plane") + int plane; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1476403807 + intValue = -451639577 ) - int field957; - @ObfuscatedName("u") + @Export("type") + int type; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1658497211 + intValue = -805517653 + ) + @Export("x") + int x; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 309622261 + ) + @Export("y") + int y; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1728058903 + ) + int field960; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -629147525 + ) + int field961; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -922964443 ) @Export("id") int id; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1422873381 + intValue = 1252885215 ) @Export("orientation") int orientation; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1345962763 + intValue = -743478207 ) - int field962; - @ObfuscatedName("w") + int field964; + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -577159519 + intValue = 1560488333 ) @Export("delay") int delay; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 790870073 + intValue = 1735849843 ) @Export("hitpoints") int hitpoints; PendingSpawn() { - this.delay = 0; - this.hitpoints = -1; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;I)[Llh;", - garbageValue = "574747014" - ) - public static IndexedSprite[] method1806(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return HealthBar.method2125(var0, var3, var4); - } + this.delay = 0; // L: 16 + this.hitpoints = -1; // L: 17 + } // L: 19 @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(Lhd;I[B[BI)V", - garbageValue = "-1571904788" + descriptor = "(III)I", + garbageValue = "681625855" ) - @Export("Widget_setKey") - static final void Widget_setKey(Widget var0, int var1, byte[] var2, byte[] var3) { - if (var0.field2647 == null) { - if (var2 == null) { - return; - } - - var0.field2647 = new byte[11][]; - var0.field2678 = new byte[11][]; - var0.field2679 = new int[11]; - var0.field2680 = new int[11]; - } - - var0.field2647[var1] = var2; - if (var2 != null) { - var0.field2709 = true; + static final int method1795(int var0, int var1) { + if (var0 == -1) { // L: 863 + return 12345678; } else { - var0.field2709 = false; - - for (int var4 = 0; var4 < var0.field2647.length; ++var4) { - if (var0.field2647[var4] != null) { - var0.field2709 = true; - break; - } + var1 = (var0 & 127) * var1 / 128; // L: 864 + if (var1 < 2) { // L: 865 + var1 = 2; + } else if (var1 > 126) { // L: 866 + var1 = 126; } - } - var0.field2678[var1] = var3; + return (var0 & 65408) + var1; // L: 867 + } } - @ObfuscatedName("k") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "556274205" + descriptor = "(ILcy;ZB)I", + garbageValue = "1" ) - static int method1808(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemId; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { - if (var3.itemId != -1) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.itemQuantity; + static int method1794(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Canvas.field438 : class3.field12; // L: 1122 + if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1123 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var3)); // L: 1124 + return 1; // L: 1125 + } else if (var0 != ScriptOpcodes.CC_GETOP) { // L: 1127 + if (var0 == ScriptOpcodes.CC_GETOPBASE) { // L: 1134 + if (var3.dataText == null) { // L: 1135 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1136 + } + + return 1; // L: 1137 } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + return 2; // L: 1139 + } + } else { + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1128 + --var4; // L: 1129 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1130 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1131 + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; } - return 1; - } else if (var0 == ScriptOpcodes.CC_GETID) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.childIndex; - return 1; - } else { - return 2; + return 1; // L: 1132 } } } diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java index 1704e50a54..167c61503a 100644 --- a/runescape-client/src/main/java/PlatformInfo.java +++ b/runescape-client/src/main/java/PlatformInfo.java @@ -4,188 +4,228 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mc") +@ObfuscatedName("mr") @Implements("PlatformInfo") public class PlatformInfo extends Node { - @ObfuscatedName("ab") - @ObfuscatedGetter( - intValue = 372314029 - ) - int field3958; - @ObfuscatedName("am") - boolean field3932; - @ObfuscatedName("ak") - @ObfuscatedGetter( - intValue = 146044699 - ) - int field3937; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = 1561853885 - ) - int field3938; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = 139773765 - ) - int field3939; - @ObfuscatedName("ar") - @ObfuscatedGetter( - intValue = -2088982113 - ) - int field3940; @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 174880953 - ) - int field3941; - @ObfuscatedName("al") - boolean field3942; - @ObfuscatedName("an") - @ObfuscatedGetter( - intValue = 48276617 - ) - int field3959; - @ObfuscatedName("ac") - @ObfuscatedGetter( - intValue = 1247220209 - ) - int field3949; - @ObfuscatedName("af") - @ObfuscatedGetter( - intValue = -609367375 - ) - int field3945; - @ObfuscatedName("at") - @ObfuscatedGetter( - intValue = 1576577653 + intValue = -1124416131 ) int field3946; + @ObfuscatedName("au") + boolean field3947; @ObfuscatedName("aa") - String field3947; - @ObfuscatedName("aw") - String field3948; - @ObfuscatedName("az") - String field3953; - @ObfuscatedName("aq") - String field3950; - @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = -229581371 + intValue = -2075791329 + ) + int field3966; + @ObfuscatedName("ar") + @ObfuscatedGetter( + intValue = 1751132195 + ) + int field3949; + @ObfuscatedName("at") + @ObfuscatedGetter( + intValue = 1214639501 + ) + int field3950; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = -118237247 ) int field3951; - @ObfuscatedName("au") + @ObfuscatedName("al") @ObfuscatedGetter( - intValue = 968666789 + intValue = -392627061 ) - int field3952; + int field3942; + @ObfuscatedName("ah") + boolean field3953; + @ObfuscatedName("av") + @ObfuscatedGetter( + intValue = 41619559 + ) + int field3957; + @ObfuscatedName("ax") + @ObfuscatedGetter( + intValue = -1839522133 + ) + int field3948; + @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = -1827610411 + ) + int field3956; + @ObfuscatedName("ad") + @ObfuscatedGetter( + intValue = 773398051 + ) + int field3959; + @ObfuscatedName("ai") + String field3958; + @ObfuscatedName("ay") + String field3960; @ObfuscatedName("aj") + String field3937; + @ObfuscatedName("aw") + String field3961; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = -1359786411 + intValue = 1592928573 ) - int field3955; - @ObfuscatedName("bk") + int field3962; + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = 401731303 + intValue = 325841347 ) - int field3954; + int field3963; + @ObfuscatedName("ac") + @ObfuscatedGetter( + intValue = -865607359 + ) + int field3964; + @ObfuscatedName("bl") + @ObfuscatedGetter( + intValue = -1202183243 + ) + int field3965; + @ObfuscatedName("bc") + String field3941; + @ObfuscatedName("bz") + String field3967; + @ObfuscatedName("bj") + int[] field3968; @ObfuscatedName("bh") - String field3943; - @ObfuscatedName("bg") - String field3936; - @ObfuscatedName("be") - int[] field3957; - @ObfuscatedName("bf") @ObfuscatedGetter( - intValue = 1085036985 + intValue = -1188578061 ) - int field3944; - @ObfuscatedName("ba") - String field3934; + int field3969; + @ObfuscatedName("bi") + String field3970; PlatformInfo(int var1, boolean var2, int var3, int var4, int var5, int var6, int var7, boolean var8, int var9, int var10, int var11, int var12, String var13, String var14, String var15, String var16, int var17, int var18, int var19, int var20, String var21, String var22, int[] var23, int var24, String var25) { - this.field3957 = new int[3]; - this.field3958 = var1; - this.field3932 = var2; - this.field3937 = var3; - this.field3938 = var4; - this.field3939 = var5; - this.field3940 = var6; - this.field3941 = var7; - this.field3942 = var8; - this.field3959 = var9; - this.field3949 = var10; - this.field3945 = var11; - this.field3946 = var12; - this.field3947 = var13; - this.field3948 = var14; - this.field3953 = var15; - this.field3950 = var16; - this.field3951 = var17; - this.field3952 = var18; - this.field3955 = var19; - this.field3954 = var20; - this.field3943 = var21; - this.field3936 = var22; - this.field3957 = var23; - this.field3944 = var24; - this.field3934 = var25; - } + this.field3968 = new int[3]; // L: 62 + this.field3946 = var1; // L: 67 + this.field3947 = var2; // L: 68 + this.field3966 = var3; // L: 69 + this.field3949 = var4; // L: 70 + this.field3950 = var5; // L: 71 + this.field3951 = var6; // L: 72 + this.field3942 = var7; // L: 73 + this.field3953 = var8; // L: 74 + this.field3957 = var9; // L: 75 + this.field3948 = var10; // L: 76 + this.field3956 = var11; // L: 77 + this.field3959 = var12; // L: 78 + this.field3958 = var13; // L: 79 + this.field3960 = var14; // L: 80 + this.field3937 = var15; // L: 81 + this.field3961 = var16; // L: 82 + this.field3962 = var17; // L: 83 + this.field3963 = var18; // L: 84 + this.field3964 = var19; // L: 85 + this.field3965 = var20; // L: 86 + this.field3941 = var21; // L: 87 + this.field3967 = var22; // L: 88 + this.field3968 = var23; // L: 89 + this.field3969 = var24; // L: 90 + this.field3970 = var25; // L: 91 + } // L: 92 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "972520847" + descriptor = "(Lkf;B)V", + garbageValue = "34" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(8); - var1.writeByte(this.field3958); - var1.writeByte(this.field3932 ? 1 : 0); - var1.writeShort(this.field3937); - var1.writeByte(this.field3938); - var1.writeByte(this.field3939); - var1.writeByte(this.field3940); - var1.writeByte(this.field3941); - var1.writeByte(this.field3942 ? 1 : 0); + var1.writeByte(8); // L: 95 + var1.writeByte(this.field3946); // L: 96 + var1.writeByte(this.field3947 ? 1 : 0); // L: 97 + var1.writeShort(this.field3966); // L: 98 + var1.writeByte(this.field3949); // L: 99 + var1.writeByte(this.field3950); // L: 100 + var1.writeByte(this.field3951); // L: 101 + var1.writeByte(this.field3942); // L: 102 + var1.writeByte(this.field3953 ? 1 : 0); // L: 103 + var1.writeShort(this.field3957); // L: 104 + var1.writeByte(this.field3948); // L: 105 + var1.writeMedium(this.field3956); // L: 106 var1.writeShort(this.field3959); - var1.writeByte(this.field3949); - var1.writeMedium(this.field3945); - var1.writeShort(this.field3946); - var1.writeStringCp1252NullCircumfixed(this.field3947); - var1.writeStringCp1252NullCircumfixed(this.field3948); - var1.writeStringCp1252NullCircumfixed(this.field3953); - var1.writeStringCp1252NullCircumfixed(this.field3950); - var1.writeByte(this.field3952); - var1.writeShort(this.field3951); - var1.writeStringCp1252NullCircumfixed(this.field3943); - var1.writeStringCp1252NullCircumfixed(this.field3936); - var1.writeByte(this.field3955); - var1.writeByte(this.field3954); + var1.writeStringCp1252NullCircumfixed(this.field3958); + var1.writeStringCp1252NullCircumfixed(this.field3960); + var1.writeStringCp1252NullCircumfixed(this.field3937); + var1.writeStringCp1252NullCircumfixed(this.field3961); + var1.writeByte(this.field3963); + var1.writeShort(this.field3962); + var1.writeStringCp1252NullCircumfixed(this.field3941); + var1.writeStringCp1252NullCircumfixed(this.field3967); + var1.writeByte(this.field3964); + var1.writeByte(this.field3965); - for (int var2 = 0; var2 < this.field3957.length; ++var2) { - var1.writeInt(this.field3957[var2]); + for (int var2 = 0; var2 < this.field3968.length; ++var2) { // L: 118 + var1.writeInt(this.field3968[var2]); } - var1.writeInt(this.field3944); - var1.writeStringCp1252NullCircumfixed(this.field3934); + var1.writeInt(this.field3969); + var1.writeStringCp1252NullCircumfixed(this.field3970); } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1553987970" + garbageValue = "-202992024" ) @Export("size") public int size() { byte var1 = 39; - int var2 = var1 + TextureProvider.method2873(this.field3947); - var2 += TextureProvider.method2873(this.field3948); - var2 += TextureProvider.method2873(this.field3953); - var2 += TextureProvider.method2873(this.field3950); - var2 += TextureProvider.method2873(this.field3943); - var2 += TextureProvider.method2873(this.field3936); - var2 += TextureProvider.method2873(this.field3934); + int var2 = var1 + class228.method4189(this.field3958); + var2 += class228.method4189(this.field3960); + var2 += class228.method4189(this.field3937); + var2 += class228.method4189(this.field3961); + var2 += class228.method4189(this.field3941); + var2 += class228.method4189(this.field3967); // L: 130 + var2 += class228.method4189(this.field3970); return var2; } + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-34" + ) + static final void method6411() { + if (!ViewportMouse.ViewportMouse_false0) { // L: 107 + int var0 = Scene.Scene_cameraPitchSine; // L: 108 + int var1 = Scene.Scene_cameraPitchCosine; // L: 109 + int var2 = Scene.Scene_cameraYawSine; // L: 110 + int var3 = Scene.Scene_cameraYawCosine; // L: 111 + byte var4 = 50; // L: 112 + short var5 = 3500; // L: 113 + int var6 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 114 + int var7 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var4 / Rasterizer3D.Rasterizer3D_zoom; // L: 115 + int var8 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 116 + int var9 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var5 / Rasterizer3D.Rasterizer3D_zoom; // L: 117 + int var10 = Rasterizer3D.method3132(var7, var4, var1, var0); // L: 119 + int var11 = Rasterizer3D.method3124(var7, var4, var1, var0); // L: 120 + var7 = var10; // L: 121 + var10 = Rasterizer3D.method3132(var9, var5, var1, var0); // L: 122 + int var12 = Rasterizer3D.method3124(var9, var5, var1, var0); // L: 123 + var9 = var10; // L: 124 + var10 = Rasterizer3D.method3131(var6, var11, var3, var2); // L: 125 + var11 = Rasterizer3D.method3111(var6, var11, var3, var2); // L: 126 + var6 = var10; // L: 127 + var10 = Rasterizer3D.method3131(var8, var12, var3, var2); // L: 128 + var12 = Rasterizer3D.method3111(var8, var12, var3, var2); // L: 129 + ViewportMouse.field1768 = (var6 + var10) / 2; // L: 131 + class217.field2537 = (var7 + var9) / 2; // L: 132 + ViewportMouse.field1769 = (var11 + var12) / 2; // L: 133 + SpriteMask.field2552 = (var10 - var6) / 2; // L: 134 + WorldMapSectionType.field178 = (var9 - var7) / 2; // L: 135 + ViewportMouse.field1770 = (var12 - var11) / 2; // L: 136 + class3.field25 = Math.abs(SpriteMask.field2552); // L: 137 + class234.field3100 = Math.abs(WorldMapSectionType.field178); // L: 138 + ViewportMouse.field1771 = Math.abs(ViewportMouse.field1770); // L: 139 + } + } // L: 140 } diff --git a/runescape-client/src/main/java/PlatformInfoProvider.java b/runescape-client/src/main/java/PlatformInfoProvider.java index 6e5084bc58..b8f75af858 100644 --- a/runescape-client/src/main/java/PlatformInfoProvider.java +++ b/runescape-client/src/main/java/PlatformInfoProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("mk") +@ObfuscatedName("mo") @Implements("PlatformInfoProvider") public interface PlatformInfoProvider { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Lmc;", - garbageValue = "-1826697521" + descriptor = "(I)Lmr;", + garbageValue = "-1896317364" ) @Export("get") PlatformInfo get(); diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 9ffd42874f..690934b1cb 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -3,229 +3,237 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("by") +@ObfuscatedName("bf") @Implements("Player") public final class Player extends Actor { - @ObfuscatedName("gi") - @ObfuscatedGetter( - intValue = 1432806709 - ) - static int field638; - @ObfuscatedName("m") + @ObfuscatedName("oa") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lfd;" + ) + @Export("mouseWheel") + static MouseWheel mouseWheel; + @ObfuscatedName("pp") + @ObfuscatedSignature( + descriptor = "Lld;" + ) + @Export("privateChatMode") + static PrivateChatMode privateChatMode; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lku;" ) @Export("username") Username username; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhv;" + descriptor = "Lha;" ) @Export("appearance") PlayerAppearance appearance; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1861709523 + intValue = 262221405 ) @Export("headIconPk") int headIconPk; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 777321397 + intValue = 1053442849 ) @Export("headIconPrayer") int headIconPrayer; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("actions") String[] actions; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2047058123 + intValue = -1265290789 ) @Export("combatLevel") int combatLevel; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1460634789 + intValue = -2038384431 ) @Export("skillLevel") int skillLevel; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -287002613 + intValue = 1117584059 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 1724096507 + intValue = 1379087493 ) @Export("animationCycleStart") int animationCycleStart; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -691368709 + intValue = 1569239967 ) @Export("animationCycleEnd") int animationCycleEnd; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 366626367 + intValue = 658942553 ) - int field661; - @ObfuscatedName("c") + int field645; + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 1150589939 + intValue = 232655151 ) @Export("tileHeight2") int tileHeight2; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1432568009 + intValue = 1335611075 ) - int field653; - @ObfuscatedName("k") + int field640; + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lef;" + descriptor = "Ler;" ) @Export("model0") Model model0; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 1121860103 - ) - int field648; - @ObfuscatedName("s") - @ObfuscatedGetter( - intValue = -1904203447 + intValue = 896754859 ) int field649; - @ObfuscatedName("v") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = -1087815703 + intValue = 177396383 ) - int field650; - @ObfuscatedName("d") + int field635; + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -910928239 + intValue = -797190095 ) int field651; - @ObfuscatedName("e") + @ObfuscatedName("v") + @ObfuscatedGetter( + intValue = -191920347 + ) + int field643; + @ObfuscatedName("j") @Export("isUnanimated") boolean isUnanimated; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -136485713 + intValue = 1988252929 ) @Export("team") int team; - @ObfuscatedName("t") + @ObfuscatedName("u") @Export("isHidden") boolean isHidden; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 679078717 + intValue = -398923579 ) @Export("plane") int plane; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 445698711 + intValue = -1030686615 ) @Export("index") int index; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkm;" ) @Export("isFriendTriBool") TriBool isFriendTriBool; - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkm;" ) @Export("isInClanChat") TriBool isInClanChat; - @ObfuscatedName("ah") - boolean field659; - @ObfuscatedName("ai") + @ObfuscatedName("ab") + boolean field660; + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 1374290549 + intValue = 321223155 ) @Export("tileX") int tileX; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = 499025605 + intValue = 1001779515 ) @Export("tileY") int tileY; Player() { this.headIconPk = -1; - this.headIconPrayer = -1; - this.actions = new String[3]; + this.headIconPrayer = -1; // L: 19 + this.actions = new String[3]; // L: 21 - for (int var1 = 0; var1 < 3; ++var1) { + for (int var1 = 0; var1 < 3; ++var1) { // L: 24 this.actions[var1] = ""; } - this.combatLevel = 0; - this.skillLevel = 0; - this.animationCycleStart = 0; - this.animationCycleEnd = 0; - this.isUnanimated = false; - this.team = 0; - this.isHidden = false; - this.isFriendTriBool = TriBool.TriBool_unknown; - this.isInClanChat = TriBool.TriBool_unknown; - this.field659 = false; - } + this.combatLevel = 0; // L: 27 + this.skillLevel = 0; // L: 28 + this.animationCycleStart = 0; // L: 30 + this.animationCycleEnd = 0; // L: 31 + this.isUnanimated = false; // L: 40 + this.team = 0; // L: 41 + this.isHidden = false; // L: 42 + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 45 + this.isInClanChat = TriBool.TriBool_unknown; // L: 46 + this.field660 = false; // L: 47 + } // L: 51 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "1937390555" + descriptor = "(Lkf;I)V", + garbageValue = "-1567604648" ) @Export("read") final void read(Buffer var1) { - var1.offset = 0; - int var2 = var1.readUnsignedByte(); - this.headIconPk = var1.readByte(); - this.headIconPrayer = var1.readByte(); - int var3 = -1; - this.team = 0; - int[] var4 = new int[12]; + var1.offset = 0; // L: 54 + int var2 = var1.readUnsignedByte(); // L: 55 + this.headIconPk = var1.readByte(); // L: 56 + this.headIconPrayer = var1.readByte(); // L: 57 + int var3 = -1; // L: 58 + this.team = 0; // L: 59 + int[] var4 = new int[12]; // L: 60 int var6; int var7; - for (int var5 = 0; var5 < 12; ++var5) { - var6 = var1.readUnsignedByte(); - if (var6 == 0) { - var4[var5] = 0; + for (int var5 = 0; var5 < 12; ++var5) { // L: 61 + var6 = var1.readUnsignedByte(); // L: 62 + if (var6 == 0) { // L: 63 + var4[var5] = 0; // L: 64 } else { - var7 = var1.readUnsignedByte(); - var4[var5] = var7 + (var6 << 8); - if (var5 == 0 && var4[0] == 65535) { - var3 = var1.readUnsignedShort(); + var7 = var1.readUnsignedByte(); // L: 67 + var4[var5] = var7 + (var6 << 8); // L: 68 + if (var5 == 0 && var4[0] == 65535) { // L: 69 + var3 = var1.readUnsignedShort(); // L: 70 break; } - if (var4[var5] >= 512) { - int var8 = KitDefinition.ItemDefinition_get(var4[var5] - 512).team; - if (var8 != 0) { + if (var4[var5] >= 512) { // L: 73 + int var8 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var4[var5] - 512).team; // L: 74 + if (var8 != 0) { // L: 75 this.team = var8; } } } } - int[] var9 = new int[5]; + int[] var9 = new int[5]; // L: 78 for (var6 = 0; var6 < 5; ++var6) { var7 = var1.readUnsignedByte(); - if (var7 < 0 || var7 >= PlayerAppearance.field2575[var6].length) { + if (var7 < 0 || var7 >= WorldMapSprite.field253[var6].length) { var7 = 0; } @@ -238,224 +246,224 @@ public final class Player extends Actor { } super.turnLeftSequence = var1.readUnsignedShort(); - if (super.turnLeftSequence == 65535) { + if (super.turnLeftSequence == 65535) { // L: 87 super.turnLeftSequence = -1; } - super.turnRightSequence = super.turnLeftSequence; - super.walkSequence = var1.readUnsignedShort(); + super.turnRightSequence = super.turnLeftSequence; // L: 88 + super.walkSequence = var1.readUnsignedShort(); // L: 89 if (super.walkSequence == 65535) { super.walkSequence = -1; } - super.walkBackSequence = var1.readUnsignedShort(); - if (super.walkBackSequence == 65535) { + super.walkBackSequence = var1.readUnsignedShort(); // L: 91 + if (super.walkBackSequence == 65535) { // L: 92 super.walkBackSequence = -1; } - super.walkLeftSequence = var1.readUnsignedShort(); + super.walkLeftSequence = var1.readUnsignedShort(); // L: 93 if (super.walkLeftSequence == 65535) { - super.walkLeftSequence = -1; + super.walkLeftSequence = -1; // L: 94 } - super.walkRightSequence = var1.readUnsignedShort(); - if (super.walkRightSequence == 65535) { + super.walkRightSequence = var1.readUnsignedShort(); // L: 95 + if (super.walkRightSequence == 65535) { // L: 96 super.walkRightSequence = -1; } - super.runSequence = var1.readUnsignedShort(); - if (super.runSequence == 65535) { + super.runSequence = var1.readUnsignedShort(); // L: 97 + if (super.runSequence == 65535) { // L: 98 super.runSequence = -1; } - this.username = new Username(var1.readStringCp1252NullTerminated(), class195.loginType); - this.clearIsFriend(); - this.clearIsInClanChat(); - if (this == class60.localPlayer) { + this.username = new Username(var1.readStringCp1252NullTerminated(), WorldMapAreaData.loginType); // L: 99 + this.clearIsFriend(); // L: 100 + this.clearIsInClanChat(); // L: 101 + if (this == WorldMapLabelSize.localPlayer) { // L: 102 RunException.localPlayerName = this.username.getName(); } - this.combatLevel = var1.readUnsignedByte(); - this.skillLevel = var1.readUnsignedShort(); - this.isHidden = var1.readUnsignedByte() == 1; - if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { + this.combatLevel = var1.readUnsignedByte(); // L: 103 + this.skillLevel = var1.readUnsignedShort(); // L: 104 + this.isHidden = var1.readUnsignedByte() == 1; // L: 105 + if (Client.gameBuild == 0 && Client.staffModLevel >= 2) { // L: 106 this.isHidden = false; } - if (this.appearance == null) { + if (this.appearance == null) { // L: 107 this.appearance = new PlayerAppearance(); } - this.appearance.update(var4, var9, var2 == 1, var3); + this.appearance.update(var4, var9, var2 == 1, var3); // L: 108 + } // L: 109 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-659819020" + ) + @Export("isFriend") + boolean isFriend() { + if (this.isFriendTriBool == TriBool.TriBool_unknown) { // L: 112 + this.checkIsFriend(); // L: 113 + } + + return this.isFriendTriBool == TriBool.TriBool_true; // L: 115 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1737435180" + ) + @Export("clearIsFriend") + void clearIsFriend() { + this.isFriendTriBool = TriBool.TriBool_unknown; // L: 119 + } // L: 120 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1949087224" + ) + @Export("checkIsFriend") + void checkIsFriend() { + this.isFriendTriBool = class60.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 123 + } // L: 124 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "73" + ) + @Export("isClanMember") + boolean isClanMember() { + if (this.isInClanChat == TriBool.TriBool_unknown) { // L: 127 + this.updateIsInClanChat(); // L: 128 + } + + return this.isInClanChat == TriBool.TriBool_true; // L: 130 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-928055977" + descriptor = "(B)V", + garbageValue = "94" ) - @Export("isFriend") - boolean isFriend() { - if (this.isFriendTriBool == TriBool.TriBool_unknown) { - this.checkIsFriend(); - } + @Export("clearIsInClanChat") + void clearIsInClanChat() { + this.isInClanChat = TriBool.TriBool_unknown; // L: 134 + } // L: 135 - return this.isFriendTriBool == TriBool.TriBool_true; - } - - @ObfuscatedName("q") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1165782088" + garbageValue = "2055605300" ) - @Export("clearIsFriend") - void clearIsFriend() { - this.isFriendTriBool = TriBool.TriBool_unknown; - } + @Export("updateIsInClanChat") + void updateIsInClanChat() { + this.isInClanChat = Entity.clanChat != null && Entity.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; // L: 138 + } // L: 139 - @ObfuscatedName("j") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2131517341" + descriptor = "(I)I", + garbageValue = "1374983546" ) - @Export("checkIsFriend") - void checkIsFriend() { - this.isFriendTriBool = ModeWhere.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1651593034" - ) - @Export("isClanMember") - boolean isClanMember() { - if (this.isInClanChat == TriBool.TriBool_unknown) { - this.updateIsInClanChat(); - } - - return this.isInClanChat == TriBool.TriBool_true; + @Export("transformedSize") + int transformedSize() { + return this.appearance != null && this.appearance.npcTransformId != -1 ? Skeleton.getNpcDefinition(this.appearance.npcTransformId).size : 1; // L: 142 143 145 } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1245879584" - ) - @Export("clearIsInClanChat") - void clearIsInClanChat() { - this.isInClanChat = TriBool.TriBool_unknown; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - @Export("updateIsInClanChat") - void updateIsInClanChat() { - this.isInClanChat = ClientPreferences.clanChat != null && ClientPreferences.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-6778929" - ) - @Export("transformedSize") - int transformedSize() { - return this.appearance != null && this.appearance.npcTransformId != -1 ? StudioGame.getNpcDefinition(this.appearance.npcTransformId).size : 1; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)Lef;", - garbageValue = "1832696685" + descriptor = "(I)Ler;", + garbageValue = "-2026237468" ) @Export("getModel") protected final Model getModel() { - if (this.appearance == null) { + if (this.appearance == null) { // L: 149 return null; } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? NetSocket.SequenceDefinition_get(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : NetSocket.SequenceDefinition_get(super.movementSequence); - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapRegion.SequenceDefinition_get(super.sequence) : null; // L: 150 + SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.idleSequence != super.movementSequence || var1 == null) ? WorldMapRegion.SequenceDefinition_get(super.movementSequence) : null; // L: 151 + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 152 + if (var3 == null) { // L: 153 return null; } else { - var3.calculateBoundsCylinder(); - super.defaultHeight = var3.height; + var3.calculateBoundsCylinder(); // L: 154 + super.defaultHeight = var3.height; // L: 155 Model var4; Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = class4.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.field1005, 0); - var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 156 + var4 = Tiles.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 157 + if (var4 != null) { // L: 158 + var4.offsetBy(0, -super.field1003, 0); // L: 159 + var5 = new Model[]{var3, var4}; // L: 160 + var3 = new Model(var5, 2); // L: 161 } } - if (!this.isUnanimated && this.model0 != null) { - if (Client.cycle >= this.animationCycleEnd) { + if (!this.isUnanimated && this.model0 != null) { // L: 164 + if (Client.cycle >= this.animationCycleEnd) { // L: 165 this.model0 = null; } - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { - var4 = this.model0; - var4.offsetBy(this.field661 - super.x, this.tileHeight2 - this.tileHeight, this.field653 - super.y); - if (super.orientation == 512) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1536) { + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { // L: 166 + var4 = this.model0; // L: 167 + var4.offsetBy(this.field645 - super.x, this.tileHeight2 - this.tileHeight, this.field640 - super.y); // L: 168 + if (super.orientation == 512) { // L: 169 + var4.rotateY90Ccw(); // L: 170 + var4.rotateY90Ccw(); // L: 171 + var4.rotateY90Ccw(); // L: 172 + } else if (super.orientation == 1024) { // L: 174 + var4.rotateY90Ccw(); // L: 175 + var4.rotateY90Ccw(); // L: 176 + } else if (super.orientation == 1536) { // L: 178 var4.rotateY90Ccw(); } - var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); - if (super.orientation == 512) { - var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1536) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); + var5 = new Model[]{var3, var4}; // L: 179 + var3 = new Model(var5, 2); // L: 180 + if (super.orientation == 512) { // L: 181 var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { // L: 182 + var4.rotateY90Ccw(); // L: 183 + var4.rotateY90Ccw(); // L: 184 + } else if (super.orientation == 1536) { // L: 186 + var4.rotateY90Ccw(); // L: 187 + var4.rotateY90Ccw(); // L: 188 + var4.rotateY90Ccw(); // L: 189 } - var4.offsetBy(super.x - this.field661, this.tileHeight - this.tileHeight2, super.y - this.field653); + var4.offsetBy(super.x - this.field645, this.tileHeight - this.tileHeight2, super.y - this.field640); // L: 191 } } - var3.isSingleTile = true; - return var3; + var3.isSingleTile = true; // L: 194 + return var3; // L: 195 } } } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(IIBI)V", - garbageValue = "-1126022474" + garbageValue = "954112592" ) - final void method1300(int var1, int var2, byte var3) { - if (super.sequence != -1 && NetSocket.SequenceDefinition_get(super.sequence).field3560 == 1) { + final void method1286(int var1, int var2, byte var3) { + if (super.sequence != -1 && WorldMapRegion.SequenceDefinition_get(super.sequence).field3541 == 1) { // L: 199 super.sequence = -1; } - super.field992 = -1; - if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { - if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { - if (var3 == 2) { - ApproximateRouteStrategy.method1284(this, var1, var2, (byte)2); + super.field1000 = -1; // L: 200 + if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) { // L: 201 + if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) { // L: 202 + if (var3 == 2) { // L: 204 + PacketBuffer.method5598(this, var1, var2, (byte)2); } - this.method1302(var1, var2, var3); + this.method1288(var1, var2, var3); // L: 205 } else { this.resetPath(var1, var2); } @@ -463,154 +471,807 @@ public final class Player extends Actor { this.resetPath(var1, var2); } - } + } // L: 207 - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "2675490" + garbageValue = "-1761567284" ) @Export("resetPath") void resetPath(int var1, int var2) { - super.pathLength = 0; - super.field1023 = 0; - super.field1022 = 0; - super.pathX[0] = var1; - super.pathY[0] = var2; - int var3 = this.transformedSize(); - super.x = var3 * 64 + super.pathX[0] * 128; - super.y = var3 * 64 + super.pathY[0] * 128; - } + super.pathLength = 0; // L: 210 + super.field973 = 0; // L: 211 + super.field1032 = 0; // L: 212 + super.pathX[0] = var1; // L: 213 + super.pathY[0] = var2; // L: 214 + int var3 = this.transformedSize(); // L: 215 + super.x = var3 * 64 + super.pathX[0] * 128; // L: 216 + super.y = var3 * 64 + super.pathY[0] * 128; // L: 217 + } // L: 218 - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIBI)V", - garbageValue = "-1628655645" + descriptor = "(IIBB)V", + garbageValue = "5" ) - final void method1302(int var1, int var2, byte var3) { - if (super.pathLength < 9) { + final void method1288(int var1, int var2, byte var3) { + if (super.pathLength < 9) { // L: 221 ++super.pathLength; } - for (int var4 = super.pathLength; var4 > 0; --var4) { - super.pathX[var4] = super.pathX[var4 - 1]; - super.pathY[var4] = super.pathY[var4 - 1]; - super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; + for (int var4 = super.pathLength; var4 > 0; --var4) { // L: 222 + super.pathX[var4] = super.pathX[var4 - 1]; // L: 223 + super.pathY[var4] = super.pathY[var4 - 1]; // L: 224 + super.pathTraversed[var4] = super.pathTraversed[var4 - 1]; // L: 225 } - super.pathX[0] = var1; - super.pathY[0] = var2; - super.pathTraversed[0] = var3; - } + super.pathX[0] = var1; // L: 227 + super.pathY[0] = var2; // L: 228 + super.pathTraversed[0] = var3; // L: 229 + } // L: 230 - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "1" + descriptor = "(I)Z", + garbageValue = "68470795" ) @Export("isVisible") final boolean isVisible() { - return this.appearance != null; + return this.appearance != null; // L: 233 } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-2139314606" + descriptor = "(Lkf;Ljava/lang/String;I)I", + garbageValue = "-1169357315" ) - @Export("changeWorldSelectSorting") - static void changeWorldSelectSorting(int var0, int var1) { - int[] var2 = new int[4]; - int[] var3 = new int[4]; - var2[0] = var0; - var3[0] = var1; - int var4 = 1; + public static int method1326(Buffer var0, String var1) { + int var2 = var0.offset; // L: 14 + byte[] var3 = EnumDefinition.method4644(var1); // L: 15 + var0.writeSmartByteShort(var3.length); // L: 16 + var0.offset += class219.huffman.compress(var3, 0, var3.length, var0.array, var0.offset); // L: 17 + return var0.offset - var2; // L: 18 + } - for (int var5 = 0; var5 < 4; ++var5) { - if (World.World_sortOption1[var5] != var0) { - var2[var4] = World.World_sortOption1[var5]; - var3[var4] = World.World_sortOption2[var5]; - ++var4; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIIIB)V", + garbageValue = "-94" + ) + static final void method1327(int var0, int var1, int var2, int var3) { + for (int var4 = var1; var4 <= var3 + var1; ++var4) { // L: 79 + for (int var5 = var0; var5 <= var0 + var2; ++var5) { // L: 80 + if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) { // L: 81 + class22.field122[0][var5][var4] = 127; // L: 82 + if (var0 == var5 && var5 > 0) { // L: 83 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4]; + } + + if (var0 + var2 == var5 && var5 < 103) { // L: 84 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4]; + } + + if (var4 == var1 && var4 > 0) { // L: 85 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1]; + } + + if (var3 + var1 == var4 && var4 < 103) { // L: 86 + Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1]; + } + } } } - World.World_sortOption1 = var2; - World.World_sortOption2 = var3; - GrandExchangeOffer.sortWorlds(class13.World_worlds, 0, class13.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - } + } // L: 90 - @ObfuscatedName("io") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lby;IIIS)V", - garbageValue = "160" + descriptor = "(Lkr;Lkr;Lkr;B)V", + garbageValue = "-76" ) - @Export("addPlayerToMenu") - static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { - if (class60.localPlayer != var0) { - if (Client.menuOptionsCount < 400) { - String var4; - if (var0.skillLevel == 0) { - var4 = var0.actions[0] + var0.username + var0.actions[1] + Canvas.getColorForCombatDifference(var0.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; - } else { - var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; - } + @Export("drawTitle") + static void drawTitle(Font var0, Font var1, Font var2) { + Login.xPadding = (FloorDecoration.canvasWidth - 765) / 2; // L: 1105 + Login.loginBoxX = Login.xPadding + 202; // L: 1106 + IsaacCipher.loginBoxCenter = Login.loginBoxX + 180; // L: 1107 + if (Login.worldSelectOpen) { // L: 1108 + ItemDefinition.method4823(var0, var1); // L: 1109 + } else { + UserComparator2.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 1112 + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 1113 + AbstractByteArrayCopier.logoSprite.drawAt(Login.xPadding + 382 - AbstractByteArrayCopier.logoSprite.subWidth / 2, 18); // L: 1114 + int var4; + if (Client.gameState == 0 || Client.gameState == 5) { // L: 1115 + byte var3 = 20; // L: 1116 + var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); // L: 1117 + var4 = 253 - var3; // L: 1118 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); // L: 1119 + Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); // L: 1120 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); // L: 1121 + Rasterizer2D.Rasterizer2D_fillRectangle(Login.Login_loadingPercent * 3 + (Login.loginBoxX + 180 - 150), var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); // L: 1122 + var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); // L: 1123 + } - int var5; - if (Client.isItemSelected == 1) { - ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16777215) + var4, 14, var1, var2, var3); - } else if (Client.isSpellSelected) { - if ((WorldMapSprite.selectedSpellFlags & 8) == 8) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16777215) + var4, 15, var1, var2, var3); + String var5; + String var6; + short var22; + int var23; + short var24; + if (Client.gameState == 20) { // L: 1125 + class296.titleboxSprite.drawAt(Login.loginBoxX + 180 - class296.titleboxSprite.subWidth / 2, 271 - class296.titleboxSprite.subHeight / 2); // L: 1126 + var22 = 201; // L: 1127 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1128 + var23 = var22 + 15; // L: 1129 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1130 + var23 += 15; // L: 1131 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1132 + var23 += 15; // L: 1133 + var23 += 7; // L: 1134 + if (Login.loginIndex != 4) { // L: 1135 + var0.draw("Login: ", Login.loginBoxX + 180 - 110, var23, 16777215, 0); // L: 1136 + var24 = 200; // L: 1137 + + for (var5 = WorldMapRectangle.method359(); var0.stringWidth(var5) > var24; var5 = var5.substring(0, var5.length() - 1)) { // L: 1138 1139 1140 } + + var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var23, 16777215, 0); // L: 1142 + var23 += 15; // L: 1143 + + for (var6 = FontName.method5445(Login.Login_password); var0.stringWidth(var6) > var24; var6 = var6.substring(1)) { // L: 1144 1145 1146 + } + + var0.draw("Password: " + var6, Login.loginBoxX + 180 - 108, var23, 16777215, 0); // L: 1148 + var23 += 15; // L: 1149 + } + } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 1152 + class296.titleboxSprite.drawAt(Login.loginBoxX, 171); // L: 1153 + short var17; + if (Login.loginIndex == 0) { // L: 1154 + var22 = 251; // L: 1155 + var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1156 + var23 = var22 + 30; // L: 1157 + var4 = Login.loginBoxX + 180 - 80; // L: 1158 + var17 = 291; // L: 1159 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1160 + var0.drawLines("New User", var4 - 73, var17 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1161 + var4 = Login.loginBoxX + 180 + 80; // L: 1162 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1163 + var0.drawLines("Existing User", var4 - 73, var17 - 20, 144, 40, 16777215, 0, 1, 1, 0); // L: 1164 + } else if (Login.loginIndex == 1) { // L: 1166 + var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); // L: 1167 + var22 = 236; // L: 1168 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1169 + var23 = var22 + 15; // L: 1170 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1171 + var23 += 15; // L: 1172 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1173 + var23 += 15; // L: 1174 + var4 = Login.loginBoxX + 180 - 80; // L: 1175 + var17 = 321; // L: 1176 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1177 + var0.drawCentered("Continue", var4, var17 + 5, 16777215, 0); // L: 1178 + var4 = Login.loginBoxX + 180 + 80; // L: 1179 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1180 + var0.drawCentered("Cancel", var4, var17 + 5, 16777215, 0); // L: 1181 } else { - for (var5 = 7; var5 >= 0; --var5) { - if (Client.playerMenuActions[var5] != null) { - short var6 = 0; - if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) { - if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { - continue; - } + int var7; + if (Login.loginIndex == 2) { // L: 1183 + var22 = 201; // L: 1184 + var0.drawCentered(Login.Login_response1, IsaacCipher.loginBoxCenter, var22, 16776960, 0); // L: 1185 + var23 = var22 + 15; // L: 1186 + var0.drawCentered(Login.Login_response2, IsaacCipher.loginBoxCenter, var23, 16776960, 0); // L: 1187 + var23 += 15; // L: 1188 + var0.drawCentered(Login.Login_response3, IsaacCipher.loginBoxCenter, var23, 16776960, 0); // L: 1189 + var23 += 15; // L: 1190 + var23 += 7; // L: 1191 + var0.draw("Login: ", IsaacCipher.loginBoxCenter - 110, var23, 16777215, 0); // L: 1192 + var24 = 200; // L: 1193 - if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class60.localPlayer.combatLevel) { - var6 = 2000; - } + for (var5 = WorldMapRectangle.method359(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { // L: 1194 1195 1196 + } - if (class60.localPlayer.team != 0 && var0.team != 0) { - if (var0.team == class60.localPlayer.team) { - var6 = 2000; - } else { - var6 = 0; - } - } - } else if (Client.playerOptionsPriorities[var5]) { - var6 = 2000; + var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? WorldMapAreaData.colorStartTag(16776960) + "|" : ""), IsaacCipher.loginBoxCenter - 70, var23, 16777215, 0); // L: 1198 + var23 += 15; // L: 1199 + + for (var6 = FontName.method5445(Login.Login_password); var0.stringWidth(var6) > var24; var6 = var6.substring(1)) { // L: 1200 1201 1202 + } + + var0.draw("Password: " + var6 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? WorldMapAreaData.colorStartTag(16776960) + "|" : ""), IsaacCipher.loginBoxCenter - 108, var23, 16777215, 0); // L: 1204 + var23 += 15; // L: 1205 + var22 = 277; // L: 1206 + var7 = IsaacCipher.loginBoxCenter + -117; // L: 1207 + boolean var9 = Client.Login_isUsernameRemembered; // L: 1209 + boolean var10 = Login.field1224; // L: 1210 + IndexedSprite var20 = var9 ? (var10 ? Login.field1221 : MusicPatchNode2.options_buttons_2Sprite) : (var10 ? PlayerType.field3134 : class227.options_buttons_0Sprite); // L: 1212 + var20.drawAt(var7, var22); // L: 1215 + var7 = var7 + var20.subWidth + 5; // L: 1216 + var1.draw("Remember username", var7, var22 + 13, 16776960, 0); // L: 1217 + var7 = IsaacCipher.loginBoxCenter + 24; // L: 1218 + boolean var13 = Tile.clientPreferences.hideUsername; // L: 1220 + boolean var14 = Login.field1201; // L: 1221 + IndexedSprite var12 = var13 ? (var14 ? Login.field1221 : MusicPatchNode2.options_buttons_2Sprite) : (var14 ? PlayerType.field3134 : class227.options_buttons_0Sprite); // L: 1223 + var12.drawAt(var7, var22); // L: 1226 + var7 = var7 + var12.subWidth + 5; // L: 1227 + var1.draw("Hide username", var7, var22 + 13, 16776960, 0); // L: 1228 + var23 = var22 + 15; // L: 1229 + int var15 = IsaacCipher.loginBoxCenter - 80; // L: 1230 + short var16 = 321; // L: 1231 + ModelData0.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); // L: 1232 + var0.drawCentered("Login", var15, var16 + 5, 16777215, 0); // L: 1233 + var15 = IsaacCipher.loginBoxCenter + 80; // L: 1234 + ModelData0.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); // L: 1235 + var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0); // L: 1236 + var22 = 357; // L: 1237 + switch(Login.field1213) { // L: 1238 + case 2: + ModelData0.field1904 = "Having trouble logging in?"; // L: 1240 + break; + default: + ModelData0.field1904 = "Can't login? Click here."; // L: 1243 + } + + GrandExchangeOfferNameComparator.field112 = new Bounds(IsaacCipher.loginBoxCenter, var22, var1.stringWidth(ModelData0.field1904), 11); // L: 1246 + MusicPatchPcmStream.field2519 = new Bounds(IsaacCipher.loginBoxCenter, var22, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1247 + var1.drawCentered(ModelData0.field1904, IsaacCipher.loginBoxCenter, var22, 16777215, 0); // L: 1248 + } else if (Login.loginIndex == 3) { // L: 1250 + var22 = 201; // L: 1251 + var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1252 + var23 = var22 + 20; // L: 1253 + var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1254 + var23 += 15; // L: 1255 + var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1256 + var23 += 15; // L: 1257 + var4 = Login.loginBoxX + 180; // L: 1258 + var17 = 276; // L: 1259 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1260 + var2.drawCentered("Try again", var4, var17 + 5, 16777215, 0); // L: 1261 + var4 = Login.loginBoxX + 180; // L: 1262 + var17 = 326; // L: 1263 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1264 + var2.drawCentered("Forgotten password?", var4, var17 + 5, 16777215, 0); // L: 1265 + } else { + short var8; + if (Login.loginIndex == 4) { // L: 1267 + var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1268 + var22 = 236; // L: 1269 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1270 + var23 = var22 + 15; // L: 1271 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1272 + var23 += 15; // L: 1273 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1274 + var23 += 15; // L: 1275 + var0.draw("PIN: " + FontName.method5445(WorldMapLabelSize.otp) + (Client.cycle % 40 < 20 ? WorldMapAreaData.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var23, 16777215, 0); // L: 1276 + var23 -= 8; // L: 1277 + var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var23, 16776960, 0); // L: 1278 + var23 += 15; // L: 1279 + var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var23, 16776960, 0); // L: 1280 + var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; // L: 1281 + int var27 = var23 - var0.ascent; // L: 1282 + IndexedSprite var25; + if (Login.field1223) { // L: 1284 + var25 = MusicPatchNode2.options_buttons_2Sprite; // L: 1285 + } else { + var25 = class227.options_buttons_0Sprite; // L: 1288 } - boolean var7 = false; - int var8 = Client.playerMenuOpcodes[var5] + var6; - ScriptEvent.insertMenuItemNoShift(Client.playerMenuActions[var5], ItemContainer.colorStartTag(16777215) + var4, var8, var1, var2, var3); + var25.drawAt(var4, var27); // L: 1290 + var23 += 15; // L: 1291 + var7 = Login.loginBoxX + 180 - 80; // L: 1292 + var8 = 321; // L: 1293 + ModelData0.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1294 + var0.drawCentered("Continue", var7, var8 + 5, 16777215, 0); // L: 1295 + var7 = Login.loginBoxX + 180 + 80; // L: 1296 + ModelData0.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1297 + var0.drawCentered("Cancel", var7, var8 + 5, 16777215, 0); // L: 1298 + var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var8 + 36, 255, 0); // L: 1299 + } else if (Login.loginIndex == 5) { // L: 1301 + var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); // L: 1302 + var22 = 221; // L: 1303 + var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1304 + var23 = var22 + 15; // L: 1305 + var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1306 + var23 += 15; // L: 1307 + var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1308 + var23 += 15; // L: 1309 + var23 += 14; // L: 1310 + var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var23, 16777215, 0); // L: 1311 + var24 = 174; // L: 1312 + + for (var5 = WorldMapRectangle.method359(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { // L: 1313 1314 1315 + } + + var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? WorldMapAreaData.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var23, 16777215, 0); // L: 1317 + var23 += 15; // L: 1318 + int var19 = Login.loginBoxX + 180 - 80; // L: 1319 + short var26 = 321; // L: 1320 + ModelData0.titlebuttonSprite.drawAt(var19 - 73, var26 - 20); // L: 1321 + var0.drawCentered("Recover", var19, var26 + 5, 16777215, 0); // L: 1322 + var19 = Login.loginBoxX + 180 + 80; // L: 1323 + ModelData0.titlebuttonSprite.drawAt(var19 - 73, var26 - 20); // L: 1324 + var0.drawCentered("Back", var19, var26 + 5, 16777215, 0); // L: 1325 + var26 = 356; // L: 1326 + var1.drawCentered("Still having trouble logging in?", IsaacCipher.loginBoxCenter, var26, 268435455, 0); // L: 1327 + } else if (Login.loginIndex == 6) { // L: 1329 + var22 = 201; // L: 1330 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1331 + var23 = var22 + 15; // L: 1332 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1333 + var23 += 15; // L: 1334 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1335 + var23 += 15; // L: 1336 + var4 = Login.loginBoxX + 180; // L: 1337 + var17 = 321; // L: 1338 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1339 + var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); // L: 1340 + } else if (Login.loginIndex == 7) { // L: 1342 + var22 = 216; // L: 1343 + var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1344 + var23 = var22 + 15; // L: 1345 + var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1346 + var23 += 15; // L: 1347 + var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1348 + var23 += 15; // L: 1349 + var4 = Login.loginBoxX + 180 - 80; // L: 1350 + var17 = 321; // L: 1351 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1352 + var0.drawCentered("Set Date of Birth", var4, var17 + 5, 16777215, 0); // L: 1353 + var4 = Login.loginBoxX + 180 + 80; // L: 1354 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1355 + var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); // L: 1356 + } else if (Login.loginIndex == 8) { // L: 1358 + var22 = 216; // L: 1359 + var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var22, 16776960, 0); // L: 1360 + var23 = var22 + 15; // L: 1361 + var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1362 + var23 += 15; // L: 1363 + var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var23, 16776960, 0); // L: 1364 + var23 += 15; // L: 1365 + var4 = Login.loginBoxX + 180 - 80; // L: 1366 + var17 = 321; // L: 1367 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1368 + var0.drawCentered("Privacy Policy", var4, var17 + 5, 16777215, 0); // L: 1369 + var4 = Login.loginBoxX + 180 + 80; // L: 1370 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1371 + var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); // L: 1372 + } else if (Login.loginIndex == 12) { // L: 1374 + var22 = 201; // L: 1375 + String var18 = ""; // L: 1376 + var5 = ""; // L: 1377 + var6 = ""; // L: 1378 + switch(Login.field1210) { // L: 1379 + case 0: + var18 = "Your account has been disabled."; // L: 1382 + var5 = Strings.field2988; // L: 1383 + var6 = ""; // L: 1384 + break; + case 1: + var18 = "Account locked as we suspect it has been stolen."; // L: 1394 + var5 = Strings.field2936; // L: 1395 + var6 = ""; // L: 1396 + break; + default: + class41.Login_promptCredentials(false); // L: 1389 + } + + var0.drawCentered(var18, Login.loginBoxX + 180, var22, 16776960, 0); // L: 1400 + var23 = var22 + 15; // L: 1401 + var2.drawCentered(var5, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1402 + var23 += 15; // L: 1403 + var2.drawCentered(var6, Login.loginBoxX + 180, var23, 16776960, 0); // L: 1404 + var23 += 15; // L: 1405 + var7 = Login.loginBoxX + 180; // L: 1406 + var8 = 276; // L: 1407 + ModelData0.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1408 + var0.drawCentered("Support Page", var7, var8 + 5, 16777215, 0); // L: 1409 + var7 = Login.loginBoxX + 180; // L: 1410 + var8 = 326; // L: 1411 + ModelData0.titlebuttonSprite.drawAt(var7 - 73, var8 - 20); // L: 1412 + var0.drawCentered("Back", var7, var8 + 5, 16777215, 0); // L: 1413 + } else if (Login.loginIndex == 24) { // L: 1415 + var22 = 221; // L: 1416 + var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); // L: 1417 + var23 = var22 + 15; // L: 1418 + var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1419 + var23 += 15; // L: 1420 + var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); // L: 1421 + var23 += 15; // L: 1422 + var4 = Login.loginBoxX + 180; // L: 1423 + var17 = 301; // L: 1424 + ModelData0.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); // L: 1425 + var0.drawCentered("Ok", var4, var17 + 5, 16777215, 0); // L: 1426 } } } + } - for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - if (Client.menuOpcodes[var5] == 23) { - Client.menuTargets[var5] = ItemContainer.colorStartTag(16777215) + var4; - break; + if (Client.gameState >= 10) { // L: 1429 + int[] var21 = new int[4]; // L: 1430 + Rasterizer2D.Rasterizer2D_getClipArray(var21); // L: 1431 + Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, GameShell.canvasHeight); // L: 1432 + Varcs.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); // L: 1433 + Varcs.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); // L: 1434 + Rasterizer2D.Rasterizer2D_setClipArray(var21); // L: 1435 + } + + ClientPreferences.title_muteSprite[Tile.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); // L: 1437 + if (Client.gameState > 5 && class58.clientLanguage == Language.Language_EN) { // L: 1438 + if (class7.field36 != null) { // L: 1439 + var23 = Login.xPadding + 5; // L: 1440 + var24 = 463; // L: 1441 + byte var29 = 100; // L: 1442 + byte var28 = 35; // L: 1443 + class7.field36.drawAt(var23, var24); // L: 1444 + var0.drawCentered("World" + " " + Client.worldId, var29 / 2 + var23, var28 / 2 + var24 - 2, 16777215, 0); // L: 1445 + if (WorldMapScaleHandler.World_request != null) { // L: 1446 + var1.drawCentered("Loading...", var29 / 2 + var23, var28 / 2 + var24 + 12, 16777215, 0); + } else { + var1.drawCentered("Click to switch", var29 / 2 + var23, var28 / 2 + var24 + 12, 16777215, 0); // L: 1447 } + } else { + class7.field36 = class234.SpriteBuffer_getIndexedSpriteByName(Huffman.archive8, "sl_button", ""); // L: 1450 + } + } + + } + } // L: 1110 1453 + + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "750694700" + ) + static int method1324(int var0, Script var1, boolean var2) { + int var3; + if (var0 == 6600) { // L: 3470 + var3 = Huffman.Client_plane; // L: 3471 + int var15 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; // L: 3472 + int var8 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; // L: 3473 + WorldMapSection0.getWorldMap().method6482(var3, var15, var8, true); // L: 3474 + return 1; // L: 3475 + } else { + WorldMapArea var9; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { // L: 3477 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3478 + String var16 = ""; // L: 3479 + var9 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3480 + if (var9 != null) { // L: 3481 + var16 = var9.getExternalName(); // L: 3482 } + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var16; // L: 3484 + return 1; // L: 3485 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { // L: 3487 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3488 + WorldMapSection0.getWorldMap().setCurrentMapAreaId(var3); // L: 3489 + return 1; // L: 3490 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { // L: 3492 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getZoomLevel(); // L: 3493 + return 1; // L: 3494 + } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { // L: 3496 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3497 + WorldMapSection0.getWorldMap().setZoomPercentage(var3); // L: 3498 + return 1; // L: 3499 + } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { // L: 3501 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().isCacheLoaded() ? 1 : 0; // L: 3502 + return 1; // L: 3503 + } else { + Coord var14; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { // L: 3505 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3506 + WorldMapSection0.getWorldMap().setWorldMapPositionTarget(var14.x, var14.y); // L: 3507 + return 1; // L: 3508 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { // L: 3510 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3511 + WorldMapSection0.getWorldMap().setWorldMapPositionTargetInstant(var14.x, var14.y); // L: 3512 + return 1; // L: 3513 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { // L: 3515 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3516 + WorldMapSection0.getWorldMap().jumpToSourceCoord(var14.plane, var14.x, var14.y); // L: 3517 + return 1; // L: 3518 + } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { // L: 3520 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3521 + WorldMapSection0.getWorldMap().jumpToSourceCoordInstant(var14.plane, var14.x, var14.y); // L: 3522 + return 1; // L: 3523 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { // L: 3525 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayX(); // L: 3526 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayY(); // L: 3527 + return 1; // L: 3528 + } else { + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { // L: 3530 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3531 + var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3532 + if (var11 == null) { // L: 3533 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3534 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getOrigin().packed(); // L: 3537 + } + + return 1; // L: 3539 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { // L: 3541 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3542 + var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3543 + if (var11 == null) { // L: 3544 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3545 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3546 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighX() - var11.getRegionLowX() + 1) * 64; // L: 3549 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var11.getRegionHighY() - var11.getRegionLowY() + 1) * 64; // L: 3550 + } + + return 1; // L: 3552 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { // L: 3554 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3555 + var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3556 + if (var11 == null) { // L: 3557 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3558 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3559 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3560 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3561 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowX() * 64; // L: 3564 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionLowY() * 64; // L: 3565 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighX() * 64 + 64 - 1; // L: 3566 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getRegionHighY() * 64 + 64 - 1; // L: 3567 + } + + return 1; // L: 3569 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { // L: 3571 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3572 + var11 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3573 + if (var11 == null) { // L: 3574 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3575 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getZoom(); // L: 3578 + } + + return 1; // L: 3580 + } else if (var0 == 6615) { // L: 3582 + var14 = WorldMapSection0.getWorldMap().getDisplayCoord(); // L: 3583 + if (var14 == null) { // L: 3584 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3585 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3586 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.x; // L: 3589 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.y; // L: 3590 + } + + return 1; // L: 3592 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { // L: 3594 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().currentMapAreaId(); // L: 3595 + return 1; // L: 3596 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { // L: 3598 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3599 + var11 = WorldMapSection0.getWorldMap().getCurrentMapArea(); // L: 3600 + if (var11 == null) { // L: 3601 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3602 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3603 + return 1; // L: 3604 + } else { + int[] var12 = var11.position(var14.plane, var14.x, var14.y); // L: 3606 + if (var12 == null) { // L: 3607 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3608 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3609 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[0]; // L: 3612 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var12[1]; // L: 3613 + } + + return 1; // L: 3615 + } + } else { + Coord var5; + if (var0 == 6618) { // L: 3617 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3618 + var11 = WorldMapSection0.getWorldMap().getCurrentMapArea(); // L: 3619 + if (var11 == null) { // L: 3620 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3621 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3622 + return 1; // L: 3623 + } else { + var5 = var11.coord(var14.x, var14.y); // L: 3625 + if (var5 == null) { // L: 3626 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3627 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 3630 + } + + return 1; // L: 3632 + } + } else { + Coord var10; + if (var0 == 6619) { // L: 3634 + Interpreter.Interpreter_intStackSize -= 2; // L: 3635 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3636 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3637 + MouseHandler.method1150(var3, var10, false); // L: 3638 + return 1; // L: 3639 + } else if (var0 == 6620) { // L: 3641 + Interpreter.Interpreter_intStackSize -= 2; // L: 3642 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3643 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3644 + MouseHandler.method1150(var3, var10, true); // L: 3645 + return 1; // L: 3646 + } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { // L: 3648 + Interpreter.Interpreter_intStackSize -= 2; // L: 3649 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3650 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3651 + var9 = WorldMapSection0.getWorldMap().getMapArea(var3); // L: 3652 + if (var9 == null) { // L: 3653 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3654 + return 1; // L: 3655 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9.containsCoord(var10.plane, var10.x, var10.y) ? 1 : 0; // L: 3657 + return 1; // L: 3658 + } + } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { // L: 3660 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayWith(); // L: 3661 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getDisplayHeight(); // L: 3662 + return 1; // L: 3663 + } else if (var0 == 6623) { // L: 3665 + var14 = new Coord(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3666 + var11 = WorldMapSection0.getWorldMap().mapAreaAtCoord(var14.plane, var14.x, var14.y); // L: 3667 + if (var11 == null) { // L: 3668 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3669 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var11.getId(); // L: 3672 + } + + return 1; // L: 3674 + } else if (var0 == 6624) { // L: 3676 + WorldMapSection0.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3677 + return 1; // L: 3678 + } else if (var0 == 6625) { // L: 3680 + WorldMapSection0.getWorldMap().resetMaxFlashCount(); // L: 3681 + return 1; // L: 3682 + } else if (var0 == 6626) { // L: 3684 + WorldMapSection0.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 3685 + return 1; // L: 3686 + } else if (var0 == 6627) { // L: 3688 + WorldMapSection0.getWorldMap().resetCyclesPerFlash(); // L: 3689 + return 1; // L: 3690 + } else { + boolean var13; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { // L: 3692 + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3693 + WorldMapSection0.getWorldMap().setPerpetualFlash(var13); // L: 3694 + return 1; // L: 3695 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { // L: 3697 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3698 + WorldMapSection0.getWorldMap().flashElement(var3); // L: 3699 + return 1; // L: 3700 + } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { // L: 3702 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3703 + WorldMapSection0.getWorldMap().flashCategory(var3); // L: 3704 + return 1; // L: 3705 + } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { // L: 3707 + WorldMapSection0.getWorldMap().stopCurrentFlashes(); // L: 3708 + return 1; // L: 3709 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { // L: 3711 + var13 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 3712 + WorldMapSection0.getWorldMap().setElementsDisabled(var13); // L: 3713 + return 1; // L: 3714 + } else { + boolean var7; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { // L: 3716 + Interpreter.Interpreter_intStackSize -= 2; // L: 3717 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3718 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3719 + WorldMapSection0.getWorldMap().disableElement(var3, var7); // L: 3720 + return 1; // L: 3721 + } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { // L: 3723 + Interpreter.Interpreter_intStackSize -= 2; // L: 3724 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3725 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1] == 1; // L: 3726 + WorldMapSection0.getWorldMap().setCategoryDisabled(var3, var7); // L: 3727 + return 1; // L: 3728 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { // L: 3730 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().getElementsDisabled() ? 1 : 0; // L: 3731 + return 1; // L: 3732 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { // L: 3734 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3735 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().isElementDisabled(var3) ? 1 : 0; // L: 3736 + return 1; // L: 3737 + } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { // L: 3739 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3740 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection0.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; // L: 3741 + return 1; // L: 3742 + } else if (var0 == 6638) { // L: 3744 + Interpreter.Interpreter_intStackSize -= 2; // L: 3745 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3746 + var10 = new Coord(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3747 + var5 = WorldMapSection0.getWorldMap().method6507(var3, var10); // L: 3748 + if (var5 == null) { // L: 3749 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3750 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var5.packed(); // L: 3753 + } + + return 1; // L: 3755 + } else { + AbstractWorldMapIcon var6; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { // L: 3757 + var6 = WorldMapSection0.getWorldMap().iconStart(); // L: 3758 + if (var6 == null) { // L: 3759 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3760 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3761 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 3764 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 3765 + } + + return 1; // L: 3767 + } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { // L: 3769 + var6 = WorldMapSection0.getWorldMap().iconNext(); // L: 3770 + if (var6 == null) { // L: 3771 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3772 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3773 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.getElement(); // L: 3776 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6.coord2.packed(); // L: 3777 + } + + return 1; // L: 3779 + } else { + WorldMapElement var4; + if (var0 == ScriptOpcodes.MEC_TEXT) { // L: 3781 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3782 + var4 = WorldMapSection0.WorldMapElement_get(var3); // L: 3783 + if (var4.name == null) { // L: 3784 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 3785 + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var4.name; // L: 3788 + } + + return 1; // L: 3790 + } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { // L: 3792 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3793 + var4 = WorldMapSection0.WorldMapElement_get(var3); // L: 3794 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.textSize; // L: 3795 + return 1; // L: 3796 + } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { // L: 3798 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3799 + var4 = WorldMapSection0.WorldMapElement_get(var3); // L: 3800 + if (var4 == null) { // L: 3801 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3802 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.category; // L: 3805 + } + + return 1; // L: 3807 + } else if (var0 == ScriptOpcodes.MEC_SPRITE) { // L: 3809 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3810 + var4 = WorldMapSection0.WorldMapElement_get(var3); // L: 3811 + if (var4 == null) { // L: 3812 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3813 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.sprite1; // L: 3816 + } + + return 1; // L: 3818 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { // L: 3820 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Frames.worldMapEvent.mapElement; // L: 3821 + return 1; // L: 3822 + } else if (var0 == 6698) { // L: 3824 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Frames.worldMapEvent.coord1.packed(); // L: 3825 + return 1; // L: 3826 + } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { // L: 3828 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Frames.worldMapEvent.coord2.packed(); // L: 3829 + return 1; // L: 3830 + } else { + return 2; // L: 3832 + } + } + } + } + } + } + } + } } } } - - @ObfuscatedName("iv") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "452106658" - ) - @Export("getTapToDrop") - static boolean getTapToDrop() { - return Client.tapToDrop; - } } diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 8e956c446c..bf2f532c46 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -4,112 +4,123 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hv") +@ObfuscatedName("ha") @Implements("PlayerAppearance") public class PlayerAppearance { @ObfuscatedName("n") - public static short[] field2574; - @ObfuscatedName("u") - public static short[][] field2575; - @ObfuscatedName("a") - public static short[] field2569; - @ObfuscatedName("w") @Export("equipmentIndices") static final int[] equipmentIndices; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("PlayerAppearance_cachedModels") - static EvictingDualNodeHashTable PlayerAppearance_cachedModels; - @ObfuscatedName("m") + public static EvictingDualNodeHashTable PlayerAppearance_cachedModels; + @ObfuscatedName("cq") + @ObfuscatedGetter( + intValue = 1000886071 + ) + public static int field2581; + @ObfuscatedName("dg") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive14") + static Archive archive14; + @ObfuscatedName("ee") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive15") + static Archive archive15; + @ObfuscatedName("z") @Export("equipment") int[] equipment; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("bodyColors") int[] bodyColors; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("isFemale") public boolean isFemale; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 818312483 + intValue = 32109537 ) @Export("npcTransformId") public int npcTransformId; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - longValue = -9062210638033069275L + longValue = 7297189778048494063L ) @Export("hash") long hash; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - longValue = 254720679631445871L + longValue = 549450533580292223L ) - long field2573; + long field2575; static { equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260); } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([I[IZIB)V", - garbageValue = "28" + descriptor = "([I[IZII)V", + garbageValue = "1005364184" ) @Export("update") public void update(int[] var1, int[] var2, boolean var3, int var4) { if (var1 == null) { var1 = new int[12]; - for (int var5 = 0; var5 < 7; ++var5) { - for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { - KitDefinition var7 = WorldMapEvent.KitDefinition_get(var6); - if (var7 != null && !var7.nonSelectable && var7.bodypartID == var5 + (var3 ? 7 : 0)) { - var1[equipmentIndices[var5]] = var6 + 256; - break; + for (int var5 = 0; var5 < 7; ++var5) { // L: 29 + for (int var6 = 0; var6 < KitDefinition.KitDefinition_fileCount; ++var6) { // L: 30 + KitDefinition var7 = FriendSystem.KitDefinition_get(var6); // L: 31 + if (var7 != null && !var7.nonSelectable && (var3 ? 7 : 0) + var5 == var7.bodypartID) { // L: 32 + var1[equipmentIndices[var5]] = var6 + 256; // L: 33 + break; // L: 34 } } } } - this.equipment = var1; - this.bodyColors = var2; - this.isFemale = var3; - this.npcTransformId = var4; - this.setHash(); - } + this.equipment = var1; // L: 39 + this.bodyColors = var2; // L: 40 + this.isFemale = var3; // L: 41 + this.npcTransformId = var4; // L: 42 + this.setHash(); // L: 43 + } // L: 44 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "-311469480" + descriptor = "(IZB)V", + garbageValue = "-97" ) @Export("changeAppearance") public void changeAppearance(int var1, boolean var2) { - if (var1 != 1 || !this.isFemale) { - int var3 = this.equipment[equipmentIndices[var1]]; - if (var3 != 0) { - var3 -= 256; + if (var1 != 1 || !this.isFemale) { // L: 47 + int var3 = this.equipment[equipmentIndices[var1]]; // L: 48 + if (var3 != 0) { // L: 49 + var3 -= 256; // L: 50 KitDefinition var4; do { - if (!var2) { - --var3; - if (var3 < 0) { + if (!var2) { // L: 52 + --var3; // L: 53 + if (var3 < 0) { // L: 54 var3 = KitDefinition.KitDefinition_fileCount - 1; } } else { - ++var3; + ++var3; // L: 57 if (var3 >= KitDefinition.KitDefinition_fileCount) { - var3 = 0; + var3 = 0; // L: 58 } } - var4 = WorldMapEvent.KitDefinition_get(var3); - } while(var4 == null || var4.nonSelectable || var1 + (this.isFemale ? 7 : 0) != var4.bodypartID); + var4 = FriendSystem.KitDefinition_get(var3); // L: 60 + } while(var4 == null || var4.nonSelectable || var4.bodypartID != var1 + (this.isFemale ? 7 : 0)); // L: 61 this.equipment[equipmentIndices[var1]] = var3 + 256; this.setHash(); @@ -117,316 +128,393 @@ public class PlayerAppearance { } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IZI)V", - garbageValue = "1803508005" + garbageValue = "-1662290602" ) - public void method4139(int var1, boolean var2) { + public void method4102(int var1, boolean var2) { int var3 = this.bodyColors[var1]; + boolean var4; if (!var2) { do { --var3; - if (var3 < 0) { - var3 = field2575[var1].length - 1; + if (var3 < 0) { // L: 72 + var3 = WorldMapSprite.field253[var1].length - 1; } - } while(!class39.method615(var1, var3)); + + if (var1 == 4 && var3 >= 8) { + var4 = false; // L: 78 + } else { + var4 = true; // L: 81 + } + } while(!var4); // L: 83 } else { do { - ++var3; - if (var3 >= field2575[var1].length) { + ++var3; // L: 88 + if (var3 >= WorldMapSprite.field253[var1].length) { // L: 89 var3 = 0; } - } while(!class39.method615(var1, var3)); + + if (var1 == 4 && var3 >= 8) { // L: 92 + var4 = false; // L: 93 + } else { + var4 = true; // L: 96 + } + } while(!var4); // L: 98 } - this.bodyColors[var1] = var3; - this.setHash(); - } + this.bodyColors[var1] = var3; // L: 101 + this.setHash(); // L: 102 + } // L: 103 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "80" + descriptor = "(ZI)V", + garbageValue = "-1897659753" ) @Export("changeSex") public void changeSex(boolean var1) { - if (this.isFemale != var1) { - this.update((int[])null, this.bodyColors, var1, -1); + if (this.isFemale != var1) { // L: 106 + this.update((int[])null, this.bodyColors, var1, -1); // L: 107 } - } + } // L: 108 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "1039310392" + descriptor = "(Lkf;I)V", + garbageValue = "85946625" ) @Export("write") public void write(Buffer var1) { - var1.writeByte(this.isFemale ? 1 : 0); + var1.writeByte(this.isFemale ? 1 : 0); // L: 111 int var2; - for (var2 = 0; var2 < 7; ++var2) { - int var3 = this.equipment[equipmentIndices[var2]]; - if (var3 == 0) { + for (var2 = 0; var2 < 7; ++var2) { // L: 112 + int var3 = this.equipment[equipmentIndices[var2]]; // L: 113 + if (var3 == 0) { // L: 114 var1.writeByte(-1); } else { - var1.writeByte(var3 - 256); + var1.writeByte(var3 - 256); // L: 115 } } - for (var2 = 0; var2 < 5; ++var2) { + for (var2 = 0; var2 < 5; ++var2) { // L: 117 var1.writeByte(this.bodyColors[var2]); } - } + } // L: 118 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1504678480" + descriptor = "(B)V", + garbageValue = "6" ) @Export("setHash") void setHash() { - long var1 = this.hash; - int var3 = this.equipment[5]; - int var4 = this.equipment[9]; - this.equipment[5] = var4; - this.equipment[9] = var3; - this.hash = 0L; + long var1 = this.hash; // L: 121 + int var3 = this.equipment[5]; // L: 122 + int var4 = this.equipment[9]; // L: 123 + this.equipment[5] = var4; // L: 124 + this.equipment[9] = var3; // L: 125 + this.hash = 0L; // L: 126 int var5; - for (var5 = 0; var5 < 12; ++var5) { - this.hash <<= 4; - if (this.equipment[var5] >= 256) { + for (var5 = 0; var5 < 12; ++var5) { // L: 127 + this.hash <<= 4; // L: 128 + if (this.equipment[var5] >= 256) { // L: 129 this.hash += (long)(this.equipment[var5] - 256); } } - if (this.equipment[0] >= 256) { + if (this.equipment[0] >= 256) { // L: 131 this.hash += (long)(this.equipment[0] - 256 >> 4); } - if (this.equipment[1] >= 256) { + if (this.equipment[1] >= 256) { // L: 132 this.hash += (long)(this.equipment[1] - 256 >> 8); } - for (var5 = 0; var5 < 5; ++var5) { - this.hash <<= 3; - this.hash += (long)this.bodyColors[var5]; + for (var5 = 0; var5 < 5; ++var5) { // L: 133 + this.hash <<= 3; // L: 134 + this.hash += (long)this.bodyColors[var5]; // L: 135 } - this.hash <<= 1; - this.hash += (long)(this.isFemale ? 1 : 0); - this.equipment[5] = var3; - this.equipment[9] = var4; - if (0L != var1 && this.hash != var1) { + this.hash <<= 1; // L: 137 + this.hash += (long)(this.isFemale ? 1 : 0); // L: 138 + this.equipment[5] = var3; // L: 139 + this.equipment[9] = var4; // L: 140 + if (var1 != 0L && var1 != this.hash) { // L: 141 PlayerAppearance_cachedModels.remove(var1); } - } + } // L: 142 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljm;ILjm;IB)Lef;", - garbageValue = "-39" + descriptor = "(Ljm;ILjm;IB)Ler;", + garbageValue = "-25" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { - if (this.npcTransformId != -1) { - return StudioGame.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); + if (this.npcTransformId != -1) { // L: 145 + return Skeleton.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 146 } else { - long var5 = this.hash; - int[] var7 = this.equipment; - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { - var7 = new int[12]; + long var5 = this.hash; // L: 148 + int[] var7 = this.equipment; // L: 149 + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 150 + var7 = new int[12]; // L: 151 - for (int var15 = 0; var15 < 12; ++var15) { - var7[var15] = this.equipment[var15]; + for (int var8 = 0; var8 < 12; ++var8) { // L: 152 + var7[var8] = this.equipment[var8]; } - if (var1.shield >= 0) { - var5 += (long)(var1.shield - this.equipment[5] << 40); - var7[5] = var1.shield; + if (var1.shield >= 0) { // L: 153 + var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 154 + var7[5] = var1.shield; // L: 155 } - if (var1.weapon >= 0) { - var5 += (long)(var1.weapon - this.equipment[3] << 48); - var7[3] = var1.weapon; + if (var1.weapon >= 0) { // L: 157 + var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 158 + var7[3] = var1.weapon; // L: 159 } } - Model var8 = (Model)PlayerAppearance_cachedModels.get(var5); - if (var8 == null) { - boolean var9 = false; + Model var15 = (Model)PlayerAppearance_cachedModels.get(var5); // L: 162 + if (var15 == null) { // L: 163 + boolean var9 = false; // L: 164 int var11; - for (int var10 = 0; var10 < 12; ++var10) { - var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !WorldMapEvent.KitDefinition_get(var11 - 256).ready()) { + for (int var10 = 0; var10 < 12; ++var10) { // L: 165 + var11 = var7[var10]; // L: 166 + if (var11 >= 256 && var11 < 512 && !FriendSystem.KitDefinition_get(var11 - 256).ready()) { // L: 167 168 var9 = true; } - if (var11 >= 512 && !KitDefinition.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { + if (var11 >= 512 && !GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 170 171 var9 = true; } } - if (var9) { - if (-1L != this.field2573) { - var8 = (Model)PlayerAppearance_cachedModels.get(this.field2573); + if (var9) { // L: 174 + if (-1L != this.field2575) { // L: 175 + var15 = (Model)PlayerAppearance_cachedModels.get(this.field2575); } - if (var8 == null) { + if (var15 == null) { // L: 176 return null; } } - if (var8 == null) { - ModelData[] var16 = new ModelData[12]; - var11 = 0; + if (var15 == null) { // L: 178 + ModelData[] var16 = new ModelData[12]; // L: 179 + var11 = 0; // L: 180 int var13; - for (int var12 = 0; var12 < 12; ++var12) { - var13 = var7[var12]; + for (int var12 = 0; var12 < 12; ++var12) { // L: 181 + var13 = var7[var12]; // L: 182 ModelData var14; - if (var13 >= 256 && var13 < 512) { - var14 = WorldMapEvent.KitDefinition_get(var13 - 256).getModelData(); - if (var14 != null) { + if (var13 >= 256 && var13 < 512) { // L: 183 + var14 = FriendSystem.KitDefinition_get(var13 - 256).getModelData(); // L: 184 + if (var14 != null) { // L: 185 var16[var11++] = var14; } } - if (var13 >= 512) { - var14 = KitDefinition.ItemDefinition_get(var13 - 512).method4839(this.isFemale); - if (var14 != null) { + if (var13 >= 512) { // L: 187 + var14 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var13 - 512).method4760(this.isFemale); // L: 188 + if (var14 != null) { // L: 189 var16[var11++] = var14; } } } - ModelData var18 = new ModelData(var16, var11); + ModelData var17 = new ModelData(var16, var11); // L: 192 - for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < field2575[var13].length) { - var18.recolor(field2574[var13], field2575[var13][this.bodyColors[var13]]); + for (var13 = 0; var13 < 5; ++var13) { // L: 193 + if (this.bodyColors[var13] < WorldMapSprite.field253[var13].length) { // L: 194 + var17.recolor(Calendar.field2535[var13], WorldMapSprite.field253[var13][this.bodyColors[var13]]); } - if (this.bodyColors[var13] < Messages.field1308[var13].length) { - var18.recolor(field2569[var13], Messages.field1308[var13][this.bodyColors[var13]]); + if (this.bodyColors[var13] < UserComparator7.field2021[var13].length) { // L: 195 + var17.recolor(GrandExchangeOfferTotalQuantityComparator.field83[var13], UserComparator7.field2021[var13][this.bodyColors[var13]]); } } - var8 = var18.toModel(64, 850, -30, -50, -30); - PlayerAppearance_cachedModels.put(var8, var5); - this.field2573 = var5; + var15 = var17.toModel(64, 850, -30, -50, -30); // L: 197 + PlayerAppearance_cachedModels.put(var15, var5); // L: 198 + this.field2575 = var5; // L: 199 } } - if (var1 == null && var3 == null) { - return var8; + if (var1 == null && var3 == null) { // L: 203 + return var15; } else { - Model var17; - if (var1 != null && var3 != null) { - var17 = var1.applyTransformations(var8, var2, var3, var4); - } else if (var1 != null) { - var17 = var1.transformActorModel(var8, var2); + Model var18; + if (var1 != null && var3 != null) { // L: 204 + var18 = var1.applyTransformations(var15, var2, var3, var4); + } else if (var1 != null) { // L: 205 + var18 = var1.transformActorModel(var15, var2); } else { - var17 = var3.transformActorModel(var8, var4); + var18 = var3.transformActorModel(var15, var4); // L: 206 } - return var17; + return var18; // L: 207 } } } - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)Lek;", - garbageValue = "1279431909" + descriptor = "(I)Lee;", + garbageValue = "491299614" ) @Export("getModelData") ModelData getModelData() { - if (this.npcTransformId != -1) { - return StudioGame.getNpcDefinition(this.npcTransformId).getModelData(); + if (this.npcTransformId != -1) { // L: 211 + return Skeleton.getNpcDefinition(this.npcTransformId).getModelData(); // L: 212 } else { - boolean var1 = false; + boolean var1 = false; // L: 214 int var3; - for (int var2 = 0; var2 < 12; ++var2) { - var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !WorldMapEvent.KitDefinition_get(var3 - 256).method4636()) { + for (int var2 = 0; var2 < 12; ++var2) { // L: 215 + var3 = this.equipment[var2]; // L: 216 + if (var3 >= 256 && var3 < 512 && !FriendSystem.KitDefinition_get(var3 - 256).method4543()) { // L: 217 218 var1 = true; } - if (var3 >= 512 && !KitDefinition.ItemDefinition_get(var3 - 512).method4840(this.isFemale)) { + if (var3 >= 512 && !GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3 - 512).method4805(this.isFemale)) { // L: 220 221 var1 = true; } } - if (var1) { + if (var1) { // L: 224 return null; } else { - ModelData[] var7 = new ModelData[12]; - var3 = 0; + ModelData[] var7 = new ModelData[12]; // L: 225 + var3 = 0; // L: 226 int var5; - for (int var4 = 0; var4 < 12; ++var4) { - var5 = this.equipment[var4]; + for (int var4 = 0; var4 < 12; ++var4) { // L: 227 + var5 = this.equipment[var4]; // L: 228 ModelData var6; - if (var5 >= 256 && var5 < 512) { - var6 = WorldMapEvent.KitDefinition_get(var5 - 256).getKitDefinitionModels(); - if (var6 != null) { + if (var5 >= 256 && var5 < 512) { // L: 229 + var6 = FriendSystem.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 230 + if (var6 != null) { // L: 231 var7[var3++] = var6; } } - if (var5 >= 512) { - var6 = KitDefinition.ItemDefinition_get(var5 - 512).method4841(this.isFemale); - if (var6 != null) { + if (var5 >= 512) { // L: 233 + var6 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var5 - 512).method4762(this.isFemale); // L: 234 + if (var6 != null) { // L: 235 var7[var3++] = var6; } } } - ModelData var8 = new ModelData(var7, var3); + ModelData var8 = new ModelData(var7, var3); // L: 238 - for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < field2575[var5].length) { - var8.recolor(field2574[var5], field2575[var5][this.bodyColors[var5]]); + for (var5 = 0; var5 < 5; ++var5) { // L: 239 + if (this.bodyColors[var5] < WorldMapSprite.field253[var5].length) { // L: 240 + var8.recolor(Calendar.field2535[var5], WorldMapSprite.field253[var5][this.bodyColors[var5]]); } - if (this.bodyColors[var5] < Messages.field1308[var5].length) { - var8.recolor(field2569[var5], Messages.field1308[var5][this.bodyColors[var5]]); + if (this.bodyColors[var5] < UserComparator7.field2021[var5].length) { // L: 241 + var8.recolor(GrandExchangeOfferTotalQuantityComparator.field83[var5], UserComparator7.field2021[var5][this.bodyColors[var5]]); } } - return var8; + return var8; // L: 243 } } } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-2109600157" ) @Export("getChatHeadId") public int getChatHeadId() { - return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + StudioGame.getNpcDefinition(this.npcTransformId).id; + return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + Skeleton.getNpcDefinition(this.npcTransformId).id; // L: 247 248 } - @ObfuscatedName("kf") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1446127367" + descriptor = "(IB)Lil;", + garbageValue = "19" ) - static void method4177(int var0) { - for (IntegerNode var1 = (IntegerNode)Client.widgetFlags.first(); var1 != null; var1 = (IntegerNode)Client.widgetFlags.next()) { - if ((long)var0 == (var1.key >> 48 & 65535L)) { - var1.remove(); + @Export("getParamDefinition") + public static ParamDefinition getParamDefinition(int var0) { + ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); // L: 21 + if (var1 != null) { // L: 22 + return var1; + } else { + byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); // L: 23 + var1 = new ParamDefinition(); // L: 24 + if (var2 != null) { // L: 25 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); // L: 26 + ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); // L: 27 + return var1; // L: 28 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "401735028" + ) + static String method4116(byte[] var0, int var1, int var2) { + StringBuilder var3 = new StringBuilder(); // L: 62 + + for (int var4 = var1; var4 < var2 + var1; var4 += 3) { // L: 63 + int var5 = var0[var4] & 255; // L: 64 + var3.append(class299.field3676[var5 >>> 2]); // L: 65 + if (var4 < var2 - 1) { // L: 66 + int var6 = var0[var4 + 1] & 255; // L: 67 + var3.append(class299.field3676[(var5 & 3) << 4 | var6 >>> 4]); // L: 68 + if (var4 < var2 - 2) { // L: 69 + int var7 = var0[var4 + 2] & 255; // L: 70 + var3.append(class299.field3676[(var6 & 15) << 2 | var7 >>> 6]).append(class299.field3676[var7 & 63]); // L: 71 + } else { + var3.append(class299.field3676[(var6 & 15) << 2]).append("="); // L: 73 + } + } else { + var3.append(class299.field3676[(var5 & 3) << 4]).append("=="); // L: 75 } } + return var3.toString(); // L: 77 } + + @ObfuscatedName("ix") + @ObfuscatedSignature( + descriptor = "(IIIIIIIII)V", + garbageValue = "1591550158" + ) + @Export("drawWidgets") + static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + if (WorldMapSprite.loadInterface(var0)) { // L: 8652 + GrandExchangeOfferNameComparator.field115 = null; // L: 8659 + Decimator.drawInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 8660 + if (GrandExchangeOfferNameComparator.field115 != null) { // L: 8661 + Decimator.drawInterface(GrandExchangeOfferNameComparator.field115, -1412584499, var1, var2, var3, var4, Client.field947, class219.field2547, var7); // L: 8662 + GrandExchangeOfferNameComparator.field115 = null; // L: 8663 + } + + } else { + if (var7 != -1) { // L: 8653 + Client.field882[var7] = true; + } else { + for (int var8 = 0; var8 < 100; ++var8) { // L: 8655 + Client.field882[var8] = true; + } + } + + } + } // L: 8657 8665 } diff --git a/runescape-client/src/main/java/PlayerProvider.java b/runescape-client/src/main/java/PlayerProvider.java index f435356210..3cd41a3ba3 100644 --- a/runescape-client/src/main/java/PlayerProvider.java +++ b/runescape-client/src/main/java/PlayerProvider.java @@ -3,13 +3,13 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dh") +@ObfuscatedName("dd") @Implements("PlayerProvider") public interface PlayerProvider { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Ldt;", - garbageValue = "-1371983171" + descriptor = "(I)Ldr;", + garbageValue = "-1032997343" ) @Export("player") PcmPlayer player(); diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java index 5dd88b5ca6..4abc9a5deb 100644 --- a/runescape-client/src/main/java/PlayerType.java +++ b/runescape-client/src/main/java/PlayerType.java @@ -3,150 +3,90 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("is") +@ObfuscatedName("ix") @Implements("PlayerType") public enum PlayerType implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lix;" ) @Export("PlayerType_normal") PlayerType_normal(0, -1, true, false, true), - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lix;" ) @Export("PlayerType_playerModerator") PlayerType_playerModerator(1, 0, true, true, true), - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lix;" ) @Export("PlayerType_jagexModerator") PlayerType_jagexModerator(2, 1, true, true, false), - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lix;" ) @Export("PlayerType_ironman") PlayerType_ironman(3, 2, false, false, true), - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lix;" ) @Export("PlayerType_ultimateIronman") PlayerType_ultimateIronman(4, 3, false, false, true), - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lis;" + descriptor = "Lix;" ) @Export("PlayerType_hardcoreIronman") - PlayerType_hardcoreIronman(5, 10, false, false, true); + PlayerType_hardcoreIronman(5, 10, false, false, true), + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lix;" + ) + field3131(6, 22, false, false, true); - @ObfuscatedName("h") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Liq;" + descriptor = "Lls;" ) - @Export("NetCache_currentResponse") - public static NetFileRequest NetCache_currentResponse; - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "Lij;" - ) - static GameBuild field3130; - @ObfuscatedName("n") + static IndexedSprite field3134; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 45468503 + intValue = 1823451795 ) @Export("id") final int id; - @ObfuscatedName("u") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 87505705 + intValue = 1522972387 ) @Export("modIcon") public final int modIcon; - @ObfuscatedName("a") + @ObfuscatedName("m") @Export("isPrivileged") public final boolean isPrivileged; - @ObfuscatedName("z") + @ObfuscatedName("n") @Export("isUser") public final boolean isUser; PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) { - this.id = var3; - this.modIcon = var4; - this.isPrivileged = var6; - this.isUser = var7; - } + this.id = var3; // L: 24 + this.modIcon = var4; // L: 25 + this.isPrivileged = var6; // L: 26 + this.isUser = var7; // L: 27 + } // L: 28 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1286217427" - ) - static int method4289(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - } else { - var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - } - - class234.invalidateWidget(var3); - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { - var3.modelType = 2; - var3.modelId = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { - var3.modelType = 3; - var3.modelId = class60.localPlayer.appearance.getChatHeadId(); - return 1; - } else { - return 2; - } - } else { - UrlRequester.Interpreter_intStackSize -= 2; - int var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var3.itemId = var4; - var3.itemQuantity = var5; - ItemDefinition var6 = KitDefinition.ItemDefinition_get(var4); - var3.modelAngleX = var6.xan2d; - var3.modelAngleY = var6.yan2d; - var3.modelAngleZ = var6.zan2d; - var3.modelOffsetX = var6.offsetX2d; - var3.modelOffsetY = var6.offsetY2d; - var3.modelZoom = var6.zoom2d; - if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { - var3.itemQuantityMode = 0; - } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { - var3.itemQuantityMode = 1; - } else { - var3.itemQuantityMode = 2; - } - - if (var3.field2657 > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.field2657; - } else if (var3.rawWidth > 0) { - var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; - } - - return 1; - } + return this.id; // L: 31 } } diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java index 060dba9838..7d176da838 100644 --- a/runescape-client/src/main/java/Players.java +++ b/runescape-client/src/main/java/Players.java @@ -4,108 +4,79 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cd") +@ObfuscatedName("ck") @Implements("Players") public class Players { - @ObfuscatedName("q") - static byte[] field1282; - @ObfuscatedName("j") - static byte[] field1278; - @ObfuscatedName("p") + @ObfuscatedName("qh") @ObfuscatedSignature( - descriptor = "[Lkn;" + descriptor = "Ldh;" ) - static Buffer[] field1279; - @ObfuscatedName("g") + @Export("pcmStreamMixer") + static PcmStreamMixer pcmStreamMixer; + @ObfuscatedName("s") + static byte[] field1285; + @ObfuscatedName("t") + static byte[] field1284; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "[Lkf;" + ) + static Buffer[] field1277; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1356497417 + intValue = 1580537391 ) @Export("Players_count") static int Players_count; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("Players_indices") static int[] Players_indices; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -533970605 + intValue = 1079575751 ) @Export("Players_emptyIdxCount") static int Players_emptyIdxCount; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("Players_emptyIndices") static int[] Players_emptyIndices; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("Players_regions") static int[] Players_regions; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("Players_orientations") static int[] Players_orientations; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("Players_targetIndices") static int[] Players_targetIndices; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -144867877 + intValue = 1779975483 ) @Export("Players_pendingUpdateCount") static int Players_pendingUpdateCount; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("Players_pendingUpdateIndices") static int[] Players_pendingUpdateIndices; - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "Lkn;" - ) - static Buffer field1289; - - static { - field1282 = new byte[2048]; - field1278 = new byte[2048]; - field1279 = new Buffer[2048]; - Players_count = 0; - Players_indices = new int[2048]; - Players_emptyIdxCount = 0; - Players_emptyIndices = new int[2048]; - Players_regions = new int[2048]; - Players_orientations = new int[2048]; - Players_targetIndices = new int[2048]; - Players_pendingUpdateCount = 0; - Players_pendingUpdateIndices = new int[2048]; - field1289 = new Buffer(new byte[5000]); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "-1312297159" - ) - static int method2285(int var0, int var1, int var2) { - if (var2 > 179) { - var1 /= 2; - } - - if (var2 > 192) { - var1 /= 2; - } - - if (var2 > 217) { - var1 /= 2; - } - - if (var2 > 243) { - var1 /= 2; - } - - int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; - return var3; - } - @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "910052167" + descriptor = "Lkf;" ) - public static void method2274() { - WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); + static Buffer field1287; + + static { + field1285 = new byte[2048]; // L: 18 + field1284 = new byte[2048]; // L: 19 + field1277 = new Buffer[2048]; // L: 20 + Players_count = 0; // L: 21 + Players_indices = new int[2048]; // L: 22 + Players_emptyIdxCount = 0; // L: 23 + Players_emptyIndices = new int[2048]; // L: 24 + Players_regions = new int[2048]; // L: 25 + Players_orientations = new int[2048]; // L: 26 + Players_targetIndices = new int[2048]; // L: 27 + Players_pendingUpdateCount = 0; // L: 28 + Players_pendingUpdateIndices = new int[2048]; // L: 29 + field1287 = new Buffer(new byte[5000]); // L: 30 } } diff --git a/runescape-client/src/main/java/PrivateChatMode.java b/runescape-client/src/main/java/PrivateChatMode.java index 321e176f45..0afc4b847b 100644 --- a/runescape-client/src/main/java/PrivateChatMode.java +++ b/runescape-client/src/main/java/PrivateChatMode.java @@ -3,37 +3,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ls") +@ObfuscatedName("ld") @Implements("PrivateChatMode") public class PrivateChatMode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lld;" ) - static final PrivateChatMode field3819; - @ObfuscatedName("o") + static final PrivateChatMode field3822; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lld;" ) - public static final PrivateChatMode field3818; - @ObfuscatedName("q") + public static final PrivateChatMode field3821; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lls;" + descriptor = "Lld;" ) - static final PrivateChatMode field3820; - @ObfuscatedName("j") + static final PrivateChatMode field3823; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 530188217 + intValue = 2012095045 ) - public final int field3817; + public final int field3824; static { - field3819 = new PrivateChatMode(0); - field3818 = new PrivateChatMode(1); - field3820 = new PrivateChatMode(2); - } + field3822 = new PrivateChatMode(0); // L: 5 + field3821 = new PrivateChatMode(1); // L: 6 + field3823 = new PrivateChatMode(2); + } // L: 7 PrivateChatMode(int var1) { - this.field3817 = var1; + this.field3824 = var1; // L: 15 + } // L: 16 + + @ObfuscatedName("gf") + @ObfuscatedSignature( + descriptor = "(Lbf;I)Z", + garbageValue = "200454944" + ) + static boolean method6022(Player var0) { + if (Client.drawPlayerNames == 0) { // L: 4413 + return false; + } else if (WorldMapLabelSize.localPlayer == var0) { // L: 4414 + return TileItem.method2208(); // L: 4425 + } else { + boolean var1 = LoginPacket.method3707() || Client.method1792() && var0.isFriend(); // L: 4415 + if (!var1) { // L: 4416 + boolean var2 = (Client.drawPlayerNames & 2) != 0; // L: 4419 + var1 = var2 && var0.isClanMember(); // L: 4421 + } + + return var1; // L: 4423 + } } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index b0bcb19182..27491231b5 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -4,121 +4,115 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cm") +@ObfuscatedName("cp") @Implements("Projectile") public final class Projectile extends Entity { - @ObfuscatedName("dk") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive7") - static Archive archive7; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1211843013 + intValue = -1675813545 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 584817429 + intValue = -1633530883 ) @Export("plane") int plane; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1041388181 + intValue = -1241662831 ) @Export("sourceX") int sourceX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1446127367 + intValue = 674628417 ) @Export("sourceY") int sourceY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 967638661 + intValue = -1517344079 ) @Export("sourceZ") int sourceZ; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -2073235503 + intValue = -1565729659 ) @Export("endHeight") int endHeight; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1099398643 + intValue = 287551571 ) @Export("cycleStart") int cycleStart; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -1884800007 + intValue = -23705649 ) @Export("cycleEnd") int cycleEnd; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -305912625 + intValue = -1941838325 ) @Export("slope") int slope; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1437284949 + intValue = -1921562263 ) @Export("startHeight") int startHeight; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1247378157 + intValue = 1380116723 ) @Export("targetIndex") int targetIndex; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("isMoving") boolean isMoving; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("x") double x; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("y") double y; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("z") double z; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("speedX") double speedX; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("speedY") double speedY; - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("speed") double speed; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("speedZ") double speedZ; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("accelerationZ") double accelerationZ; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 2056427921 + intValue = -2137407611 ) @Export("yaw") int yaw; - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -414343735 + intValue = -2024563433 ) @Export("pitch") int pitch; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "Ljm;" ) @@ -126,143 +120,187 @@ public final class Projectile extends Entity { SequenceDefinition sequenceDefinition; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 106305103 + intValue = 1681921945 ) @Export("frame") int frame; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1726511745 + intValue = 1329964451 ) @Export("frameCycle") int frameCycle; Projectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { - this.isMoving = false; - this.frame = 0; - this.frameCycle = 0; - this.id = var1; - this.plane = var2; - this.sourceX = var3; - this.sourceY = var4; - this.sourceZ = var5; - this.cycleStart = var6; - this.cycleEnd = var7; - this.slope = var8; - this.startHeight = var9; - this.targetIndex = var10; - this.endHeight = var11; - this.isMoving = false; - int var12 = class4.SpotAnimationDefinition_get(this.id).sequence; - if (var12 != -1) { - this.sequenceDefinition = NetSocket.SequenceDefinition_get(var12); + this.isMoving = false; // L: 20 + this.frame = 0; // L: 32 + this.frameCycle = 0; // L: 33 + this.id = var1; // L: 36 + this.plane = var2; // L: 37 + this.sourceX = var3; // L: 38 + this.sourceY = var4; // L: 39 + this.sourceZ = var5; // L: 40 + this.cycleStart = var6; // L: 41 + this.cycleEnd = var7; // L: 42 + this.slope = var8; // L: 43 + this.startHeight = var9; // L: 44 + this.targetIndex = var10; // L: 45 + this.endHeight = var11; // L: 46 + this.isMoving = false; // L: 47 + int var12 = Tiles.SpotAnimationDefinition_get(this.id).sequence; // L: 48 + if (var12 != -1) { // L: 49 + this.sequenceDefinition = WorldMapRegion.SequenceDefinition_get(var12); } else { - this.sequenceDefinition = null; + this.sequenceDefinition = null; // L: 50 } - } + } // L: 51 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "129892196" + descriptor = "(IIIIB)V", + garbageValue = "81" ) @Export("setDestination") final void setDestination(int var1, int var2, int var3, int var4) { double var5; - if (!this.isMoving) { - var5 = (double)(var1 - this.sourceX); - double var7 = (double)(var2 - this.sourceY); - double var9 = Math.sqrt(var5 * var5 + var7 * var7); - this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; - this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; - this.z = (double)this.sourceZ; + if (!this.isMoving) { // L: 54 + var5 = (double)(var1 - this.sourceX); // L: 55 + double var7 = (double)(var2 - this.sourceY); // L: 56 + double var9 = Math.sqrt(var7 * var7 + var5 * var5); // L: 57 + this.x = (double)this.startHeight * var5 / var9 + (double)this.sourceX; // L: 58 + this.y = (double)this.sourceY + var7 * (double)this.startHeight / var9; // L: 59 + this.z = (double)this.sourceZ; // L: 60 } - var5 = (double)(this.cycleEnd + 1 - var4); - this.speedX = ((double)var1 - this.x) / var5; - this.speedY = ((double)var2 - this.y) / var5; - this.speed = Math.sqrt(this.speedX * this.speedX + this.speedY * this.speedY); - if (!this.isMoving) { + var5 = (double)(this.cycleEnd + 1 - var4); // L: 62 + this.speedX = ((double)var1 - this.x) / var5; // L: 63 + this.speedY = ((double)var2 - this.y) / var5; // L: 64 + this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX); // L: 65 + if (!this.isMoving) { // L: 66 this.speedZ = -this.speed * Math.tan((double)this.slope * 0.02454369D); } - this.accelerationZ = ((double)var3 - this.z - this.speedZ * var5) * 2.0D / (var5 * var5); - } + this.accelerationZ = 2.0D * ((double)var3 - this.z - this.speedZ * var5) / (var5 * var5); // L: 67 + } // L: 68 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IB)V", - garbageValue = "-44" + garbageValue = "-28" ) @Export("advance") final void advance(int var1) { - this.isMoving = true; - this.x += (double)var1 * this.speedX; - this.y += (double)var1 * this.speedY; - this.z += this.accelerationZ * 0.5D * (double)var1 * (double)var1 + (double)var1 * this.speedZ; - this.speedZ += (double)var1 * this.accelerationZ; - this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; - this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; - if (this.sequenceDefinition != null) { - this.frameCycle += var1; + this.isMoving = true; // L: 71 + this.x += this.speedX * (double)var1; // L: 72 + this.y += this.speedY * (double)var1; // L: 73 + this.z += (double)var1 * (double)var1 * 0.5D * this.accelerationZ + this.speedZ * (double)var1; // L: 74 + this.speedZ += this.accelerationZ * (double)var1; // L: 75 + this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047; // L: 76 + this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047; // L: 77 + if (this.sequenceDefinition != null) { // L: 78 + this.frameCycle += var1; // L: 79 while (true) { do { do { - if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { - return; + if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 80 + return; // L: 89 } - this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; - ++this.frame; - } while(this.frame < this.sequenceDefinition.frameIds.length); + this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame]; // L: 81 + ++this.frame; // L: 82 + } while(this.frame < this.sequenceDefinition.frameIds.length); // L: 83 - this.frame -= this.sequenceDefinition.frameCount; - } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); + this.frame -= this.sequenceDefinition.frameCount; // L: 84 + } while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length); // L: 85 this.frame = 0; } } } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lef;", - garbageValue = "1832696685" + descriptor = "(I)Ler;", + garbageValue = "-2026237468" ) @Export("getModel") protected final Model getModel() { - SpotAnimationDefinition var1 = class4.SpotAnimationDefinition_get(this.id); - Model var2 = var1.getModel(this.frame); - if (var2 == null) { + SpotAnimationDefinition var1 = Tiles.SpotAnimationDefinition_get(this.id); // L: 92 + Model var2 = var1.getModel(this.frame); // L: 93 + if (var2 == null) { // L: 94 return null; } else { - var2.rotateZ(this.pitch); - return var2; + var2.rotateZ(this.pitch); // L: 95 + return var2; // L: 96 } } - @ObfuscatedName("m") + @ObfuscatedName("jb") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-40295508" + descriptor = "([Lhq;II)V", + garbageValue = "-823007916" ) - static void method2247() { - for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var0.obj != null) { - var0.set(); + @Export("drawModelComponents") + static final void drawModelComponents(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10302 + Widget var3 = var0[var2]; // L: 10303 + if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !GrandExchangeOfferUnitPriceComparator.isComponentHidden(var3))) { // L: 10304 10305 10306 + if (var3.type == 0) { // L: 10307 + if (!var3.isIf3 && GrandExchangeOfferUnitPriceComparator.isComponentHidden(var3) && var3 != TriBool.mousedOverWidgetIf1) { // L: 10308 + continue; + } + + drawModelComponents(var0, var3.id); // L: 10309 + if (var3.children != null) { // L: 10310 + drawModelComponents(var3.children, var3.id); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10311 + if (var4 != null) { // L: 10312 + class58.method913(var4.group); + } + } + + if (var3.type == 6) { // L: 10314 + int var5; + if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { // L: 10315 + boolean var7 = MusicPatch.runCs1(var3); // L: 10316 + if (var7) { // L: 10318 + var5 = var3.sequenceId2; + } else { + var5 = var3.sequenceId; // L: 10319 + } + + if (var5 != -1) { // L: 10320 + SequenceDefinition var6 = WorldMapRegion.SequenceDefinition_get(var5); // L: 10321 + + for (var3.modelFrameCycle += Client.field737; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class52.invalidateWidget(var3)) { // L: 10322 10323 10330 + var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 10324 + ++var3.modelFrame; // L: 10325 + if (var3.modelFrame >= var6.frameIds.length) { // L: 10326 + var3.modelFrame -= var6.frameCount; // L: 10327 + if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { // L: 10328 + var3.modelFrame = 0; + } + } + } + } + } + + if (var3.field2633 != 0 && !var3.isIf3) { // L: 10334 + int var8 = var3.field2633 >> 16; // L: 10335 + var5 = var3.field2633 << 16 >> 16; // L: 10336 + var8 *= Client.field737; // L: 10337 + var5 *= Client.field737; // L: 10338 + var3.modelAngleX = var8 + var3.modelAngleX & 2047; // L: 10339 + var3.modelAngleY = var5 + var3.modelAngleY & 2047; // L: 10340 + class52.invalidateWidget(var3); // L: 10341 + } + } } } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "3" - ) - public static boolean method2249(int var0) { - return (var0 >> 29 & 1) != 0; - } + } // L: 10345 } diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java index 7fae546ac3..76377f1863 100644 --- a/runescape-client/src/main/java/RasterProvider.java +++ b/runescape-client/src/main/java/RasterProvider.java @@ -14,88 +14,88 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bq") +@ObfuscatedName("bn") @Implements("RasterProvider") public final class RasterProvider extends AbstractRasterProvider { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("component") Component component; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("image") Image image; RasterProvider(int var1, int var2, Component var3) { - super.width = var1; - super.height = var2; - super.pixels = new int[var2 * var1 + 1]; - DataBufferInt var4 = new DataBufferInt(super.pixels, super.pixels.length); - DirectColorModel var5 = new DirectColorModel(32, 16711680, 65280, 255); - WritableRaster var6 = Raster.createWritableRaster(var5.createCompatibleSampleModel(super.width, super.height), var4, (Point)null); - this.image = new BufferedImage(var5, var6, false, new Hashtable()); - this.setComponent(var3); - this.apply(); - } + super.width = var1; // L: 23 + super.height = var2; // L: 24 + super.pixels = new int[var2 * var1 + 1]; // L: 25 + DataBufferInt var4 = new DataBufferInt(super.pixels, super.pixels.length); // L: 26 + DirectColorModel var5 = new DirectColorModel(32, 16711680, 65280, 255); // L: 27 + WritableRaster var6 = Raster.createWritableRaster(var5.createCompatibleSampleModel(super.width, super.height), var4, (Point)null); // L: 28 + this.image = new BufferedImage(var5, var6, false, new Hashtable()); // L: 29 + this.setComponent(var3); // L: 30 + this.apply(); // L: 31 + } // L: 32 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Component;B)V", - garbageValue = "-55" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-90781444" ) @Export("setComponent") final void setComponent(Component var1) { - this.component = var1; - } + this.component = var1; // L: 35 + } // L: 36 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIB)V", - garbageValue = "-5" + descriptor = "(III)V", + garbageValue = "-1964598850" ) @Export("drawFull") public final void drawFull(int var1, int var2) { - this.drawFull0(this.component.getGraphics(), var1, var2); - } + this.drawFull0(this.component.getGraphics(), var1, var2); // L: 39 + } // L: 40 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-1334771637" + garbageValue = "147756616" ) @Export("draw") public final void draw(int var1, int var2, int var3, int var4) { - this.draw0(this.component.getGraphics(), var1, var2, var3, var4); - } + this.draw0(this.component.getGraphics(), var1, var2, var3, var4); // L: 43 + } // L: 44 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;III)V", - garbageValue = "2097062254" + descriptor = "(Ljava/awt/Graphics;IIB)V", + garbageValue = "0" ) @Export("drawFull0") final void drawFull0(Graphics var1, int var2, int var3) { try { - var1.drawImage(this.image, var2, var3, this.component); - } catch (Exception var5) { - this.component.repaint(); + var1.drawImage(this.image, var2, var3, this.component); // L: 48 + } catch (Exception var5) { // L: 50 + this.component.repaint(); // L: 51 } - } + } // L: 53 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Ljava/awt/Graphics;IIIII)V", - garbageValue = "-199223642" + descriptor = "(Ljava/awt/Graphics;IIIIB)V", + garbageValue = "-54" ) @Export("draw0") final void draw0(Graphics var1, int var2, int var3, int var4, int var5) { try { - Shape var6 = var1.getClip(); - var1.clipRect(var2, var3, var4, var5); - var1.drawImage(this.image, 0, 0, this.component); - var1.setClip(var6); - } catch (Exception var7) { - this.component.repaint(); + Shape var6 = var1.getClip(); // L: 57 + var1.clipRect(var2, var3, var4, var5); // L: 58 + var1.drawImage(this.image, 0, 0, this.component); // L: 59 + var1.setClip(var6); // L: 60 + } catch (Exception var7) { // L: 62 + this.component.repaint(); // L: 63 } - } + } // L: 65 } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 917483fd4e..76c7c905e9 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -3,10 +3,10 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ld") +@ObfuscatedName("lv") @Implements("Rasterizer2D") public class Rasterizer2D extends DualNode { - @ObfuscatedName("ai") + @ObfuscatedName("ag") @Export("Rasterizer2D_pixels") public static int[] Rasterizer2D_pixels; @ObfuscatedName("ao") @@ -15,159 +15,159 @@ public class Rasterizer2D extends DualNode { @ObfuscatedName("ae") @Export("Rasterizer2D_height") public static int Rasterizer2D_height; - @ObfuscatedName("ax") + @ObfuscatedName("an") @Export("Rasterizer2D_yClipStart") public static int Rasterizer2D_yClipStart; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("Rasterizer2D_yClipEnd") public static int Rasterizer2D_yClipEnd; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @Export("Rasterizer2D_xClipStart") public static int Rasterizer2D_xClipStart; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("Rasterizer2D_xClipEnd") public static int Rasterizer2D_xClipEnd; static { - Rasterizer2D_yClipStart = 0; - Rasterizer2D_yClipEnd = 0; - Rasterizer2D_xClipStart = 0; - Rasterizer2D_xClipEnd = 0; + Rasterizer2D_yClipStart = 0; // L: 11 + Rasterizer2D_yClipEnd = 0; // L: 12 + Rasterizer2D_xClipStart = 0; // L: 13 + Rasterizer2D_xClipEnd = 0; // L: 14 } protected Rasterizer2D() { - } + } // L: 16 - @ObfuscatedName("dp") + @ObfuscatedName("cs") @Export("Rasterizer2D_replace") public static void Rasterizer2D_replace(int[] var0, int var1, int var2) { - Rasterizer2D_pixels = var0; - Rasterizer2D_width = var1; - Rasterizer2D_height = var2; - Rasterizer2D_setClip(0, 0, var1, var2); - } + Rasterizer2D_pixels = var0; // L: 19 + Rasterizer2D_width = var1; // L: 20 + Rasterizer2D_height = var2; // L: 21 + Rasterizer2D_setClip(0, 0, var1, var2); // L: 22 + } // L: 23 - @ObfuscatedName("dc") + @ObfuscatedName("ck") @Export("Rasterizer2D_resetClip") public static void Rasterizer2D_resetClip() { - Rasterizer2D_xClipStart = 0; - Rasterizer2D_yClipStart = 0; - Rasterizer2D_xClipEnd = Rasterizer2D_width; - Rasterizer2D_yClipEnd = Rasterizer2D_height; - } + Rasterizer2D_xClipStart = 0; // L: 26 + Rasterizer2D_yClipStart = 0; // L: 27 + Rasterizer2D_xClipEnd = Rasterizer2D_width; // L: 28 + Rasterizer2D_yClipEnd = Rasterizer2D_height; // L: 29 + } // L: 30 - @ObfuscatedName("dt") + @ObfuscatedName("co") @Export("Rasterizer2D_setClip") public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) { - if (var0 < 0) { + if (var0 < 0) { // L: 33 var0 = 0; } - if (var1 < 0) { + if (var1 < 0) { // L: 34 var1 = 0; } - if (var2 > Rasterizer2D_width) { + if (var2 > Rasterizer2D_width) { // L: 35 var2 = Rasterizer2D_width; } if (var3 > Rasterizer2D_height) { - var3 = Rasterizer2D_height; + var3 = Rasterizer2D_height; // L: 36 } - Rasterizer2D_xClipStart = var0; - Rasterizer2D_yClipStart = var1; - Rasterizer2D_xClipEnd = var2; - Rasterizer2D_yClipEnd = var3; - } + Rasterizer2D_xClipStart = var0; // L: 37 + Rasterizer2D_yClipStart = var1; // L: 38 + Rasterizer2D_xClipEnd = var2; // L: 39 + Rasterizer2D_yClipEnd = var3; // L: 40 + } // L: 41 - @ObfuscatedName("ds") + @ObfuscatedName("cz") @Export("Rasterizer2D_expandClip") public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) { - if (Rasterizer2D_xClipStart < var0) { + if (Rasterizer2D_xClipStart < var0) { // L: 44 Rasterizer2D_xClipStart = var0; } - if (Rasterizer2D_yClipStart < var1) { + if (Rasterizer2D_yClipStart < var1) { // L: 45 Rasterizer2D_yClipStart = var1; } - if (Rasterizer2D_xClipEnd > var2) { + if (Rasterizer2D_xClipEnd > var2) { // L: 46 Rasterizer2D_xClipEnd = var2; } - if (Rasterizer2D_yClipEnd > var3) { + if (Rasterizer2D_yClipEnd > var3) { // L: 47 Rasterizer2D_yClipEnd = var3; } - } + } // L: 48 - @ObfuscatedName("dg") + @ObfuscatedName("cy") @Export("Rasterizer2D_getClipArray") public static void Rasterizer2D_getClipArray(int[] var0) { - var0[0] = Rasterizer2D_xClipStart; - var0[1] = Rasterizer2D_yClipStart; - var0[2] = Rasterizer2D_xClipEnd; - var0[3] = Rasterizer2D_yClipEnd; - } + var0[0] = Rasterizer2D_xClipStart; // L: 51 + var0[1] = Rasterizer2D_yClipStart; // L: 52 + var0[2] = Rasterizer2D_xClipEnd; // L: 53 + var0[3] = Rasterizer2D_yClipEnd; // L: 54 + } // L: 55 - @ObfuscatedName("do") + @ObfuscatedName("cb") @Export("Rasterizer2D_setClipArray") public static void Rasterizer2D_setClipArray(int[] var0) { - Rasterizer2D_xClipStart = var0[0]; - Rasterizer2D_yClipStart = var0[1]; - Rasterizer2D_xClipEnd = var0[2]; - Rasterizer2D_yClipEnd = var0[3]; - } + Rasterizer2D_xClipStart = var0[0]; // L: 58 + Rasterizer2D_yClipStart = var0[1]; // L: 59 + Rasterizer2D_xClipEnd = var0[2]; // L: 60 + Rasterizer2D_yClipEnd = var0[3]; // L: 61 + } // L: 62 - @ObfuscatedName("dn") + @ObfuscatedName("cl") @Export("Rasterizer2D_clear") public static void Rasterizer2D_clear() { - int var0 = 0; + int var0 = 0; // L: 65 int var1; - for (var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { - Rasterizer2D_pixels[var0++] = 0; - Rasterizer2D_pixels[var0++] = 0; - Rasterizer2D_pixels[var0++] = 0; - Rasterizer2D_pixels[var0++] = 0; - Rasterizer2D_pixels[var0++] = 0; - Rasterizer2D_pixels[var0++] = 0; - Rasterizer2D_pixels[var0++] = 0; + for (var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { // L: 66 67 75 + Rasterizer2D_pixels[var0++] = 0; // L: 68 + Rasterizer2D_pixels[var0++] = 0; // L: 69 + Rasterizer2D_pixels[var0++] = 0; // L: 70 + Rasterizer2D_pixels[var0++] = 0; // L: 71 + Rasterizer2D_pixels[var0++] = 0; // L: 72 + Rasterizer2D_pixels[var0++] = 0; // L: 73 + Rasterizer2D_pixels[var0++] = 0; // L: 74 } - for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { + for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) { // L: 77 78 } - } + } // L: 79 - @ObfuscatedName("db") + @ObfuscatedName("dx") @Export("drawCircle") static void drawCircle(int var0, int var1, int var2, int var3) { - if (var2 == 0) { - Rasterizer2D_setPixel(var0, var1, var3); + if (var2 == 0) { // L: 82 + Rasterizer2D_setPixel(var0, var1, var3); // L: 83 } else { - if (var2 < 0) { + if (var2 < 0) { // L: 86 var2 = -var2; } - int var4 = var1 - var2; - if (var4 < Rasterizer2D_yClipStart) { + int var4 = var1 - var2; // L: 87 + if (var4 < Rasterizer2D_yClipStart) { // L: 88 var4 = Rasterizer2D_yClipStart; } - int var5 = var2 + var1 + 1; - if (var5 > Rasterizer2D_yClipEnd) { + int var5 = var2 + var1 + 1; // L: 89 + if (var5 > Rasterizer2D_yClipEnd) { // L: 90 var5 = Rasterizer2D_yClipEnd; } - int var6 = var4; - int var7 = var2 * var2; - int var8 = 0; - int var9 = var1 - var4; - int var10 = var9 * var9; - int var11 = var10 - var9; - if (var1 > var5) { + int var6 = var4; // L: 91 + int var7 = var2 * var2; // L: 92 + int var8 = 0; // L: 93 + int var9 = var1 - var4; // L: 94 + int var10 = var9 * var9; // L: 95 + int var11 = var10 - var9; // L: 96 + if (var1 > var5) { // L: 97 var1 = var5; } @@ -175,99 +175,99 @@ public class Rasterizer2D extends DualNode { int var13; int var14; int var15; - while (var6 < var1) { - while (var11 <= var7 || var10 <= var7) { - var10 = var10 + var8 + var8; - var11 += var8++ + var8; + while (var6 < var1) { // L: 98 + while (var11 <= var7 || var10 <= var7) { // L: 99 + var10 = var10 + var8 + var8; // L: 100 + var11 += var8++ + var8; // L: 101 } - var12 = var0 - var8 + 1; - if (var12 < Rasterizer2D_xClipStart) { + var12 = var0 - var8 + 1; // L: 103 + if (var12 < Rasterizer2D_xClipStart) { // L: 104 var12 = Rasterizer2D_xClipStart; } - var13 = var0 + var8; - if (var13 > Rasterizer2D_xClipEnd) { + var13 = var0 + var8; // L: 105 + if (var13 > Rasterizer2D_xClipEnd) { // L: 106 var13 = Rasterizer2D_xClipEnd; } - var14 = var12 + var6 * Rasterizer2D_width; + var14 = var12 + var6 * Rasterizer2D_width; // L: 107 - for (var15 = var12; var15 < var13; ++var15) { + for (var15 = var12; var15 < var13; ++var15) { // L: 108 Rasterizer2D_pixels[var14++] = var3; } - ++var6; - var10 -= var9-- + var9; - var11 -= var9 + var9; + ++var6; // L: 109 + var10 -= var9-- + var9; // L: 110 + var11 -= var9 + var9; // L: 111 } - var8 = var2; - var9 = var6 - var1; - var11 = var7 + var9 * var9; - var10 = var11 - var2; + var8 = var2; // L: 113 + var9 = var6 - var1; // L: 114 + var11 = var7 + var9 * var9; // L: 115 + var10 = var11 - var2; // L: 116 - for (var11 -= var9; var6 < var5; var10 += var9++ + var9) { - while (var11 > var7 && var10 > var7) { - var11 -= var8-- + var8; - var10 -= var8 + var8; + for (var11 -= var9; var6 < var5; var10 += var9++ + var9) { // L: 117 118 131 + while (var11 > var7 && var10 > var7) { // L: 119 + var11 -= var8-- + var8; // L: 120 + var10 -= var8 + var8; // L: 121 } - var12 = var0 - var8; - if (var12 < Rasterizer2D_xClipStart) { + var12 = var0 - var8; // L: 123 + if (var12 < Rasterizer2D_xClipStart) { // L: 124 var12 = Rasterizer2D_xClipStart; } - var13 = var0 + var8; - if (var13 > Rasterizer2D_xClipEnd - 1) { + var13 = var0 + var8; // L: 125 + if (var13 > Rasterizer2D_xClipEnd - 1) { // L: 126 var13 = Rasterizer2D_xClipEnd - 1; } - var14 = var12 + var6 * Rasterizer2D_width; + var14 = var12 + var6 * Rasterizer2D_width; // L: 127 for (var15 = var12; var15 <= var13; ++var15) { - Rasterizer2D_pixels[var14++] = var3; + Rasterizer2D_pixels[var14++] = var3; // L: 128 } - ++var6; - var11 = var11 + var9 + var9; + ++var6; // L: 129 + var11 = var11 + var9 + var9; // L: 130 } } - } + } // L: 84 133 - @ObfuscatedName("de") + @ObfuscatedName("dh") @Export("Rasterizer2D_drawCircleAlpha") public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var4 != 0) { - if (var4 == 256) { - drawCircle(var0, var1, var2, var3); + if (var4 != 0) { // L: 136 + if (var4 == 256) { // L: 137 + drawCircle(var0, var1, var2, var3); // L: 138 } else { - if (var2 < 0) { + if (var2 < 0) { // L: 141 var2 = -var2; } - int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = var4 * (var3 & 255); - int var12 = var1 - var2; - if (var12 < Rasterizer2D_yClipStart) { + int var5 = 256 - var4; // L: 142 + int var6 = (var3 >> 16 & 255) * var4; // L: 143 + int var7 = (var3 >> 8 & 255) * var4; // L: 144 + int var8 = var4 * (var3 & 255); // L: 145 + int var12 = var1 - var2; // L: 149 + if (var12 < Rasterizer2D_yClipStart) { // L: 150 var12 = Rasterizer2D_yClipStart; } - int var13 = var2 + var1 + 1; - if (var13 > Rasterizer2D_yClipEnd) { + int var13 = var2 + var1 + 1; // L: 151 + if (var13 > Rasterizer2D_yClipEnd) { // L: 152 var13 = Rasterizer2D_yClipEnd; } - int var14 = var12; - int var15 = var2 * var2; - int var16 = 0; - int var17 = var1 - var12; - int var18 = var17 * var17; - int var19 = var18 - var17; - if (var1 > var13) { + int var14 = var12; // L: 153 + int var15 = var2 * var2; // L: 154 + int var16 = 0; // L: 155 + int var17 = var1 - var12; // L: 156 + int var18 = var17 * var17; // L: 157 + int var19 = var18 - var17; // L: 158 + if (var1 > var13) { // L: 159 var1 = var13; } @@ -279,561 +279,561 @@ public class Rasterizer2D extends DualNode { int var22; int var23; int var24; - while (var14 < var1) { - while (var19 <= var15 || var18 <= var15) { - var18 = var18 + var16 + var16; - var19 += var16++ + var16; + while (var14 < var1) { // L: 160 + while (var19 <= var15 || var18 <= var15) { // L: 161 + var18 = var18 + var16 + var16; // L: 162 + var19 += var16++ + var16; // L: 163 } - var20 = var0 - var16 + 1; - if (var20 < Rasterizer2D_xClipStart) { + var20 = var0 - var16 + 1; // L: 165 + if (var20 < Rasterizer2D_xClipStart) { // L: 166 var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; - if (var21 > Rasterizer2D_xClipEnd) { + var21 = var0 + var16; // L: 167 + if (var21 > Rasterizer2D_xClipEnd) { // L: 168 var21 = Rasterizer2D_xClipEnd; } - var22 = var20 + var14 * Rasterizer2D_width; + var22 = var20 + var14 * Rasterizer2D_width; // L: 169 - for (var23 = var20; var23 < var21; ++var23) { - var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); - var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; - var11 = var5 * (Rasterizer2D_pixels[var22] & 255); - var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); - Rasterizer2D_pixels[var22++] = var24; + for (var23 = var20; var23 < var21; ++var23) { // L: 170 + var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); // L: 171 + var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; // L: 172 + var11 = var5 * (Rasterizer2D_pixels[var22] & 255); // L: 173 + var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 174 + Rasterizer2D_pixels[var22++] = var24; // L: 175 } - ++var14; - var18 -= var17-- + var17; - var19 -= var17 + var17; + ++var14; // L: 177 + var18 -= var17-- + var17; // L: 178 + var19 -= var17 + var17; // L: 179 } - var16 = var2; - var17 = -var17; - var19 = var15 + var17 * var17; - var18 = var19 - var2; + var16 = var2; // L: 181 + var17 = -var17; // L: 182 + var19 = var15 + var17 * var17; // L: 183 + var18 = var19 - var2; // L: 184 - for (var19 -= var17; var14 < var13; var18 += var17++ + var17) { - while (var19 > var15 && var18 > var15) { - var19 -= var16-- + var16; - var18 -= var16 + var16; + for (var19 -= var17; var14 < var13; var18 += var17++ + var17) { // L: 185 186 205 + while (var19 > var15 && var18 > var15) { // L: 187 + var19 -= var16-- + var16; // L: 188 + var18 -= var16 + var16; // L: 189 } - var20 = var0 - var16; - if (var20 < Rasterizer2D_xClipStart) { + var20 = var0 - var16; // L: 191 + if (var20 < Rasterizer2D_xClipStart) { // L: 192 var20 = Rasterizer2D_xClipStart; } - var21 = var0 + var16; - if (var21 > Rasterizer2D_xClipEnd - 1) { + var21 = var0 + var16; // L: 193 + if (var21 > Rasterizer2D_xClipEnd - 1) { // L: 194 var21 = Rasterizer2D_xClipEnd - 1; } - var22 = var20 + var14 * Rasterizer2D_width; + var22 = var20 + var14 * Rasterizer2D_width; // L: 195 - for (var23 = var20; var23 <= var21; ++var23) { - var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); - var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; - var11 = var5 * (Rasterizer2D_pixels[var22] & 255); - var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); - Rasterizer2D_pixels[var22++] = var24; + for (var23 = var20; var23 <= var21; ++var23) { // L: 196 + var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255); // L: 197 + var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5; // L: 198 + var11 = var5 * (Rasterizer2D_pixels[var22] & 255); // L: 199 + var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 200 + Rasterizer2D_pixels[var22++] = var24; // L: 201 } - ++var14; - var19 = var19 + var17 + var17; + ++var14; // L: 203 + var19 = var19 + var17 + var17; // L: 204 } } } - } + } // L: 139 207 - @ObfuscatedName("dv") + @ObfuscatedName("dd") @Export("Rasterizer2D_fillRectangleAlpha") public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + if (var0 < Rasterizer2D_xClipStart) { // L: 210 + var2 -= Rasterizer2D_xClipStart - var0; // L: 211 + var0 = Rasterizer2D_xClipStart; // L: 212 } - if (var1 < Rasterizer2D_yClipStart) { - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (var1 < Rasterizer2D_yClipStart) { // L: 214 + var3 -= Rasterizer2D_yClipStart - var1; // L: 215 + var1 = Rasterizer2D_yClipStart; // L: 216 } - if (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 218 var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 219 var3 = Rasterizer2D_yClipEnd - var1; } - var4 = (var5 * (var4 & 16711935) >> 8 & 16711935) + (var5 * (var4 & 65280) >> 8 & 65280); - int var6 = 256 - var5; - int var7 = Rasterizer2D_width - var2; - int var8 = var0 + Rasterizer2D_width * var1; + var4 = (var5 * (var4 & 16711935) >> 8 & 16711935) + (var5 * (var4 & 65280) >> 8 & 65280); // L: 220 + int var6 = 256 - var5; // L: 221 + int var7 = Rasterizer2D_width - var2; // L: 222 + int var8 = var0 + Rasterizer2D_width * var1; // L: 223 - for (int var9 = 0; var9 < var3; ++var9) { - for (int var10 = -var2; var10 < 0; ++var10) { - int var11 = Rasterizer2D_pixels[var8]; - var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280); - Rasterizer2D_pixels[var8++] = var11 + var4; + for (int var9 = 0; var9 < var3; ++var9) { // L: 224 + for (int var10 = -var2; var10 < 0; ++var10) { // L: 225 + int var11 = Rasterizer2D_pixels[var8]; // L: 226 + var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280); // L: 227 + Rasterizer2D_pixels[var8++] = var11 + var4; // L: 228 } - var8 += var7; + var8 += var7; // L: 230 } - } + } // L: 232 - @ObfuscatedName("dk") + @ObfuscatedName("db") @Export("Rasterizer2D_fillRectangle") public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + if (var0 < Rasterizer2D_xClipStart) { // L: 235 + var2 -= Rasterizer2D_xClipStart - var0; // L: 236 + var0 = Rasterizer2D_xClipStart; // L: 237 } - if (var1 < Rasterizer2D_yClipStart) { - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (var1 < Rasterizer2D_yClipStart) { // L: 239 + var3 -= Rasterizer2D_yClipStart - var1; // L: 240 + var1 = Rasterizer2D_yClipStart; // L: 241 } - if (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 243 var2 = Rasterizer2D_xClipEnd - var0; } if (var3 + var1 > Rasterizer2D_yClipEnd) { - var3 = Rasterizer2D_yClipEnd - var1; + var3 = Rasterizer2D_yClipEnd - var1; // L: 244 } - int var5 = Rasterizer2D_width - var2; - int var6 = var0 + Rasterizer2D_width * var1; + int var5 = Rasterizer2D_width - var2; // L: 245 + int var6 = var0 + Rasterizer2D_width * var1; // L: 246 - for (int var7 = -var3; var7 < 0; ++var7) { - for (int var8 = -var2; var8 < 0; ++var8) { - Rasterizer2D_pixels[var6++] = var4; + for (int var7 = -var3; var7 < 0; ++var7) { // L: 247 + for (int var8 = -var2; var8 < 0; ++var8) { // L: 248 + Rasterizer2D_pixels[var6++] = var4; // L: 249 } - var6 += var5; + var6 += var5; // L: 251 } - } + } // L: 253 - @ObfuscatedName("da") + @ObfuscatedName("dj") @Export("Rasterizer2D_fillRectangleGradient") public static void Rasterizer2D_fillRectangleGradient(int var0, int var1, int var2, int var3, int var4, int var5) { - if (var2 > 0 && var3 > 0) { - int var6 = 0; - int var7 = 65536 / var3; - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + if (var2 > 0 && var3 > 0) { // L: 256 + int var6 = 0; // L: 257 + int var7 = 65536 / var3; // L: 258 + if (var0 < Rasterizer2D_xClipStart) { // L: 259 + var2 -= Rasterizer2D_xClipStart - var0; // L: 260 + var0 = Rasterizer2D_xClipStart; // L: 261 } - if (var1 < Rasterizer2D_yClipStart) { - var6 += (Rasterizer2D_yClipStart - var1) * var7; - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (var1 < Rasterizer2D_yClipStart) { // L: 263 + var6 += (Rasterizer2D_yClipStart - var1) * var7; // L: 264 + var3 -= Rasterizer2D_yClipStart - var1; // L: 265 + var1 = Rasterizer2D_yClipStart; // L: 266 } - if (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 268 var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 269 var3 = Rasterizer2D_yClipEnd - var1; } - int var8 = Rasterizer2D_width - var2; - int var9 = var0 + Rasterizer2D_width * var1; + int var8 = Rasterizer2D_width - var2; // L: 270 + int var9 = var0 + Rasterizer2D_width * var1; // L: 271 - for (int var10 = -var3; var10 < 0; ++var10) { - int var11 = 65536 - var6 >> 8; - int var12 = var6 >> 8; - int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8; + for (int var10 = -var3; var10 < 0; ++var10) { // L: 272 + int var11 = 65536 - var6 >> 8; // L: 273 + int var12 = var6 >> 8; // L: 274 + int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8; // L: 275 - for (int var14 = -var2; var14 < 0; ++var14) { - Rasterizer2D_pixels[var9++] = var13; + for (int var14 = -var2; var14 < 0; ++var14) { // L: 276 + Rasterizer2D_pixels[var9++] = var13; // L: 277 } - var9 += var8; - var6 += var7; + var9 += var8; // L: 279 + var6 += var7; // L: 280 } } - } + } // L: 282 - @ObfuscatedName("df") + @ObfuscatedName("dk") @Export("Rasterizer2D_fillRectangleGradientAlpha") public static void Rasterizer2D_fillRectangleGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var2 > 0 && var3 > 0) { - int var8 = 0; - int var9 = 65536 / var3; - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + if (var2 > 0 && var3 > 0) { // L: 285 + int var8 = 0; // L: 286 + int var9 = 65536 / var3; // L: 287 + if (var0 < Rasterizer2D_xClipStart) { // L: 288 + var2 -= Rasterizer2D_xClipStart - var0; // L: 289 + var0 = Rasterizer2D_xClipStart; // L: 290 } - if (var1 < Rasterizer2D_yClipStart) { - var8 += (Rasterizer2D_yClipStart - var1) * var9; - var3 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (var1 < Rasterizer2D_yClipStart) { // L: 292 + var8 += (Rasterizer2D_yClipStart - var1) * var9; // L: 293 + var3 -= Rasterizer2D_yClipStart - var1; // L: 294 + var1 = Rasterizer2D_yClipStart; // L: 295 } - if (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 297 var2 = Rasterizer2D_xClipEnd - var0; } - if (var3 + var1 > Rasterizer2D_yClipEnd) { + if (var3 + var1 > Rasterizer2D_yClipEnd) { // L: 298 var3 = Rasterizer2D_yClipEnd - var1; } - int var10 = Rasterizer2D_width - var2; - int var11 = var0 + Rasterizer2D_width * var1; + int var10 = Rasterizer2D_width - var2; // L: 299 + int var11 = var0 + Rasterizer2D_width * var1; // L: 300 - for (int var12 = -var3; var12 < 0; ++var12) { - int var13 = 65536 - var8 >> 8; - int var14 = var8 >> 8; - int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; - if (var15 == 0) { - var11 += Rasterizer2D_width; - var8 += var9; + for (int var12 = -var3; var12 < 0; ++var12) { // L: 301 + int var13 = 65536 - var8 >> 8; // L: 302 + int var14 = var8 >> 8; // L: 303 + int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8; // L: 304 + if (var15 == 0) { // L: 305 + var11 += Rasterizer2D_width; // L: 306 + var8 += var9; // L: 307 } else { - int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8; - int var17 = 255 - var15; - int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); + int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8; // L: 310 + int var17 = 255 - var15; // L: 311 + int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280); // L: 312 - for (int var19 = -var2; var19 < 0; ++var19) { - int var20 = Rasterizer2D_pixels[var11]; - if (var20 == 0) { - Rasterizer2D_pixels[var11++] = var18; + for (int var19 = -var2; var19 < 0; ++var19) { // L: 313 + int var20 = Rasterizer2D_pixels[var11]; // L: 314 + if (var20 == 0) { // L: 315 + Rasterizer2D_pixels[var11++] = var18; // L: 316 } else { - var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); - Rasterizer2D_pixels[var11++] = var18 + var20; + var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280); // L: 319 + Rasterizer2D_pixels[var11++] = var18 + var20; // L: 320 } } - var11 += var10; - var8 += var9; + var11 += var10; // L: 323 + var8 += var9; // L: 324 } } } - } + } // L: 326 - @ObfuscatedName("dz") + @ObfuscatedName("de") @ObfuscatedSignature( descriptor = "(IIIIII[BIZ)V", garbageValue = "1" ) @Export("Rasterizer2D_drawGradientPixels") public static void Rasterizer2D_drawGradientPixels(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { - if (var0 + var2 >= 0 && var3 + var1 >= 0) { - if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { - int var8 = 0; - int var9 = 0; - if (var0 < 0) { - var8 -= var0; - var2 += var0; + if (var0 + var2 >= 0 && var3 + var1 >= 0) { // L: 329 + if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { // L: 330 + int var8 = 0; // L: 331 + int var9 = 0; // L: 332 + if (var0 < 0) { // L: 333 + var8 -= var0; // L: 334 + var2 += var0; // L: 335 } - if (var1 < 0) { - var9 -= var1; - var3 += var1; + if (var1 < 0) { // L: 337 + var9 -= var1; // L: 338 + var3 += var1; // L: 339 } - if (var0 + var2 > Rasterizer2D_width) { - var2 = Rasterizer2D_width - var0; + if (var0 + var2 > Rasterizer2D_width) { // L: 341 + var2 = Rasterizer2D_width - var0; // L: 342 } - if (var3 + var1 > Rasterizer2D_height) { - var3 = Rasterizer2D_height - var1; + if (var3 + var1 > Rasterizer2D_height) { // L: 344 + var3 = Rasterizer2D_height - var1; // L: 345 } - int var10 = var6.length / var7; - int var11 = Rasterizer2D_width - var2; - int var12 = var4 >>> 24; - int var13 = var5 >>> 24; + int var10 = var6.length / var7; // L: 347 + int var11 = Rasterizer2D_width - var2; // L: 348 + int var12 = var4 >>> 24; // L: 349 + int var13 = var5 >>> 24; // L: 350 int var14; int var15; int var16; int var17; int var18; - if (var12 == 255 && var13 == 255) { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; + if (var12 == 255 && var13 == 255) { // L: 351 + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; // L: 352 - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; - if (var6[var18 + var17 * var7] != 0) { + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { // L: 353 + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { // L: 354 + var17 = (var15 - var1) % var10; // L: 355 + var18 = (var16 - var0) % var7; // L: 356 + if (var6[var18 + var17 * var7] != 0) { // L: 357 Rasterizer2D_pixels[var14++] = var5; } else { - Rasterizer2D_pixels[var14++] = var4; + Rasterizer2D_pixels[var14++] = var4; // L: 358 } } - var14 += var11; + var14 += var11; // L: 360 } } else { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; + var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; // L: 364 - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; - int var19 = var4; - if (var6[var18 + var17 * var7] != 0) { + for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { // L: 365 + for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { // L: 366 + var17 = (var15 - var1) % var10; // L: 367 + var18 = (var16 - var0) % var7; // L: 368 + int var19 = var4; // L: 369 + if (var6[var18 + var17 * var7] != 0) { // L: 370 var19 = var5; } - int var20 = var19 >>> 24; - int var21 = 255 - var20; - int var22 = Rasterizer2D_pixels[var14]; - int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; - Rasterizer2D_pixels[var14++] = var23; + int var20 = var19 >>> 24; // L: 371 + int var21 = 255 - var20; // L: 372 + int var22 = Rasterizer2D_pixels[var14]; // L: 373 + int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8; // L: 374 + Rasterizer2D_pixels[var14++] = var23; // L: 375 } - var14 += var11; + var14 += var11; // L: 377 } } } } - } + } // L: 380 - @ObfuscatedName("dq") + @ObfuscatedName("da") @Export("Rasterizer2D_drawRectangle") public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) { - Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); - Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); - Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); - Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); - } + Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4); // L: 383 + Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4); // L: 384 + Rasterizer2D_drawVerticalLine(var0, var1, var3, var4); // L: 385 + Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4); // L: 386 + } // L: 387 - @ObfuscatedName("dy") + @ObfuscatedName("dr") @Export("Rasterizer2D_drawRectangleAlpha") public static void Rasterizer2D_drawRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { - Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); - Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); - if (var3 >= 3) { - Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5); - Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5); + Rasterizer2D_drawHorizontalLineAlpha(var0, var1, var2, var4, var5); // L: 390 + Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5); // L: 391 + if (var3 >= 3) { // L: 392 + Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5); // L: 393 + Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5); // L: 394 } - } + } // L: 396 - @ObfuscatedName("du") + @ObfuscatedName("dw") @Export("Rasterizer2D_drawHorizontalLine") public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) { - if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 399 + if (var0 < Rasterizer2D_xClipStart) { // L: 400 + var2 -= Rasterizer2D_xClipStart - var0; // L: 401 + var0 = Rasterizer2D_xClipStart; // L: 402 } - if (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 404 var2 = Rasterizer2D_xClipEnd - var0; } - int var4 = var0 + Rasterizer2D_width * var1; + int var4 = var0 + Rasterizer2D_width * var1; // L: 405 - for (int var5 = 0; var5 < var2; ++var5) { + for (int var5 = 0; var5 < var2; ++var5) { // L: 406 Rasterizer2D_pixels[var4 + var5] = var3; } } - } + } // L: 407 - @ObfuscatedName("dj") + @ObfuscatedName("dy") @Export("Rasterizer2D_drawHorizontalLineAlpha") static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { - if (var0 < Rasterizer2D_xClipStart) { - var2 -= Rasterizer2D_xClipStart - var0; - var0 = Rasterizer2D_xClipStart; + if (var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) { // L: 410 + if (var0 < Rasterizer2D_xClipStart) { // L: 411 + var2 -= Rasterizer2D_xClipStart - var0; // L: 412 + var0 = Rasterizer2D_xClipStart; // L: 413 } - if (var0 + var2 > Rasterizer2D_xClipEnd) { + if (var0 + var2 > Rasterizer2D_xClipEnd) { // L: 415 var2 = Rasterizer2D_xClipEnd - var0; } - int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = var4 * (var3 & 255); - int var12 = var0 + Rasterizer2D_width * var1; + int var5 = 256 - var4; // L: 416 + int var6 = (var3 >> 16 & 255) * var4; // L: 417 + int var7 = (var3 >> 8 & 255) * var4; // L: 418 + int var8 = var4 * (var3 & 255); // L: 419 + int var12 = var0 + Rasterizer2D_width * var1; // L: 423 - for (int var13 = 0; var13 < var2; ++var13) { - int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); - int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; - int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); - int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); - Rasterizer2D_pixels[var12++] = var14; + for (int var13 = 0; var13 < var2; ++var13) { // L: 424 + int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); // L: 425 + int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; // L: 426 + int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); // L: 427 + int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 428 + Rasterizer2D_pixels[var12++] = var14; // L: 429 } } - } + } // L: 431 - @ObfuscatedName("ek") + @ObfuscatedName("ds") @Export("Rasterizer2D_drawVerticalLine") public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) { - if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { - if (var1 < Rasterizer2D_yClipStart) { - var2 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 434 + if (var1 < Rasterizer2D_yClipStart) { // L: 435 + var2 -= Rasterizer2D_yClipStart - var1; // L: 436 + var1 = Rasterizer2D_yClipStart; // L: 437 } - if (var2 + var1 > Rasterizer2D_yClipEnd) { + if (var2 + var1 > Rasterizer2D_yClipEnd) { // L: 439 var2 = Rasterizer2D_yClipEnd - var1; } - int var4 = var0 + Rasterizer2D_width * var1; + int var4 = var0 + Rasterizer2D_width * var1; // L: 440 - for (int var5 = 0; var5 < var2; ++var5) { + for (int var5 = 0; var5 < var2; ++var5) { // L: 441 Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3; } } - } + } // L: 442 - @ObfuscatedName("ej") + @ObfuscatedName("dl") @Export("Rasterizer2D_drawVerticalLineAlpha") static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) { - if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { - if (var1 < Rasterizer2D_yClipStart) { - var2 -= Rasterizer2D_yClipStart - var1; - var1 = Rasterizer2D_yClipStart; + if (var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) { // L: 445 + if (var1 < Rasterizer2D_yClipStart) { // L: 446 + var2 -= Rasterizer2D_yClipStart - var1; // L: 447 + var1 = Rasterizer2D_yClipStart; // L: 448 } - if (var2 + var1 > Rasterizer2D_yClipEnd) { + if (var2 + var1 > Rasterizer2D_yClipEnd) { // L: 450 var2 = Rasterizer2D_yClipEnd - var1; } - int var5 = 256 - var4; - int var6 = (var3 >> 16 & 255) * var4; - int var7 = (var3 >> 8 & 255) * var4; - int var8 = var4 * (var3 & 255); - int var12 = var0 + Rasterizer2D_width * var1; + int var5 = 256 - var4; // L: 451 + int var6 = (var3 >> 16 & 255) * var4; // L: 452 + int var7 = (var3 >> 8 & 255) * var4; // L: 453 + int var8 = var4 * (var3 & 255); // L: 454 + int var12 = var0 + Rasterizer2D_width * var1; // L: 458 - for (int var13 = 0; var13 < var2; ++var13) { - int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); - int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; - int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); - int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); - Rasterizer2D_pixels[var12] = var14; - var12 += Rasterizer2D_width; + for (int var13 = 0; var13 < var2; ++var13) { // L: 459 + int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255); // L: 460 + int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5; // L: 461 + int var11 = var5 * (Rasterizer2D_pixels[var12] & 255); // L: 462 + int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8); // L: 463 + Rasterizer2D_pixels[var12] = var14; // L: 464 + var12 += Rasterizer2D_width; // L: 465 } } - } + } // L: 467 - @ObfuscatedName("eu") + @ObfuscatedName("di") @Export("Rasterizer2D_drawLine") public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) { - var2 -= var0; - var3 -= var1; - if (var3 == 0) { - if (var2 >= 0) { + var2 -= var0; // L: 470 + var3 -= var1; // L: 471 + if (var3 == 0) { // L: 472 + if (var2 >= 0) { // L: 473 Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4); } else { - Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); + Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4); // L: 474 } - } else if (var2 == 0) { - if (var3 >= 0) { + } else if (var2 == 0) { // L: 477 + if (var3 >= 0) { // L: 478 Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4); } else { - Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); + Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4); // L: 479 } } else { - if (var3 + var2 < 0) { - var0 += var2; - var2 = -var2; - var1 += var3; - var3 = -var3; + if (var3 + var2 < 0) { // L: 482 + var0 += var2; // L: 483 + var2 = -var2; // L: 484 + var1 += var3; // L: 485 + var3 = -var3; // L: 486 } int var5; int var6; - if (var2 > var3) { - var1 <<= 16; - var1 += 32768; - var3 <<= 16; - var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D); - var2 += var0; - if (var0 < Rasterizer2D_xClipStart) { - var1 += var5 * (Rasterizer2D_xClipStart - var0); - var0 = Rasterizer2D_xClipStart; + if (var2 > var3) { // L: 488 + var1 <<= 16; // L: 489 + var1 += 32768; // L: 490 + var3 <<= 16; // L: 491 + var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D); // L: 492 + var2 += var0; // L: 493 + if (var0 < Rasterizer2D_xClipStart) { // L: 494 + var1 += var5 * (Rasterizer2D_xClipStart - var0); // L: 495 + var0 = Rasterizer2D_xClipStart; // L: 496 } - if (var2 >= Rasterizer2D_xClipEnd) { + if (var2 >= Rasterizer2D_xClipEnd) { // L: 498 var2 = Rasterizer2D_xClipEnd - 1; } - while (var0 <= var2) { - var6 = var1 >> 16; - if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { + while (var0 <= var2) { // L: 499 + var6 = var1 >> 16; // L: 500 + if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) { // L: 501 Rasterizer2D_pixels[var0 + var6 * Rasterizer2D_width] = var4; } - var1 += var5; - ++var0; + var1 += var5; // L: 502 + ++var0; // L: 503 } } else { - var0 <<= 16; - var0 += 32768; - var2 <<= 16; - var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D); - var3 += var1; - if (var1 < Rasterizer2D_yClipStart) { - var0 += (Rasterizer2D_yClipStart - var1) * var5; - var1 = Rasterizer2D_yClipStart; + var0 <<= 16; // L: 507 + var0 += 32768; // L: 508 + var2 <<= 16; // L: 509 + var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D); // L: 510 + var3 += var1; // L: 511 + if (var1 < Rasterizer2D_yClipStart) { // L: 512 + var0 += (Rasterizer2D_yClipStart - var1) * var5; // L: 513 + var1 = Rasterizer2D_yClipStart; // L: 514 } - if (var3 >= Rasterizer2D_yClipEnd) { + if (var3 >= Rasterizer2D_yClipEnd) { // L: 516 var3 = Rasterizer2D_yClipEnd - 1; } - while (var1 <= var3) { - var6 = var0 >> 16; - if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { + while (var1 <= var3) { // L: 517 + var6 = var0 >> 16; // L: 518 + if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) { // L: 519 Rasterizer2D_pixels[var6 + Rasterizer2D_width * var1] = var4; } - var0 += var5; - ++var1; + var0 += var5; // L: 520 + ++var1; // L: 521 } } } - } + } // L: 475 480 524 - @ObfuscatedName("eo") + @ObfuscatedName("do") @Export("Rasterizer2D_setPixel") static void Rasterizer2D_setPixel(int var0, int var1, int var2) { - if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { - Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; + if (var0 >= Rasterizer2D_xClipStart && var1 >= Rasterizer2D_yClipStart && var0 < Rasterizer2D_xClipEnd && var1 < Rasterizer2D_yClipEnd) { // L: 527 + Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2; // L: 528 } - } + } // L: 529 - @ObfuscatedName("es") + @ObfuscatedName("df") @Export("Rasterizer2D_fillMaskedRectangle") public static void Rasterizer2D_fillMaskedRectangle(int var0, int var1, int var2, int[] var3, int[] var4) { - int var5 = var0 + Rasterizer2D_width * var1; + int var5 = var0 + Rasterizer2D_width * var1; // L: 532 - for (var1 = 0; var1 < var3.length; ++var1) { - int var6 = var5 + var3[var1]; + for (var1 = 0; var1 < var3.length; ++var1) { // L: 533 + int var6 = var5 + var3[var1]; // L: 534 - for (var0 = -var4[var1]; var0 < 0; ++var0) { + for (var0 = -var4[var1]; var0 < 0; ++var0) { // L: 535 Rasterizer2D_pixels[var6++] = var2; } - var5 += Rasterizer2D_width; + var5 += Rasterizer2D_width; // L: 536 } - } + } // L: 538 } diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index c1e7e2798c..02f38d5663 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -6,770 +6,760 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("eq") @Implements("Rasterizer3D") public class Rasterizer3D extends Rasterizer2D { - @ObfuscatedName("m") - static boolean field1796; - @ObfuscatedName("o") - static boolean field1809; - @ObfuscatedName("q") + @ObfuscatedName("z") + static boolean field1791; + @ObfuscatedName("k") + static boolean field1808; + @ObfuscatedName("s") @Export("Rasterizer3D_isLowDetailTexture") static boolean Rasterizer3D_isLowDetailTexture; - @ObfuscatedName("j") - public static boolean field1789; - @ObfuscatedName("p") + @ObfuscatedName("t") + public static boolean field1788; + @ObfuscatedName("i") @Export("Rasterizer3D_alpha") static int Rasterizer3D_alpha; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("Rasterizer3D_zoom") public static int Rasterizer3D_zoom; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("Rasterizer3D_clipMidX") static int Rasterizer3D_clipMidX; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("Rasterizer3D_clipMidY") static int Rasterizer3D_clipMidY; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("Rasterizer3D_clipWidth") static int Rasterizer3D_clipWidth; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Rasterizer3D_clipHeight") static int Rasterizer3D_clipHeight; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("Rasterizer3D_clipNegativeMidX") static int Rasterizer3D_clipNegativeMidX; - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("Rasterizer3D_clipMidX2") static int Rasterizer3D_clipMidX2; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("Rasterizer3D_clipNegativeMidY") static int Rasterizer3D_clipNegativeMidY; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("Rasterizer3D_clipMidY2") static int Rasterizer3D_clipMidY2; - @ObfuscatedName("l") + @ObfuscatedName("r") @Export("Rasterizer3D_rowOffsets") static int[] Rasterizer3D_rowOffsets; - @ObfuscatedName("t") + @ObfuscatedName("u") @Export("Rasterizer3D_colorPalette") public static int[] Rasterizer3D_colorPalette; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "Ley;" ) @Export("Rasterizer3D_textureLoader") public static TextureLoader Rasterizer3D_textureLoader; @ObfuscatedName("b") - static int[] field1786; - @ObfuscatedName("i") - static int[] field1791; - @ObfuscatedName("f") + static int[] field1785; + @ObfuscatedName("l") + static int[] field1809; + @ObfuscatedName("e") @Export("Rasterizer3D_sine") public static int[] Rasterizer3D_sine; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @Export("Rasterizer3D_cosine") public static int[] Rasterizer3D_cosine; static { - field1796 = false; - field1809 = false; - Rasterizer3D_isLowDetailTexture = false; - field1789 = true; - Rasterizer3D_alpha = 0; - Rasterizer3D_zoom = 512; - Rasterizer3D_rowOffsets = new int[1024]; - Rasterizer3D_colorPalette = new int[65536]; - field1786 = new int[512]; - field1791 = new int[2048]; - Rasterizer3D_sine = new int[2048]; - Rasterizer3D_cosine = new int[2048]; + field1791 = false; // L: 8 + field1808 = false; // L: 9 + Rasterizer3D_isLowDetailTexture = false; // L: 10 + field1788 = true; // L: 11 + Rasterizer3D_alpha = 0; // L: 12 + Rasterizer3D_zoom = 512; // L: 19 + Rasterizer3D_rowOffsets = new int[1024]; // L: 28 + Rasterizer3D_colorPalette = new int[65536]; // L: 29 + field1785 = new int[512]; // L: 31 + field1809 = new int[2048]; // L: 32 + Rasterizer3D_sine = new int[2048]; // L: 33 + Rasterizer3D_cosine = new int[2048]; // L: 34 int var0; - for (var0 = 1; var0 < 512; ++var0) { - field1786[var0] = 32768 / var0; + for (var0 = 1; var0 < 512; ++var0) { // L: 37 + field1785[var0] = 32768 / var0; // L: 38 } - for (var0 = 1; var0 < 2048; ++var0) { - field1791[var0] = 65536 / var0; + for (var0 = 1; var0 < 2048; ++var0) { // L: 40 + field1809[var0] = 65536 / var0; // L: 41 } - for (var0 = 0; var0 < 2048; ++var0) { - Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D)); - Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D)); + for (var0 = 0; var0 < 2048; ++var0) { // L: 43 + Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D)); // L: 44 + Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D)); // L: 45 } - } + } // L: 47 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("Rasterizer3D_setClipFromRasterizer2D") public static final void Rasterizer3D_setClipFromRasterizer2D() { - Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); - } + Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd); // L: 54 + } // L: 55 - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("Rasterizer3D_setClip") static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) { - Rasterizer3D_clipWidth = var2 - var0; - Rasterizer3D_clipHeight = var3 - var1; - Rasterizer3D_method3(); - int var4; - int var5; - if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { - var5 = Rasterizer3D_clipHeight; - --var5; - var5 |= var5 >>> 1; - var5 |= var5 >>> 2; - var5 |= var5 >>> 4; - var5 |= var5 >>> 8; - var5 |= var5 >>> 16; - var4 = var5 + 1; - Rasterizer3D_rowOffsets = new int[var4]; + Rasterizer3D_clipWidth = var2 - var0; // L: 58 + Rasterizer3D_clipHeight = var3 - var1; // L: 59 + Rasterizer3D_method3(); // L: 60 + if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) { // L: 61 + Rasterizer3D_rowOffsets = new int[class297.method5378(Rasterizer3D_clipHeight)]; } - var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; + int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1; // L: 62 - for (var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { - Rasterizer3D_rowOffsets[var5] = var4; - var4 += Rasterizer2D.Rasterizer2D_width; + for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) { // L: 63 + Rasterizer3D_rowOffsets[var5] = var4; // L: 64 + var4 += Rasterizer2D.Rasterizer2D_width; // L: 65 } - } + } // L: 67 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Rasterizer3D_method3") public static final void Rasterizer3D_method3() { - Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; - Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; - } + Rasterizer3D_clipMidX = Rasterizer3D_clipWidth / 2; // L: 70 + Rasterizer3D_clipMidY = Rasterizer3D_clipHeight / 2; // L: 71 + Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 72 + Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 73 + Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 74 + Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 75 + } // L: 76 - @ObfuscatedName("j") - public static final void method3147(int var0, int var1) { - int var2 = Rasterizer3D_rowOffsets[0]; - int var3 = var2 / Rasterizer2D.Rasterizer2D_width; - int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; - Rasterizer3D_clipMidX = var0 - var4; - Rasterizer3D_clipMidY = var1 - var3; - Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; - Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; - Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; - Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; - } + @ObfuscatedName("t") + public static final void method3181(int var0, int var1) { + int var2 = Rasterizer3D_rowOffsets[0]; // L: 79 + int var3 = var2 / Rasterizer2D.Rasterizer2D_width; // L: 80 + int var4 = var2 - var3 * Rasterizer2D.Rasterizer2D_width; // L: 81 + Rasterizer3D_clipMidX = var0 - var4; // L: 82 + Rasterizer3D_clipMidY = var1 - var3; // L: 83 + Rasterizer3D_clipNegativeMidX = -Rasterizer3D_clipMidX; // L: 84 + Rasterizer3D_clipMidX2 = Rasterizer3D_clipWidth - Rasterizer3D_clipMidX; // L: 85 + Rasterizer3D_clipNegativeMidY = -Rasterizer3D_clipMidY; // L: 86 + Rasterizer3D_clipMidY2 = Rasterizer3D_clipHeight - Rasterizer3D_clipMidY; // L: 87 + } // L: 88 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(Ley;)V" ) @Export("Rasterizer3D_setTextureLoader") public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) { - Rasterizer3D_textureLoader = var0; - } + Rasterizer3D_textureLoader = var0; // L: 91 + } // L: 92 - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("Rasterizer3D_setBrightness") public static final void Rasterizer3D_setBrightness(double var0) { - Rasterizer3D_buildPalette(var0, 0, 512); - } + Rasterizer3D_buildPalette(var0, 0, 512); // L: 95 + } // L: 96 - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("Rasterizer3D_buildPalette") static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) { - int var4 = var2 * 128; + int var4 = var2 * 128; // L: 99 - for (int var5 = var2; var5 < var3; ++var5) { - double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; - double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; + for (int var5 = var2; var5 < var3; ++var5) { // L: 100 + double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D; // L: 101 + double var8 = (double)(var5 & 7) / 8.0D + 0.0625D; // L: 102 - for (int var10 = 0; var10 < 128; ++var10) { - double var11 = (double)var10 / 128.0D; - double var13 = var11; - double var15 = var11; - double var17 = var11; - if (var8 != 0.0D) { + for (int var10 = 0; var10 < 128; ++var10) { // L: 103 + double var11 = (double)var10 / 128.0D; // L: 104 + double var13 = var11; // L: 105 + double var15 = var11; // L: 106 + double var17 = var11; // L: 107 + if (var8 != 0.0D) { // L: 108 double var19; - if (var11 < 0.5D) { + if (var11 < 0.5D) { // L: 110 var19 = var11 * (1.0D + var8); } else { - var19 = var11 + var8 - var11 * var8; + var19 = var11 + var8 - var11 * var8; // L: 111 } - double var21 = 2.0D * var11 - var19; - double var23 = var6 + 0.3333333333333333D; - if (var23 > 1.0D) { + double var21 = 2.0D * var11 - var19; // L: 112 + double var23 = var6 + 0.3333333333333333D; // L: 113 + if (var23 > 1.0D) { // L: 114 --var23; } - double var27 = var6 - 0.3333333333333333D; - if (var27 < 0.0D) { + double var27 = var6 - 0.3333333333333333D; // L: 116 + if (var27 < 0.0D) { // L: 117 ++var27; } - if (6.0D * var23 < 1.0D) { + if (6.0D * var23 < 1.0D) { // L: 118 var13 = var21 + (var19 - var21) * 6.0D * var23; - } else if (2.0D * var23 < 1.0D) { + } else if (2.0D * var23 < 1.0D) { // L: 119 var13 = var19; - } else if (3.0D * var23 < 2.0D) { + } else if (3.0D * var23 < 2.0D) { // L: 120 var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D; } else { - var13 = var21; + var13 = var21; // L: 121 } - if (6.0D * var6 < 1.0D) { + if (6.0D * var6 < 1.0D) { // L: 122 var15 = var21 + (var19 - var21) * 6.0D * var6; - } else if (2.0D * var6 < 1.0D) { + } else if (2.0D * var6 < 1.0D) { // L: 123 var15 = var19; - } else if (3.0D * var6 < 2.0D) { + } else if (3.0D * var6 < 2.0D) { // L: 124 var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D; } else { - var15 = var21; + var15 = var21; // L: 125 } - if (6.0D * var27 < 1.0D) { + if (6.0D * var27 < 1.0D) { // L: 126 var17 = var21 + (var19 - var21) * 6.0D * var27; - } else if (2.0D * var27 < 1.0D) { + } else if (2.0D * var27 < 1.0D) { // L: 127 var17 = var19; - } else if (3.0D * var27 < 2.0D) { + } else if (3.0D * var27 < 2.0D) { // L: 128 var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D; } else { - var17 = var21; + var17 = var21; // L: 129 } } - int var29 = (int)(var13 * 256.0D); - int var20 = (int)(var15 * 256.0D); - int var30 = (int)(var17 * 256.0D); - int var22 = var30 + (var20 << 8) + (var29 << 16); - var22 = Rasterizer3D_brighten(var22, var0); - if (var22 == 0) { + int var29 = (int)(var13 * 256.0D); // L: 131 + int var20 = (int)(var15 * 256.0D); // L: 132 + int var30 = (int)(var17 * 256.0D); // L: 133 + int var22 = var30 + (var20 << 8) + (var29 << 16); // L: 134 + var22 = Rasterizer3D_brighten(var22, var0); // L: 135 + if (var22 == 0) { // L: 136 var22 = 1; } - Rasterizer3D_colorPalette[var4++] = var22; + Rasterizer3D_colorPalette[var4++] = var22; // L: 137 } } - } + } // L: 140 - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("Rasterizer3D_brighten") static int Rasterizer3D_brighten(int var0, double var1) { - double var3 = (double)(var0 >> 16) / 256.0D; - double var5 = (double)(var0 >> 8 & 255) / 256.0D; - double var7 = (double)(var0 & 255) / 256.0D; - var3 = Math.pow(var3, var1); - var5 = Math.pow(var5, var1); - var7 = Math.pow(var7, var1); - int var9 = (int)(var3 * 256.0D); - int var10 = (int)(var5 * 256.0D); - int var11 = (int)(var7 * 256.0D); - return var11 + (var10 << 8) + (var9 << 16); + double var3 = (double)(var0 >> 16) / 256.0D; // L: 143 + double var5 = (double)(var0 >> 8 & 255) / 256.0D; // L: 144 + double var7 = (double)(var0 & 255) / 256.0D; // L: 145 + var3 = Math.pow(var3, var1); // L: 146 + var5 = Math.pow(var5, var1); // L: 147 + var7 = Math.pow(var7, var1); // L: 148 + int var9 = (int)(var3 * 256.0D); // L: 149 + int var10 = (int)(var5 * 256.0D); // L: 150 + int var11 = (int)(var7 * 256.0D); // L: 151 + return var11 + (var10 << 8) + (var9 << 16); // L: 152 } - @ObfuscatedName("a") - public static void method3144(int var0, int var1, int var2) { - field1796 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; - } + @ObfuscatedName("g") + public static void method3120(int var0, int var1, int var2) { + field1791 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth; // L: 156 + } // L: 157 - @ObfuscatedName("z") - static final void method3122(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = var4 - var3; - int var10 = var1 - var0; - int var11 = var5 - var3; - int var12 = var2 - var0; - int var13 = var7 - var6; - int var14 = var8 - var6; + @ObfuscatedName("m") + static final void method3117(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + int var9 = var4 - var3; // L: 160 + int var10 = var1 - var0; // L: 161 + int var11 = var5 - var3; // L: 162 + int var12 = var2 - var0; // L: 163 + int var13 = var7 - var6; // L: 164 + int var14 = var8 - var6; // L: 165 int var15; - if (var2 != var1) { + if (var2 != var1) { // L: 167 var15 = (var5 - var4 << 14) / (var2 - var1); } else { - var15 = 0; + var15 = 0; // L: 168 } int var16; - if (var0 != var1) { + if (var0 != var1) { // L: 170 var16 = (var9 << 14) / var10; } else { - var16 = 0; + var16 = 0; // L: 171 } int var17; - if (var0 != var2) { + if (var0 != var2) { // L: 173 var17 = (var11 << 14) / var12; } else { - var17 = 0; + var17 = 0; // L: 174 } - int var18 = var9 * var12 - var11 * var10; - if (var18 != 0) { - int var19 = (var13 * var12 - var14 * var10 << 8) / var18; - int var20 = (var14 * var9 - var13 * var11 << 8) / var18; - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + int var18 = var9 * var12 - var11 * var10; // L: 175 + if (var18 != 0) { // L: 176 + int var19 = (var13 * var12 - var14 * var10 << 8) / var18; // L: 177 + int var20 = (var14 * var9 - var13 * var11 << 8) / var18; // L: 178 + if (var0 <= var1 && var0 <= var2) { // L: 179 + if (var0 < Rasterizer3D_clipHeight) { // L: 180 + if (var1 > Rasterizer3D_clipHeight) { // L: 181 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 182 var2 = Rasterizer3D_clipHeight; } - var6 = var19 + ((var6 << 8) - var3 * var19); - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var17; - var3 -= var0 * var16; - var6 -= var0 * var20; - var0 = 0; + var6 = var19 + ((var6 << 8) - var3 * var19); // L: 183 + if (var1 < var2) { // L: 184 + var5 = var3 <<= 14; // L: 185 + if (var0 < 0) { // L: 186 + var5 -= var0 * var17; // L: 187 + var3 -= var0 * var16; // L: 188 + var6 -= var0 * var20; // L: 189 + var0 = 0; // L: 190 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var15 * var1; - var1 = 0; + var4 <<= 14; // L: 192 + if (var1 < 0) { // L: 193 + var4 -= var15 * var1; // L: 194 + var1 = 0; // L: 195 } - if (var0 != var1 && var17 < var16 || var0 == var1 && var17 > var15) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + if ((var0 == var1 || var17 >= var16) && (var0 != var1 || var17 <= var15)) { // L: 197 + var2 -= var1; // L: 218 + var1 -= var0; // L: 219 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 220 while (true) { - --var1; + --var1; // L: 221 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 228 if (var2 < 0) { - return; + return; // L: 235 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); - var5 += var17; - var4 += var15; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); // L: 229 + var5 += var17; // L: 230 + var4 += var15; // L: 231 + var6 += var20; // L: 232 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 233 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); - var5 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 222 + var5 += var17; // L: 223 + var3 += var16; // L: 224 + var6 += var20; // L: 225 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 226 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 198 + var1 -= var0; // L: 199 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 200 while (true) { - --var1; + --var1; // L: 201 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 208 if (var2 < 0) { - return; + return; // L: 215 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19); - var5 += var17; - var4 += var15; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); // L: 209 + var5 += var17; // L: 210 + var4 += var15; // L: 211 + var6 += var20; // L: 212 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 213 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); - var5 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 202 + var5 += var17; // L: 203 + var3 += var16; // L: 204 + var6 += var20; // L: 205 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 206 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var17; - var3 -= var0 * var16; - var6 -= var0 * var20; - var0 = 0; + var4 = var3 <<= 14; // L: 239 + if (var0 < 0) { // L: 240 + var4 -= var0 * var17; // L: 241 + var3 -= var0 * var16; // L: 242 + var6 -= var0 * var20; // L: 243 + var0 = 0; // L: 244 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var15 * var2; - var2 = 0; + var5 <<= 14; // L: 246 + if (var2 < 0) { // L: 247 + var5 -= var15 * var2; // L: 248 + var2 = 0; // L: 249 } - if ((var0 == var2 || var17 >= var16) && (var0 != var2 || var15 <= var16)) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { // L: 251 + var1 -= var2; // L: 252 + var2 -= var0; // L: 253 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 254 while (true) { - --var2; + --var2; // L: 255 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 262 if (var1 < 0) { - return; + return; // L: 269 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); - var5 += var15; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); // L: 263 + var5 += var15; // L: 264 + var3 += var16; // L: 265 + var6 += var20; // L: 266 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 267 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); // L: 256 + var4 += var17; // L: 257 + var3 += var16; // L: 258 + var6 += var20; // L: 259 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 260 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 272 + var2 -= var0; // L: 273 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 274 while (true) { - --var2; + --var2; // L: 275 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 282 if (var1 < 0) { - return; + return; // L: 289 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); - var5 += var15; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); // L: 283 + var5 += var15; // L: 284 + var3 += var16; // L: 285 + var6 += var20; // L: 286 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 287 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); // L: 276 + var4 += var17; // L: 277 + var3 += var16; // L: 278 + var6 += var20; // L: 279 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 280 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 293 + if (var1 < Rasterizer3D_clipHeight) { // L: 294 + if (var2 > Rasterizer3D_clipHeight) { // L: 295 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 296 var0 = Rasterizer3D_clipHeight; } - var7 = var19 + ((var7 << 8) - var19 * var4); - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var16 * var1; - var4 -= var15 * var1; - var7 -= var20 * var1; - var1 = 0; + var7 = var19 + ((var7 << 8) - var19 * var4); // L: 297 + if (var2 < var0) { // L: 298 + var3 = var4 <<= 14; // L: 299 + if (var1 < 0) { // L: 300 + var3 -= var16 * var1; // L: 301 + var4 -= var15 * var1; // L: 302 + var7 -= var20 * var1; // L: 303 + var1 = 0; // L: 304 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var17 * var2; - var2 = 0; + var5 <<= 14; // L: 306 + if (var2 < 0) { // L: 307 + var5 -= var17 * var2; // L: 308 + var2 = 0; // L: 309 } - if (var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if ((var2 == var1 || var16 >= var15) && (var2 != var1 || var16 <= var17)) { // L: 311 + var0 -= var2; // L: 332 + var2 -= var1; // L: 333 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 334 while (true) { - --var2; + --var2; // L: 335 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 342 if (var0 < 0) { - return; + return; // L: 349 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); - var3 += var16; - var5 += var17; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); // L: 343 + var3 += var16; // L: 344 + var5 += var17; // L: 345 + var7 += var20; // L: 346 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 347 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); - var3 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 336 + var3 += var16; // L: 337 + var4 += var15; // L: 338 + var7 += var20; // L: 339 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 340 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 312 + var2 -= var1; // L: 313 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 314 while (true) { - --var2; + --var2; // L: 315 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 322 if (var0 < 0) { - return; + return; // L: 329 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19); - var3 += var16; - var5 += var17; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); // L: 323 + var3 += var16; // L: 324 + var5 += var17; // L: 325 + var7 += var20; // L: 326 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 327 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); - var3 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 316 + var3 += var16; // L: 317 + var4 += var15; // L: 318 + var7 += var20; // L: 319 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 320 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var16 * var1; - var4 -= var15 * var1; - var7 -= var20 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 353 + if (var1 < 0) { // L: 354 + var5 -= var16 * var1; // L: 355 + var4 -= var15 * var1; // L: 356 + var7 -= var20 * var1; // L: 357 + var1 = 0; // L: 358 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var17; - var0 = 0; + var3 <<= 14; // L: 360 + if (var0 < 0) { // L: 361 + var3 -= var0 * var17; // L: 362 + var0 = 0; // L: 363 } - if (var16 < var15) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if (var16 < var15) { // L: 365 + var2 -= var0; // L: 366 + var0 -= var1; // L: 367 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 368 while (true) { - --var0; + --var0; // L: 369 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 376 if (var2 < 0) { - return; + return; // L: 383 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); - var3 += var17; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); // L: 377 + var3 += var17; // L: 378 + var4 += var15; // L: 379 + var7 += var20; // L: 380 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 381 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); // L: 370 + var5 += var16; // L: 371 + var4 += var15; // L: 372 + var7 += var20; // L: 373 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 374 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 386 + var0 -= var1; // L: 387 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 388 while (true) { - --var0; + --var0; // L: 389 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 396 if (var2 < 0) { - return; + return; // L: 403 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); - var3 += var17; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); // L: 397 + var3 += var17; // L: 398 + var4 += var15; // L: 399 + var7 += var20; // L: 400 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 401 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); // L: 390 + var5 += var16; // L: 391 + var4 += var15; // L: 392 + var7 += var20; // L: 393 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 394 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 408 + if (var0 > Rasterizer3D_clipHeight) { // L: 409 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 410 var1 = Rasterizer3D_clipHeight; } - var8 = var19 + ((var8 << 8) - var5 * var19); - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var15 * var2; - var5 -= var17 * var2; - var8 -= var20 * var2; - var2 = 0; + var8 = var19 + ((var8 << 8) - var5 * var19); // L: 411 + if (var0 < var1) { // L: 412 + var4 = var5 <<= 14; // L: 413 + if (var2 < 0) { // L: 414 + var4 -= var15 * var2; // L: 415 + var5 -= var17 * var2; // L: 416 + var8 -= var20 * var2; // L: 417 + var2 = 0; // L: 418 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var16; - var0 = 0; + var3 <<= 14; // L: 420 + if (var0 < 0) { // L: 421 + var3 -= var0 * var16; // L: 422 + var0 = 0; // L: 423 } - if (var15 < var17) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var15 < var17) { // L: 425 + var1 -= var0; // L: 426 + var0 -= var2; // L: 427 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 428 while (true) { - --var0; + --var0; // L: 429 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 436 if (var1 < 0) { - return; + return; // L: 443 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); - var4 += var15; - var3 += var16; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var3 >> 14, var8, var19); // L: 437 + var4 += var15; // L: 438 + var3 += var16; // L: 439 + var8 += var20; // L: 440 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 441 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); - var4 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 430 + var4 += var15; // L: 431 + var5 += var17; // L: 432 + var8 += var20; // L: 433 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 434 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 446 + var0 -= var2; // L: 447 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 448 while (true) { - --var0; + --var0; // L: 449 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 456 if (var1 < 0) { - return; + return; // L: 463 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); - var4 += var15; - var3 += var16; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); // L: 457 + var4 += var15; // L: 458 + var3 += var16; // L: 459 + var8 += var20; // L: 460 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 461 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); - var4 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 450 + var4 += var15; // L: 451 + var5 += var17; // L: 452 + var8 += var20; // L: 453 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 454 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var15 * var2; - var5 -= var17 * var2; - var8 -= var20 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 467 + if (var2 < 0) { // L: 468 + var3 -= var15 * var2; // L: 469 + var5 -= var17 * var2; // L: 470 + var8 -= var20 * var2; // L: 471 + var2 = 0; // L: 472 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var16 * var1; - var1 = 0; + var4 <<= 14; // L: 474 + if (var1 < 0) { // L: 475 + var4 -= var16 * var1; // L: 476 + var1 = 0; // L: 477 } - if (var15 < var17) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var15 < var17) { // L: 479 + var0 -= var1; // L: 480 + var1 -= var2; // L: 481 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 482 while (true) { - --var1; + --var1; // L: 483 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 490 if (var0 < 0) { - return; + return; // L: 497 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); - var4 += var16; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); // L: 491 + var4 += var16; // L: 492 + var5 += var17; // L: 493 + var8 += var20; // L: 494 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 495 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); // L: 484 + var3 += var15; // L: 485 + var5 += var17; // L: 486 + var8 += var20; // L: 487 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 488 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 500 + var1 -= var2; // L: 501 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 502 while (true) { - --var1; + --var1; // L: 503 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 510 if (var0 < 0) { - return; + return; // L: 517 } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); - var4 += var16; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); // L: 511 + var4 += var16; // L: 512 + var5 += var17; // L: 513 + var8 += var20; // L: 514 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 515 } } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); // L: 504 + var3 += var15; // L: 505 + var5 += var17; // L: 506 + var8 += var20; // L: 507 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 508 } } } @@ -777,1298 +767,1298 @@ public class Rasterizer3D extends Rasterizer2D { } } - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("Rasterizer3D_vertAlpha") static final void Rasterizer3D_vertAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (field1796) { - if (var5 > Rasterizer3D_clipWidth) { + if (field1791) { // L: 524 + if (var5 > Rasterizer3D_clipWidth) { // L: 525 var5 = Rasterizer3D_clipWidth; } - if (var4 < 0) { + if (var4 < 0) { // L: 526 var4 = 0; } } - if (var4 < var5) { - var1 += var4; - var6 += var4 * var7; + if (var4 < var5) { // L: 528 + var1 += var4; // L: 529 + var6 += var4 * var7; // L: 530 int var8; int var9; int var10; - if (field1789) { - var3 = var5 - var4 >> 2; - var7 <<= 2; - if (Rasterizer3D_alpha == 0) { - if (var3 > 0) { + if (field1788) { // L: 531 + var3 = var5 - var4 >> 2; // L: 532 + var7 <<= 2; // L: 533 + if (Rasterizer3D_alpha == 0) { // L: 534 + if (var3 > 0) { // L: 535 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; - var6 += var7; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - --var3; + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 537 + var6 += var7; // L: 538 + var0[var1++] = var2; // L: 539 + var0[var1++] = var2; // L: 540 + var0[var1++] = var2; // L: 541 + var0[var1++] = var2; // L: 542 + --var3; // L: 543 } while(var3 > 0); } - var3 = var5 - var4 & 3; - if (var3 > 0) { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; + var3 = var5 - var4 & 3; // L: 545 + if (var3 > 0) { // L: 546 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 547 do { - var0[var1++] = var2; - --var3; + var0[var1++] = var2; // L: 549 + --var3; // L: 550 } while(var3 > 0); } } else { - var8 = Rasterizer3D_alpha; - var9 = 256 - Rasterizer3D_alpha; - if (var3 > 0) { + var8 = Rasterizer3D_alpha; // L: 554 + var9 = 256 - Rasterizer3D_alpha; // L: 555 + if (var3 > 0) { // L: 556 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; - var6 += var7; - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - --var3; + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 558 + var6 += var7; // L: 559 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 560 + var10 = var0[var1]; // L: 561 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 562 + var10 = var0[var1]; // L: 563 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 564 + var10 = var0[var1]; // L: 565 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 566 + var10 = var0[var1]; // L: 567 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 568 + --var3; // L: 569 } while(var3 > 0); } - var3 = var5 - var4 & 3; - if (var3 > 0) { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); + var3 = var5 - var4 & 3; // L: 571 + if (var3 > 0) { // L: 572 + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 573 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 574 do { - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - --var3; + var10 = var0[var1]; // L: 576 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 577 + --var3; // L: 578 } while(var3 > 0); } } } else { - var3 = var5 - var4; - if (Rasterizer3D_alpha == 0) { + var3 = var5 - var4; // L: 584 + if (Rasterizer3D_alpha == 0) { // L: 585 do { - var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; - var6 += var7; - --var3; + var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8]; // L: 587 + var6 += var7; // L: 588 + --var3; // L: 589 } while(var3 > 0); } else { - var8 = Rasterizer3D_alpha; - var9 = 256 - Rasterizer3D_alpha; + var8 = Rasterizer3D_alpha; // L: 592 + var9 = 256 - Rasterizer3D_alpha; // L: 593 do { - var2 = Rasterizer3D_colorPalette[var6 >> 8]; - var6 += var7; - var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); - var10 = var0[var1]; - var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); - --var3; + var2 = Rasterizer3D_colorPalette[var6 >> 8]; // L: 595 + var6 += var7; // L: 596 + var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935); // L: 597 + var10 = var0[var1]; // L: 598 + var0[var1++] = ((var10 & 16711935) * var8 >> 8 & 16711935) + var2 + (var8 * (var10 & 65280) >> 8 & 65280); // L: 599 + --var3; // L: 600 } while(var3 > 0); } } } - } + } // L: 581 602 - @ObfuscatedName("y") - public static final void method3124(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - int var7 = 0; - if (var0 != var1) { + @ObfuscatedName("d") + public static final void method3172(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = 0; // L: 607 + if (var0 != var1) { // L: 608 var7 = (var4 - var3 << 14) / (var1 - var0); } - int var8 = 0; - if (var2 != var1) { + int var8 = 0; // L: 609 + if (var2 != var1) { // L: 610 var8 = (var5 - var4 << 14) / (var2 - var1); } - int var9 = 0; - if (var0 != var2) { + int var9 = 0; // L: 611 + if (var0 != var2) { // L: 612 var9 = (var3 - var5 << 14) / (var0 - var2); } - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { // L: 613 + if (var0 < Rasterizer3D_clipHeight) { // L: 614 + if (var1 > Rasterizer3D_clipHeight) { // L: 615 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 616 var2 = Rasterizer3D_clipHeight; } - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var9; - var3 -= var0 * var7; - var0 = 0; + if (var1 < var2) { // L: 617 + var5 = var3 <<= 14; // L: 618 + if (var0 < 0) { // L: 619 + var5 -= var0 * var9; // L: 620 + var3 -= var0 * var7; // L: 621 + var0 = 0; // L: 622 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var8 * var1; - var1 = 0; + var4 <<= 14; // L: 624 + if (var1 < 0) { // L: 625 + var4 -= var8 * var1; // L: 626 + var1 = 0; // L: 627 } - if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + if (var0 != var1 && var9 < var7 || var0 == var1 && var9 > var8) { // L: 629 + var2 -= var1; // L: 630 + var1 -= var0; // L: 631 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 632 while (true) { - --var1; + --var1; // L: 633 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 639 if (var2 < 0) { - return; + return; // L: 645 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); - var5 += var9; - var4 += var8; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14); // L: 640 + var5 += var9; // L: 641 + var4 += var8; // L: 642 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 643 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); - var5 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 634 + var5 += var9; // L: 635 + var3 += var7; // L: 636 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 637 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 648 + var1 -= var0; // L: 649 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 650 while (true) { - --var1; + --var1; // L: 651 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 657 if (var2 < 0) { - return; + return; // L: 663 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); - var5 += var9; - var4 += var8; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); // L: 658 + var5 += var9; // L: 659 + var4 += var8; // L: 660 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 661 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 652 + var5 += var9; // L: 653 + var3 += var7; // L: 654 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 655 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var9; - var3 -= var0 * var7; - var0 = 0; + var4 = var3 <<= 14; // L: 667 + if (var0 < 0) { // L: 668 + var4 -= var0 * var9; // L: 669 + var3 -= var0 * var7; // L: 670 + var0 = 0; // L: 671 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var8 * var2; - var2 = 0; + var5 <<= 14; // L: 673 + if (var2 < 0) { // L: 674 + var5 -= var8 * var2; // L: 675 + var2 = 0; // L: 676 } - if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { // L: 678 + var1 -= var2; // L: 697 + var2 -= var0; // L: 698 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 699 while (true) { - --var2; + --var2; // L: 700 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 706 if (var1 < 0) { - return; + return; // L: 712 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); - var5 += var8; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); // L: 707 + var5 += var8; // L: 708 + var3 += var7; // L: 709 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 710 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); // L: 701 + var4 += var9; // L: 702 + var3 += var7; // L: 703 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 704 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 679 + var2 -= var0; // L: 680 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 681 while (true) { - --var2; + --var2; // L: 682 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 688 if (var1 < 0) { - return; + return; // L: 694 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var8; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); // L: 689 + var5 += var8; // L: 690 + var3 += var7; // L: 691 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 692 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); // L: 683 + var4 += var9; // L: 684 + var3 += var7; // L: 685 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 686 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 716 + if (var1 < Rasterizer3D_clipHeight) { // L: 717 + if (var2 > Rasterizer3D_clipHeight) { // L: 718 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 719 var0 = Rasterizer3D_clipHeight; } - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var7 * var1; - var4 -= var8 * var1; - var1 = 0; + if (var2 < var0) { // L: 720 + var3 = var4 <<= 14; // L: 721 + if (var1 < 0) { // L: 722 + var3 -= var7 * var1; // L: 723 + var4 -= var8 * var1; // L: 724 + var1 = 0; // L: 725 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var9 * var2; - var2 = 0; + var5 <<= 14; // L: 727 + if (var2 < 0) { // L: 728 + var5 -= var9 * var2; // L: 729 + var2 = 0; // L: 730 } - if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if (var2 != var1 && var7 < var8 || var2 == var1 && var7 > var9) { // L: 732 + var0 -= var2; // L: 733 + var2 -= var1; // L: 734 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 735 while (true) { - --var2; + --var2; // L: 736 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 742 if (var0 < 0) { - return; + return; // L: 748 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); - var3 += var7; - var5 += var9; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14); // L: 743 + var3 += var7; // L: 744 + var5 += var9; // L: 745 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 746 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); - var3 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 737 + var3 += var7; // L: 738 + var4 += var8; // L: 739 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 740 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 751 + var2 -= var1; // L: 752 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 753 while (true) { - --var2; + --var2; // L: 754 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 760 if (var0 < 0) { - return; + return; // L: 766 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); - var3 += var7; - var5 += var9; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); // L: 761 + var3 += var7; // L: 762 + var5 += var9; // L: 763 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 764 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); - var3 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 755 + var3 += var7; // L: 756 + var4 += var8; // L: 757 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 758 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var7 * var1; - var4 -= var8 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 770 + if (var1 < 0) { // L: 771 + var5 -= var7 * var1; // L: 772 + var4 -= var8 * var1; // L: 773 + var1 = 0; // L: 774 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var9; - var0 = 0; + var3 <<= 14; // L: 776 + if (var0 < 0) { // L: 777 + var3 -= var0 * var9; // L: 778 + var0 = 0; // L: 779 } - if (var7 < var8) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + if (var7 < var8) { // L: 781 + var2 -= var0; // L: 782 + var0 -= var1; // L: 783 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 784 while (true) { - --var0; + --var0; // L: 785 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 791 if (var2 < 0) { - return; + return; // L: 797 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); - var3 += var9; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); // L: 792 + var3 += var9; // L: 793 + var4 += var8; // L: 794 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 795 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); // L: 786 + var5 += var7; // L: 787 + var4 += var8; // L: 788 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 789 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 800 + var0 -= var1; // L: 801 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 802 while (true) { - --var0; + --var0; // L: 803 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 809 if (var2 < 0) { - return; + return; // L: 815 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); - var3 += var9; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); // L: 810 + var3 += var9; // L: 811 + var4 += var8; // L: 812 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 813 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); // L: 804 + var5 += var7; // L: 805 + var4 += var8; // L: 806 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 807 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 820 + if (var0 > Rasterizer3D_clipHeight) { // L: 821 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 822 var1 = Rasterizer3D_clipHeight; } - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var8 * var2; - var5 -= var9 * var2; - var2 = 0; + if (var0 < var1) { // L: 823 + var4 = var5 <<= 14; // L: 824 + if (var2 < 0) { // L: 825 + var4 -= var8 * var2; // L: 826 + var5 -= var9 * var2; // L: 827 + var2 = 0; // L: 828 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var7; - var0 = 0; + var3 <<= 14; // L: 830 + if (var0 < 0) { // L: 831 + var3 -= var0 * var7; // L: 832 + var0 = 0; // L: 833 } - if (var8 < var9) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var8 < var9) { // L: 835 + var1 -= var0; // L: 836 + var0 -= var2; // L: 837 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 838 while (true) { - --var0; + --var0; // L: 839 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 845 if (var1 < 0) { - return; + return; // L: 851 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); - var4 += var8; - var3 += var7; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var3 >> 14); // L: 846 + var4 += var8; // L: 847 + var3 += var7; // L: 848 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 849 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); - var4 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 840 + var4 += var8; // L: 841 + var5 += var9; // L: 842 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 843 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 854 + var0 -= var2; // L: 855 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 856 while (true) { - --var0; + --var0; // L: 857 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 863 if (var1 < 0) { - return; + return; // L: 869 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); - var4 += var8; - var3 += var7; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); // L: 864 + var4 += var8; // L: 865 + var3 += var7; // L: 866 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 867 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); - var4 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 858 + var4 += var8; // L: 859 + var5 += var9; // L: 860 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 861 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var8 * var2; - var5 -= var9 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 873 + if (var2 < 0) { // L: 874 + var3 -= var8 * var2; // L: 875 + var5 -= var9 * var2; // L: 876 + var2 = 0; // L: 877 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var7 * var1; - var1 = 0; + var4 <<= 14; // L: 879 + if (var1 < 0) { // L: 880 + var4 -= var7 * var1; // L: 881 + var1 = 0; // L: 882 } - if (var8 < var9) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + if (var8 < var9) { // L: 884 + var0 -= var1; // L: 885 + var1 -= var2; // L: 886 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 887 while (true) { - --var1; + --var1; // L: 888 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 894 if (var0 < 0) { - return; + return; // L: 900 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); - var4 += var7; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); // L: 895 + var4 += var7; // L: 896 + var5 += var9; // L: 897 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 898 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); // L: 889 + var3 += var8; // L: 890 + var5 += var9; // L: 891 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 892 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 903 + var1 -= var2; // L: 904 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 905 while (true) { - --var1; + --var1; // L: 906 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 912 if (var0 < 0) { - return; + return; // L: 918 } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); - var4 += var7; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); // L: 913 + var4 += var7; // L: 914 + var5 += var9; // L: 915 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 916 } } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); // L: 907 + var3 += var8; // L: 908 + var5 += var9; // L: 909 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 910 } } } } } - @ObfuscatedName("c") - @Export("Rasterizer3D_horizAlpha") - static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { - if (field1796) { - if (var5 > Rasterizer3D_clipWidth) { - var5 = Rasterizer3D_clipWidth; - } - - if (var4 < 0) { - var4 = 0; - } - } - - if (var4 < var5) { - var1 += var4; - var3 = var5 - var4 >> 2; - if (Rasterizer3D_alpha != 0) { - if (Rasterizer3D_alpha == 254) { - while (true) { - --var3; - if (var3 < 0) { - var3 = var5 - var4 & 3; - - while (true) { - --var3; - if (var3 < 0) { - return; - } - - var0[var1++] = var0[var1]; - } - } - - var0[var1++] = var0[var1]; - var0[var1++] = var0[var1]; - var0[var1++] = var0[var1]; - var0[var1++] = var0[var1]; - } - } else { - int var6 = Rasterizer3D_alpha; - int var7 = 256 - Rasterizer3D_alpha; - var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); - - while (true) { - --var3; - int var8; - if (var3 < 0) { - var3 = var5 - var4 & 3; - - while (true) { - --var3; - if (var3 < 0) { - return; - } - - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - } - } - - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - } - } - } else { - while (true) { - --var3; - if (var3 < 0) { - var3 = var5 - var4 & 3; - - while (true) { - --var3; - if (var3 < 0) { - return; - } - - var0[var1++] = var2; - } - } - - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - } - } - } - } - @ObfuscatedName("h") - static final void method3126(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { - int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); + @Export("Rasterizer3D_horizAlpha") + static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) { + if (field1791) { // L: 925 + if (var5 > Rasterizer3D_clipWidth) { // L: 926 + var5 = Rasterizer3D_clipWidth; + } + + if (var4 < 0) { // L: 927 + var4 = 0; + } + } + + if (var4 < var5) { // L: 929 + var1 += var4; // L: 930 + var3 = var5 - var4 >> 2; // L: 931 + if (Rasterizer3D_alpha != 0) { // L: 932 + if (Rasterizer3D_alpha == 254) { // L: 944 + while (true) { + --var3; // L: 945 + if (var3 < 0) { + var3 = var5 - var4 & 3; // L: 951 + + while (true) { + --var3; // L: 952 + if (var3 < 0) { + return; // L: 976 + } + + var0[var1++] = var0[var1]; // L: 953 + } + } + + var0[var1++] = var0[var1]; // L: 946 + var0[var1++] = var0[var1]; // L: 947 + var0[var1++] = var0[var1]; // L: 948 + var0[var1++] = var0[var1]; // L: 949 + } + } else { + int var6 = Rasterizer3D_alpha; // L: 957 + int var7 = 256 - Rasterizer3D_alpha; // L: 958 + var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); // L: 959 + + while (true) { + --var3; // L: 960 + int var8; + if (var3 < 0) { + var3 = var5 - var4 & 3; // L: 970 + + while (true) { + --var3; // L: 971 + if (var3 < 0) { + return; + } + + var8 = var0[var1]; // L: 972 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 973 + } + } + + var8 = var0[var1]; // L: 961 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 962 + var8 = var0[var1]; // L: 963 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 964 + var8 = var0[var1]; // L: 965 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 966 + var8 = var0[var1]; // L: 967 + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); // L: 968 + } + } + } else { + while (true) { + --var3; // L: 933 + if (var3 < 0) { + var3 = var5 - var4 & 3; // L: 939 + + while (true) { + --var3; // L: 940 + if (var3 < 0) { + return; + } + + var0[var1++] = var2; // L: 941 + } + } + + var0[var1++] = var2; // L: 934 + var0[var1++] = var2; // L: 935 + var0[var1++] = var2; // L: 936 + var0[var1++] = var2; // L: 937 + } + } + } + } + + @ObfuscatedName("a") + static final void method3144(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 979 int var20; - if (var19 == null) { - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3122(var0, var1, var2, var3, var4, var5, method3145(var20, var6), method3145(var20, var7), method3145(var20, var8)); + if (var19 == null) { // L: 980 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 981 + method3117(var0, var1, var2, var3, var4, var5, method3134(var20, var6), method3134(var20, var7), method3134(var20, var8)); // L: 982 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1809 = Rasterizer3D_textureLoader.vmethod3404(var18); - var20 = var4 - var3; - int var21 = var1 - var0; - int var22 = var5 - var3; - int var23 = var2 - var0; - int var24 = var7 - var6; - int var25 = var8 - var6; - int var26 = 0; - if (var0 != var1) { + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 985 + field1808 = Rasterizer3D_textureLoader.vmethod3396(var18); // L: 986 + var20 = var4 - var3; // L: 987 + int var21 = var1 - var0; // L: 988 + int var22 = var5 - var3; // L: 989 + int var23 = var2 - var0; // L: 990 + int var24 = var7 - var6; // L: 991 + int var25 = var8 - var6; // L: 992 + int var26 = 0; // L: 993 + if (var0 != var1) { // L: 994 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; - if (var2 != var1) { + int var27 = 0; // L: 995 + if (var2 != var1) { // L: 996 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; - if (var0 != var2) { + int var28 = 0; // L: 997 + if (var0 != var2) { // L: 998 var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; - if (var29 != 0) { - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; - var10 = var9 - var10; - var13 = var12 - var13; - var16 = var15 - var16; - var11 -= var9; - var14 -= var12; - var17 -= var15; - int var32 = var11 * var12 - var9 * var14 << 14; - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); - int var35 = var10 * var12 - var13 * var9 << 14; - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); - int var38 = var13 * var11 - var10 * var14 << 14; - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); + int var29 = var20 * var23 - var22 * var21; // L: 999 + if (var29 != 0) { // L: 1000 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1001 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1002 + var10 = var9 - var10; // L: 1003 + var13 = var12 - var13; // L: 1004 + var16 = var15 - var16; // L: 1005 + var11 -= var9; // L: 1006 + var14 -= var12; // L: 1007 + var17 -= var15; // L: 1008 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1009 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1010 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1011 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1012 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1013 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1014 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1015 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom); // L: 1016 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1017 int var41; - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { // L: 1018 + if (var0 < Rasterizer3D_clipHeight) { // L: 1019 + if (var1 > Rasterizer3D_clipHeight) { // L: 1020 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 1021 var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1022 + if (var1 < var2) { // L: 1023 + var5 = var3 <<= 14; // L: 1024 + if (var0 < 0) { // L: 1025 + var5 -= var0 * var28; // L: 1026 + var3 -= var0 * var26; // L: 1027 + var6 -= var0 * var31; // L: 1028 + var0 = 0; // L: 1029 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var27 * var1; - var1 = 0; + var4 <<= 14; // L: 1031 + if (var1 < 0) { // L: 1032 + var4 -= var27 * var1; // L: 1033 + var1 = 0; // L: 1034 } - var41 = var0 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var41 = var0 - Rasterizer3D_clipMidY; // L: 1036 + var32 += var34 * var41; // L: 1037 + var35 += var37 * var41; // L: 1038 + var38 += var40 * var41; // L: 1039 + if ((var0 == var1 || var28 >= var26) && (var0 != var1 || var28 <= var27)) { // L: 1040 + var2 -= var1; // L: 1067 + var1 -= var0; // L: 1068 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1069 while (true) { - --var1; + --var1; // L: 1070 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1080 if (var2 < 0) { - return; + return; // L: 1090 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1081 + var5 += var28; // L: 1082 + var4 += var27; // L: 1083 + var6 += var31; // L: 1084 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1085 + var32 += var34; // L: 1086 + var35 += var37; // L: 1087 + var38 += var40; // L: 1088 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1071 + var5 += var28; // L: 1072 + var3 += var26; // L: 1073 + var6 += var31; // L: 1074 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1075 + var32 += var34; // L: 1076 + var35 += var37; // L: 1077 + var38 += var40; // L: 1078 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 1041 + var1 -= var0; // L: 1042 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1043 while (true) { - --var1; + --var1; // L: 1044 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1054 if (var2 < 0) { - return; + return; // L: 1064 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1055 + var5 += var28; // L: 1056 + var4 += var27; // L: 1057 + var6 += var31; // L: 1058 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1059 + var32 += var34; // L: 1060 + var35 += var37; // L: 1061 + var38 += var40; // L: 1062 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1045 + var5 += var28; // L: 1046 + var3 += var26; // L: 1047 + var6 += var31; // L: 1048 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1049 + var32 += var34; // L: 1050 + var35 += var37; // L: 1051 + var38 += var40; // L: 1052 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var4 = var3 <<= 14; // L: 1094 + if (var0 < 0) { // L: 1095 + var4 -= var0 * var28; // L: 1096 + var3 -= var0 * var26; // L: 1097 + var6 -= var0 * var31; // L: 1098 + var0 = 0; // L: 1099 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; + var5 <<= 14; // L: 1101 + if (var2 < 0) { // L: 1102 + var5 -= var27 * var2; // L: 1103 + var2 = 0; // L: 1104 } - var41 = var0 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var41 = var0 - Rasterizer3D_clipMidY; // L: 1106 + var32 += var34 * var41; // L: 1107 + var35 += var37 * var41; // L: 1108 + var38 += var40 * var41; // L: 1109 + if ((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) { // L: 1110 + var1 -= var2; // L: 1137 + var2 -= var0; // L: 1138 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1139 while (true) { - --var2; + --var2; // L: 1140 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 1150 if (var1 < 0) { - return; + return; // L: 1160 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1151 + var5 += var27; // L: 1152 + var3 += var26; // L: 1153 + var6 += var31; // L: 1154 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1155 + var32 += var34; // L: 1156 + var35 += var37; // L: 1157 + var38 += var40; // L: 1158 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1141 + var4 += var28; // L: 1142 + var3 += var26; // L: 1143 + var6 += var31; // L: 1144 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1145 + var32 += var34; // L: 1146 + var35 += var37; // L: 1147 + var38 += var40; // L: 1148 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 1111 + var2 -= var0; // L: 1112 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1113 while (true) { - --var2; + --var2; // L: 1114 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 1124 if (var1 < 0) { - return; + return; // L: 1134 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1125 + var5 += var27; // L: 1126 + var3 += var26; // L: 1127 + var6 += var31; // L: 1128 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1129 + var32 += var34; // L: 1130 + var35 += var37; // L: 1131 + var38 += var40; // L: 1132 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1115 + var4 += var28; // L: 1116 + var3 += var26; // L: 1117 + var6 += var31; // L: 1118 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1119 + var32 += var34; // L: 1120 + var35 += var37; // L: 1121 + var38 += var40; // L: 1122 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 1164 + if (var1 < Rasterizer3D_clipHeight) { // L: 1165 + if (var2 > Rasterizer3D_clipHeight) { // L: 1166 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 1167 var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var7 = var30 + ((var7 << 9) - var30 * var4); // L: 1168 + if (var2 < var0) { // L: 1169 + var3 = var4 <<= 14; // L: 1170 + if (var1 < 0) { // L: 1171 + var3 -= var26 * var1; // L: 1172 + var4 -= var27 * var1; // L: 1173 + var7 -= var31 * var1; // L: 1174 + var1 = 0; // L: 1175 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var28 * var2; - var2 = 0; + var5 <<= 14; // L: 1177 + if (var2 < 0) { // L: 1178 + var5 -= var28 * var2; // L: 1179 + var2 = 0; // L: 1180 } - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var41 = var1 - Rasterizer3D_clipMidY; // L: 1182 + var32 += var34 * var41; // L: 1183 + var35 += var37 * var41; // L: 1184 + var38 += var40 * var41; // L: 1185 + if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { // L: 1186 + var0 -= var2; // L: 1187 + var2 -= var1; // L: 1188 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1189 while (true) { - --var2; + --var2; // L: 1190 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 1200 if (var0 < 0) { - return; + return; // L: 1210 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1201 + var3 += var26; // L: 1202 + var5 += var28; // L: 1203 + var7 += var31; // L: 1204 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1205 + var32 += var34; // L: 1206 + var35 += var37; // L: 1207 + var38 += var40; // L: 1208 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1191 + var3 += var26; // L: 1192 + var4 += var27; // L: 1193 + var7 += var31; // L: 1194 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1195 + var32 += var34; // L: 1196 + var35 += var37; // L: 1197 + var38 += var40; // L: 1198 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 1213 + var2 -= var1; // L: 1214 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1215 while (true) { - --var2; + --var2; // L: 1216 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 1226 if (var0 < 0) { - return; + return; // L: 1236 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1227 + var3 += var26; // L: 1228 + var5 += var28; // L: 1229 + var7 += var31; // L: 1230 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1231 + var32 += var34; // L: 1232 + var35 += var37; // L: 1233 + var38 += var40; // L: 1234 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1217 + var3 += var26; // L: 1218 + var4 += var27; // L: 1219 + var7 += var31; // L: 1220 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1221 + var32 += var34; // L: 1222 + var35 += var37; // L: 1223 + var38 += var40; // L: 1224 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 1240 + if (var1 < 0) { // L: 1241 + var5 -= var26 * var1; // L: 1242 + var4 -= var27 * var1; // L: 1243 + var7 -= var31 * var1; // L: 1244 + var1 = 0; // L: 1245 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; + var3 <<= 14; // L: 1247 + if (var0 < 0) { // L: 1248 + var3 -= var0 * var28; // L: 1249 + var0 = 0; // L: 1250 } - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var41 = var1 - Rasterizer3D_clipMidY; // L: 1252 + var32 += var34 * var41; // L: 1253 + var35 += var37 * var41; // L: 1254 + var38 += var40 * var41; // L: 1255 + if (var26 < var27) { // L: 1256 + var2 -= var0; // L: 1257 + var0 -= var1; // L: 1258 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1259 while (true) { - --var0; + --var0; // L: 1260 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 1270 if (var2 < 0) { - return; + return; // L: 1280 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1271 + var3 += var28; // L: 1272 + var4 += var27; // L: 1273 + var7 += var31; // L: 1274 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1275 + var32 += var34; // L: 1276 + var35 += var37; // L: 1277 + var38 += var40; // L: 1278 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1261 + var5 += var26; // L: 1262 + var4 += var27; // L: 1263 + var7 += var31; // L: 1264 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1265 + var32 += var34; // L: 1266 + var35 += var37; // L: 1267 + var38 += var40; // L: 1268 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 1283 + var0 -= var1; // L: 1284 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 1285 while (true) { - --var0; + --var0; // L: 1286 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 1296 if (var2 < 0) { - return; + return; // L: 1306 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1297 + var3 += var28; // L: 1298 + var4 += var27; // L: 1299 + var7 += var31; // L: 1300 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1301 + var32 += var34; // L: 1302 + var35 += var37; // L: 1303 + var38 += var40; // L: 1304 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 1287 + var5 += var26; // L: 1288 + var4 += var27; // L: 1289 + var7 += var31; // L: 1290 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 1291 + var32 += var34; // L: 1292 + var35 += var37; // L: 1293 + var38 += var40; // L: 1294 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 1311 + if (var0 > Rasterizer3D_clipHeight) { // L: 1312 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 1313 var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var8 = (var8 << 9) - var5 * var30 + var30; // L: 1314 + if (var0 < var1) { // L: 1315 + var4 = var5 <<= 14; // L: 1316 + if (var2 < 0) { // L: 1317 + var4 -= var27 * var2; // L: 1318 + var5 -= var28 * var2; // L: 1319 + var8 -= var31 * var2; // L: 1320 + var2 = 0; // L: 1321 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var26; - var0 = 0; + var3 <<= 14; // L: 1323 + if (var0 < 0) { // L: 1324 + var3 -= var0 * var26; // L: 1325 + var0 = 0; // L: 1326 } - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var41 = var2 - Rasterizer3D_clipMidY; // L: 1328 + var32 += var34 * var41; // L: 1329 + var35 += var37 * var41; // L: 1330 + var38 += var40 * var41; // L: 1331 + if (var27 < var28) { // L: 1332 + var1 -= var0; // L: 1333 + var0 -= var2; // L: 1334 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1335 while (true) { - --var0; + --var0; // L: 1336 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 1346 if (var1 < 0) { - return; + return; // L: 1356 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1347 + var4 += var27; // L: 1348 + var3 += var26; // L: 1349 + var8 += var31; // L: 1350 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1351 + var32 += var34; // L: 1352 + var35 += var37; // L: 1353 + var38 += var40; // L: 1354 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1337 + var4 += var27; // L: 1338 + var5 += var28; // L: 1339 + var8 += var31; // L: 1340 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1341 + var32 += var34; // L: 1342 + var35 += var37; // L: 1343 + var38 += var40; // L: 1344 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 1359 + var0 -= var2; // L: 1360 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1361 while (true) { - --var0; + --var0; // L: 1362 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 1372 if (var1 < 0) { - return; + return; // L: 1382 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1373 + var4 += var27; // L: 1374 + var3 += var26; // L: 1375 + var8 += var31; // L: 1376 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1377 + var32 += var34; // L: 1378 + var35 += var37; // L: 1379 + var38 += var40; // L: 1380 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1363 + var4 += var27; // L: 1364 + var5 += var28; // L: 1365 + var8 += var31; // L: 1366 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1367 + var32 += var34; // L: 1368 + var35 += var37; // L: 1369 + var38 += var40; // L: 1370 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 1386 + if (var2 < 0) { // L: 1387 + var3 -= var27 * var2; // L: 1388 + var5 -= var28 * var2; // L: 1389 + var8 -= var31 * var2; // L: 1390 + var2 = 0; // L: 1391 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; + var4 <<= 14; // L: 1393 + if (var1 < 0) { // L: 1394 + var4 -= var26 * var1; // L: 1395 + var1 = 0; // L: 1396 } - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var41 = var2 - Rasterizer3D_clipMidY; // L: 1398 + var32 += var34 * var41; // L: 1399 + var35 += var37 * var41; // L: 1400 + var38 += var40 * var41; // L: 1401 + if (var27 < var28) { // L: 1402 + var0 -= var1; // L: 1403 + var1 -= var2; // L: 1404 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1405 while (true) { - --var1; + --var1; // L: 1406 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 1416 if (var0 < 0) { - return; + return; // L: 1426 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1417 + var4 += var26; // L: 1418 + var5 += var28; // L: 1419 + var8 += var31; // L: 1420 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1421 + var32 += var34; // L: 1422 + var35 += var37; // L: 1423 + var38 += var40; // L: 1424 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1407 + var3 += var27; // L: 1408 + var5 += var28; // L: 1409 + var8 += var31; // L: 1410 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1411 + var32 += var34; // L: 1412 + var35 += var37; // L: 1413 + var38 += var40; // L: 1414 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 1429 + var1 -= var2; // L: 1430 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 1431 while (true) { - --var1; + --var1; // L: 1432 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 1442 if (var0 < 0) { - return; + return; // L: 1452 } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1443 + var4 += var26; // L: 1444 + var5 += var28; // L: 1445 + var8 += var31; // L: 1446 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1447 + var32 += var34; // L: 1448 + var35 += var37; // L: 1449 + var38 += var40; // L: 1450 } } - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 1433 + var3 += var27; // L: 1434 + var5 += var28; // L: 1435 + var8 += var31; // L: 1436 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 1437 + var32 += var34; // L: 1438 + var35 += var37; // L: 1439 + var38 += var40; // L: 1440 } } } } } } - } + } // L: 983 - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("Rasterizer3D_iDontKnow") static final void Rasterizer3D_iDontKnow(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if (field1796) { - if (var6 > Rasterizer3D_clipWidth) { + if (field1791) { // L: 1461 + if (var6 > Rasterizer3D_clipWidth) { // L: 1462 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { + if (var5 < 0) { // L: 1463 var5 = 0; } } - if (var5 < var6) { - var4 += var5; - var7 += var5 * var8; - int var17 = var6 - var5; + if (var5 < var6) { // L: 1465 + var4 += var5; // L: 1466 + var7 += var5 * var8; // L: 1467 + int var17 = var6 - var5; // L: 1468 int var15; int var16; int var10000; @@ -2078,1040 +2068,1040 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { - var23 = var5 - Rasterizer3D_clipMidX; - var9 += var23 * (var12 >> 3); - var10 += (var13 >> 3) * var23; - var11 += var23 * (var14 >> 3); - var22 = var11 >> 12; - if (var22 != 0) { - var18 = var9 / var22; - var19 = var10 / var22; - if (var18 < 0) { + if (Rasterizer3D_isLowDetailTexture) { // L: 1469 + var23 = var5 - Rasterizer3D_clipMidX; // L: 1475 + var9 += var23 * (var12 >> 3); // L: 1476 + var10 += (var13 >> 3) * var23; // L: 1477 + var11 += var23 * (var14 >> 3); // L: 1478 + var22 = var11 >> 12; // L: 1479 + if (var22 != 0) { // L: 1480 + var18 = var9 / var22; // L: 1481 + var19 = var10 / var22; // L: 1482 + if (var18 < 0) { // L: 1483 var18 = 0; - } else if (var18 > 4032) { + } else if (var18 > 4032) { // L: 1484 var18 = 4032; } } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 1487 + var19 = 0; // L: 1488 } - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 12; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + var9 += var12; // L: 1490 + var10 += var13; // L: 1491 + var11 += var14; // L: 1492 + var22 = var11 >> 12; // L: 1493 + if (var22 != 0) { // L: 1494 + var20 = var9 / var22; // L: 1495 + var21 = var10 / var22; // L: 1496 + if (var20 < 0) { // L: 1497 var20 = 0; - } else if (var20 > 4032) { + } else if (var20 > 4032) { // L: 1498 var20 = 4032; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1501 + var21 = 0; // L: 1502 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field1809) { - if (var17 > 0) { + var2 = (var18 << 20) + var19; // L: 1504 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1505 + var17 >>= 3; // L: 1506 + var8 <<= 3; // L: 1507 + var15 = var7 >> 8; // L: 1508 + if (field1808) { // L: 1509 + if (var17 > 0) { // L: 1510 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var10000 = var16 + var2; - var18 = var20; - var19 = var21; - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 12; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1512 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1513 + var2 += var16; // L: 1514 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1515 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1516 + var2 += var16; // L: 1517 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1518 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1519 + var2 += var16; // L: 1520 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1521 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1522 + var2 += var16; // L: 1523 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1524 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1525 + var2 += var16; // L: 1526 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1527 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1528 + var2 += var16; // L: 1529 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1530 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1531 + var2 += var16; // L: 1532 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1533 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1534 + var10000 = var16 + var2; // L: 1535 + var18 = var20; // L: 1536 + var19 = var21; // L: 1537 + var9 += var12; // L: 1538 + var10 += var13; // L: 1539 + var11 += var14; // L: 1540 + var22 = var11 >> 12; // L: 1541 + if (var22 != 0) { // L: 1542 + var20 = var9 / var22; // L: 1543 + var21 = var10 / var22; // L: 1544 + if (var20 < 0) { // L: 1545 var20 = 0; - } else if (var20 > 4032) { + } else if (var20 > 4032) { // L: 1546 var20 = 4032; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1549 + var21 = 0; // L: 1550 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 20) + var19; // L: 1552 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1553 + var7 += var8; // L: 1554 + var15 = var7 >> 8; // L: 1555 + --var17; // L: 1556 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1558 + if (var17 > 0) { // L: 1559 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 1561 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1562 + var2 += var16; // L: 1563 + --var17; // L: 1564 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 1568 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1570 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1571 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1573 + var2 += var16; // L: 1574 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1575 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1576 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1578 + var2 += var16; // L: 1579 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1580 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1581 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1583 + var2 += var16; // L: 1584 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1585 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1586 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1588 + var2 += var16; // L: 1589 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1590 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1591 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1593 + var2 += var16; // L: 1594 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1595 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1596 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1598 + var2 += var16; // L: 1599 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1600 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1601 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1603 + var2 += var16; // L: 1604 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1605 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1606 } - ++var4; - var10000 = var16 + var2; - var18 = var20; - var19 = var21; - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 12; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + ++var4; // L: 1608 + var10000 = var16 + var2; // L: 1609 + var18 = var20; // L: 1610 + var19 = var21; // L: 1611 + var9 += var12; // L: 1612 + var10 += var13; // L: 1613 + var11 += var14; // L: 1614 + var22 = var11 >> 12; // L: 1615 + if (var22 != 0) { // L: 1616 + var20 = var9 / var22; // L: 1617 + var21 = var10 / var22; // L: 1618 + if (var20 < 0) { // L: 1619 var20 = 0; - } else if (var20 > 4032) { + } else if (var20 > 4032) { // L: 1620 var20 = 4032; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1623 + var21 = 0; // L: 1624 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 20) + var19; // L: 1626 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20); // L: 1627 + var7 += var8; // L: 1628 + var15 = var7 >> 8; // L: 1629 + --var17; // L: 1630 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1632 + if (var17 > 0) { // L: 1633 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 1635 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1636 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 1638 + var2 += var16; // L: 1639 + --var17; // L: 1640 } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; - var9 += var23 * (var12 >> 3); - var10 += (var13 >> 3) * var23; - var11 += var23 * (var14 >> 3); - var22 = var11 >> 14; - if (var22 != 0) { - var18 = var9 / var22; - var19 = var10 / var22; - if (var18 < 0) { + var23 = var5 - Rasterizer3D_clipMidX; // L: 1650 + var9 += var23 * (var12 >> 3); // L: 1651 + var10 += (var13 >> 3) * var23; // L: 1652 + var11 += var23 * (var14 >> 3); // L: 1653 + var22 = var11 >> 14; // L: 1654 + if (var22 != 0) { // L: 1655 + var18 = var9 / var22; // L: 1656 + var19 = var10 / var22; // L: 1657 + if (var18 < 0) { // L: 1658 var18 = 0; - } else if (var18 > 16256) { + } else if (var18 > 16256) { // L: 1659 var18 = 16256; } } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 1662 + var19 = 0; // L: 1663 } - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 14; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + var9 += var12; // L: 1665 + var10 += var13; // L: 1666 + var11 += var14; // L: 1667 + var22 = var11 >> 14; // L: 1668 + if (var22 != 0) { // L: 1669 + var20 = var9 / var22; // L: 1670 + var21 = var10 / var22; // L: 1671 + if (var20 < 0) { // L: 1672 var20 = 0; - } else if (var20 > 16256) { + } else if (var20 > 16256) { // L: 1673 var20 = 16256; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1676 + var21 = 0; // L: 1677 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field1809) { - if (var17 > 0) { + var2 = (var18 << 18) + var19; // L: 1679 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1680 + var17 >>= 3; // L: 1681 + var8 <<= 3; // L: 1682 + var15 = var7 >> 8; // L: 1683 + if (field1808) { // L: 1684 + if (var17 > 0) { // L: 1685 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var10000 = var16 + var2; - var18 = var20; - var19 = var21; - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 14; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1687 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1688 + var2 += var16; // L: 1689 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1690 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1691 + var2 += var16; // L: 1692 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1693 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1694 + var2 += var16; // L: 1695 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1696 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1697 + var2 += var16; // L: 1698 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1699 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1700 + var2 += var16; // L: 1701 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1702 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1703 + var2 += var16; // L: 1704 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1705 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1706 + var2 += var16; // L: 1707 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1708 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1709 + var10000 = var16 + var2; // L: 1710 + var18 = var20; // L: 1711 + var19 = var21; // L: 1712 + var9 += var12; // L: 1713 + var10 += var13; // L: 1714 + var11 += var14; // L: 1715 + var22 = var11 >> 14; // L: 1716 + if (var22 != 0) { // L: 1717 + var20 = var9 / var22; // L: 1718 + var21 = var10 / var22; // L: 1719 + if (var20 < 0) { // L: 1720 var20 = 0; - } else if (var20 > 16256) { + } else if (var20 > 16256) { // L: 1721 var20 = 16256; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1724 + var21 = 0; // L: 1725 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 18) + var19; // L: 1727 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1728 + var7 += var8; // L: 1729 + var15 = var7 >> 8; // L: 1730 + --var17; // L: 1731 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1733 + if (var17 > 0) { // L: 1734 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 1736 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1737 + var2 += var16; // L: 1738 + --var17; // L: 1739 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 1743 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1745 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1746 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1748 + var2 += var16; // L: 1749 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1750 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1751 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1753 + var2 += var16; // L: 1754 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1755 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1756 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1758 + var2 += var16; // L: 1759 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1760 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1761 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1763 + var2 += var16; // L: 1764 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1765 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1766 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1768 + var2 += var16; // L: 1769 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1770 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1771 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1773 + var2 += var16; // L: 1774 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1775 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1776 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 1778 + var2 += var16; // L: 1779 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1780 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1781 } - ++var4; - var10000 = var16 + var2; - var18 = var20; - var19 = var21; - var9 += var12; - var10 += var13; - var11 += var14; - var22 = var11 >> 14; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; - if (var20 < 0) { + ++var4; // L: 1783 + var10000 = var16 + var2; // L: 1784 + var18 = var20; // L: 1785 + var19 = var21; // L: 1786 + var9 += var12; // L: 1787 + var10 += var13; // L: 1788 + var11 += var14; // L: 1789 + var22 = var11 >> 14; // L: 1790 + if (var22 != 0) { // L: 1791 + var20 = var9 / var22; // L: 1792 + var21 = var10 / var22; // L: 1793 + if (var20 < 0) { // L: 1794 var20 = 0; - } else if (var20 > 16256) { + } else if (var20 > 16256) { // L: 1795 var20 = 16256; } } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 1798 + var21 = 0; // L: 1799 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); - var7 += var8; - var15 = var7 >> 8; - --var17; + var2 = (var18 << 18) + var19; // L: 1801 + var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18); // L: 1802 + var7 += var8; // L: 1803 + var15 = var7 >> 8; // L: 1804 + --var17; // L: 1805 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 1807 + if (var17 > 0) { // L: 1808 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 1810 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 1811 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 1813 + var2 += var16; // L: 1814 + --var17; // L: 1815 } while(var17 > 0); } } } } - } + } // L: 1819 - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("drawTexturedTile") static final void drawTexturedTile(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18) { - int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); + int[] var19 = Rasterizer3D_textureLoader.getTexturePixels(var18); // L: 1822 int var20; - if (var19 == null) { - var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); - method3122(var0, var1, var2, var3, var4, var5, method3145(var20, var6), method3145(var20, var7), method3145(var20, var8)); + if (var19 == null) { // L: 1823 + var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18); // L: 1824 + method3117(var0, var1, var2, var3, var4, var5, method3134(var20, var6), method3134(var20, var7), method3134(var20, var8)); // L: 1825 } else { - Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); - field1809 = Rasterizer3D_textureLoader.vmethod3404(var18); - var20 = var4 - var3; - int var21 = var1 - var0; - int var22 = var5 - var3; - int var23 = var2 - var0; - int var24 = var7 - var6; - int var25 = var8 - var6; - int var26 = 0; - if (var0 != var1) { + Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18); // L: 1828 + field1808 = Rasterizer3D_textureLoader.vmethod3396(var18); // L: 1829 + var20 = var4 - var3; // L: 1830 + int var21 = var1 - var0; // L: 1831 + int var22 = var5 - var3; // L: 1832 + int var23 = var2 - var0; // L: 1833 + int var24 = var7 - var6; // L: 1834 + int var25 = var8 - var6; // L: 1835 + int var26 = 0; // L: 1836 + if (var0 != var1) { // L: 1837 var26 = (var4 - var3 << 14) / (var1 - var0); } - int var27 = 0; - if (var2 != var1) { + int var27 = 0; // L: 1838 + if (var2 != var1) { // L: 1839 var27 = (var5 - var4 << 14) / (var2 - var1); } - int var28 = 0; - if (var0 != var2) { + int var28 = 0; // L: 1840 + if (var0 != var2) { // L: 1841 var28 = (var3 - var5 << 14) / (var0 - var2); } - int var29 = var20 * var23 - var22 * var21; - if (var29 != 0) { - int var30 = (var24 * var23 - var25 * var21 << 9) / var29; - int var31 = (var25 * var20 - var24 * var22 << 9) / var29; - var10 = var9 - var10; - var13 = var12 - var13; - var16 = var15 - var16; - var11 -= var9; - var14 -= var12; - var17 -= var15; - int var32 = var11 * var12 - var9 * var14 << 14; - int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); - int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); - int var35 = var10 * var12 - var13 * var9 << 14; - int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); - int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); - int var38 = var13 * var11 - var10 * var14 << 14; - int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); - int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); + int var29 = var20 * var23 - var22 * var21; // L: 1842 + if (var29 != 0) { // L: 1843 + int var30 = (var24 * var23 - var25 * var21 << 9) / var29; // L: 1844 + int var31 = (var25 * var20 - var24 * var22 << 9) / var29; // L: 1845 + var10 = var9 - var10; // L: 1846 + var13 = var12 - var13; // L: 1847 + var16 = var15 - var16; // L: 1848 + var11 -= var9; // L: 1849 + var14 -= var12; // L: 1850 + var17 -= var15; // L: 1851 + int var32 = var11 * var12 - var9 * var14 << 14; // L: 1852 + int var33 = (int)(((long)(var15 * var14 - var17 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1853 + int var34 = (int)(((long)(var17 * var9 - var11 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1854 + int var35 = var10 * var12 - var13 * var9 << 14; // L: 1855 + int var36 = (int)(((long)(var13 * var15 - var16 * var12) << 14) / (long)Rasterizer3D_zoom); // L: 1856 + int var37 = (int)(((long)(var16 * var9 - var10 * var15) << 14) / (long)Rasterizer3D_zoom); // L: 1857 + int var38 = var13 * var11 - var10 * var14 << 14; // L: 1858 + int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom); // L: 1859 + int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom); // L: 1860 int var41; - if (var0 <= var1 && var0 <= var2) { - if (var0 < Rasterizer3D_clipHeight) { - if (var1 > Rasterizer3D_clipHeight) { + if (var0 <= var1 && var0 <= var2) { // L: 1861 + if (var0 < Rasterizer3D_clipHeight) { // L: 1862 + if (var1 > Rasterizer3D_clipHeight) { // L: 1863 var1 = Rasterizer3D_clipHeight; } - if (var2 > Rasterizer3D_clipHeight) { + if (var2 > Rasterizer3D_clipHeight) { // L: 1864 var2 = Rasterizer3D_clipHeight; } - var6 = var30 + ((var6 << 9) - var3 * var30); - if (var1 < var2) { - var5 = var3 <<= 14; - if (var0 < 0) { - var5 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var6 = var30 + ((var6 << 9) - var3 * var30); // L: 1865 + if (var1 < var2) { // L: 1866 + var5 = var3 <<= 14; // L: 1867 + if (var0 < 0) { // L: 1868 + var5 -= var0 * var28; // L: 1869 + var3 -= var0 * var26; // L: 1870 + var6 -= var0 * var31; // L: 1871 + var0 = 0; // L: 1872 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var27 * var1; - var1 = 0; + var4 <<= 14; // L: 1874 + if (var1 < 0) { // L: 1875 + var4 -= var27 * var1; // L: 1876 + var1 = 0; // L: 1877 } - var41 = var0 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var41 = var0 - Rasterizer3D_clipMidY; // L: 1879 + var32 += var34 * var41; // L: 1880 + var35 += var37 * var41; // L: 1881 + var38 += var40 * var41; // L: 1882 + if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) { // L: 1883 + var2 -= var1; // L: 1884 + var1 -= var0; // L: 1885 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1886 while (true) { - --var1; + --var1; // L: 1887 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1897 if (var2 < 0) { - return; + return; // L: 1907 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1898 + var5 += var28; // L: 1899 + var4 += var27; // L: 1900 + var6 += var31; // L: 1901 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1902 + var32 += var34; // L: 1903 + var35 += var37; // L: 1904 + var38 += var40; // L: 1905 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1888 + var5 += var28; // L: 1889 + var3 += var26; // L: 1890 + var6 += var31; // L: 1891 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1892 + var32 += var34; // L: 1893 + var35 += var37; // L: 1894 + var38 += var40; // L: 1895 } } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var2 -= var1; // L: 1910 + var1 -= var0; // L: 1911 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1912 while (true) { - --var1; + --var1; // L: 1913 if (var1 < 0) { while (true) { - --var2; + --var2; // L: 1923 if (var2 < 0) { - return; + return; // L: 1933 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1924 + var5 += var28; // L: 1925 + var4 += var27; // L: 1926 + var6 += var31; // L: 1927 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1928 + var32 += var34; // L: 1929 + var35 += var37; // L: 1930 + var38 += var40; // L: 1931 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1914 + var5 += var28; // L: 1915 + var3 += var26; // L: 1916 + var6 += var31; // L: 1917 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1918 + var32 += var34; // L: 1919 + var35 += var37; // L: 1920 + var38 += var40; // L: 1921 } } } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; + var4 = var3 <<= 14; // L: 1937 + if (var0 < 0) { // L: 1938 + var4 -= var0 * var28; // L: 1939 + var3 -= var0 * var26; // L: 1940 + var6 -= var0 * var31; // L: 1941 + var0 = 0; // L: 1942 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; + var5 <<= 14; // L: 1944 + if (var2 < 0) { // L: 1945 + var5 -= var27 * var2; // L: 1946 + var2 = 0; // L: 1947 } - var41 = var0 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var41 = var0 - Rasterizer3D_clipMidY; // L: 1949 + var32 += var34 * var41; // L: 1950 + var35 += var37 * var41; // L: 1951 + var38 += var40 * var41; // L: 1952 + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { // L: 1953 + var1 -= var2; // L: 1954 + var2 -= var0; // L: 1955 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1956 while (true) { - --var2; + --var2; // L: 1957 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 1967 if (var1 < 0) { - return; + return; // L: 1977 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1968 + var5 += var27; // L: 1969 + var3 += var26; // L: 1970 + var6 += var31; // L: 1971 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1972 + var32 += var34; // L: 1973 + var35 += var37; // L: 1974 + var38 += var40; // L: 1975 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1958 + var4 += var28; // L: 1959 + var3 += var26; // L: 1960 + var6 += var31; // L: 1961 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1962 + var32 += var34; // L: 1963 + var35 += var37; // L: 1964 + var38 += var40; // L: 1965 } } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + var1 -= var2; // L: 1980 + var2 -= var0; // L: 1981 + var0 = Rasterizer3D_rowOffsets[var0]; // L: 1982 while (true) { - --var2; + --var2; // L: 1983 if (var2 < 0) { while (true) { - --var1; + --var1; // L: 1993 if (var1 < 0) { - return; + return; // L: 2003 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1994 + var5 += var27; // L: 1995 + var3 += var26; // L: 1996 + var6 += var31; // L: 1997 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1998 + var32 += var34; // L: 1999 + var35 += var37; // L: 2000 + var38 += var40; // L: 2001 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); // L: 1984 + var4 += var28; // L: 1985 + var3 += var26; // L: 1986 + var6 += var31; // L: 1987 + var0 += Rasterizer2D.Rasterizer2D_width; // L: 1988 + var32 += var34; // L: 1989 + var35 += var37; // L: 1990 + var38 += var40; // L: 1991 } } } } - } else if (var1 <= var2) { - if (var1 < Rasterizer3D_clipHeight) { - if (var2 > Rasterizer3D_clipHeight) { + } else if (var1 <= var2) { // L: 2007 + if (var1 < Rasterizer3D_clipHeight) { // L: 2008 + if (var2 > Rasterizer3D_clipHeight) { // L: 2009 var2 = Rasterizer3D_clipHeight; } - if (var0 > Rasterizer3D_clipHeight) { + if (var0 > Rasterizer3D_clipHeight) { // L: 2010 var0 = Rasterizer3D_clipHeight; } - var7 = var30 + ((var7 << 9) - var30 * var4); - if (var2 < var0) { - var3 = var4 <<= 14; - if (var1 < 0) { - var3 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var7 = var30 + ((var7 << 9) - var30 * var4); // L: 2011 + if (var2 < var0) { // L: 2012 + var3 = var4 <<= 14; // L: 2013 + if (var1 < 0) { // L: 2014 + var3 -= var26 * var1; // L: 2015 + var4 -= var27 * var1; // L: 2016 + var7 -= var31 * var1; // L: 2017 + var1 = 0; // L: 2018 } - var5 <<= 14; - if (var2 < 0) { - var5 -= var28 * var2; - var2 = 0; + var5 <<= 14; // L: 2020 + if (var2 < 0) { // L: 2021 + var5 -= var28 * var2; // L: 2022 + var2 = 0; // L: 2023 } - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var41 = var1 - Rasterizer3D_clipMidY; // L: 2025 + var32 += var34 * var41; // L: 2026 + var35 += var37 * var41; // L: 2027 + var38 += var40 * var41; // L: 2028 + if ((var2 == var1 || var26 >= var27) && (var2 != var1 || var26 <= var28)) { // L: 2029 + var0 -= var2; // L: 2056 + var2 -= var1; // L: 2057 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2058 while (true) { - --var2; + --var2; // L: 2059 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 2069 if (var0 < 0) { - return; + return; // L: 2079 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2070 + var3 += var26; // L: 2071 + var5 += var28; // L: 2072 + var7 += var31; // L: 2073 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2074 + var32 += var34; // L: 2075 + var35 += var37; // L: 2076 + var38 += var40; // L: 2077 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2060 + var3 += var26; // L: 2061 + var4 += var27; // L: 2062 + var7 += var31; // L: 2063 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2064 + var32 += var34; // L: 2065 + var35 += var37; // L: 2066 + var38 += var40; // L: 2067 } } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var0 -= var2; // L: 2030 + var2 -= var1; // L: 2031 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2032 while (true) { - --var2; + --var2; // L: 2033 if (var2 < 0) { while (true) { - --var0; + --var0; // L: 2043 if (var0 < 0) { - return; + return; // L: 2053 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2044 + var3 += var26; // L: 2045 + var5 += var28; // L: 2046 + var7 += var31; // L: 2047 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2048 + var32 += var34; // L: 2049 + var35 += var37; // L: 2050 + var38 += var40; // L: 2051 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2034 + var3 += var26; // L: 2035 + var4 += var27; // L: 2036 + var7 += var31; // L: 2037 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2038 + var32 += var34; // L: 2039 + var35 += var37; // L: 2040 + var38 += var40; // L: 2041 } } } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; + var5 = var4 <<= 14; // L: 2083 + if (var1 < 0) { // L: 2084 + var5 -= var26 * var1; // L: 2085 + var4 -= var27 * var1; // L: 2086 + var7 -= var31 * var1; // L: 2087 + var1 = 0; // L: 2088 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; + var3 <<= 14; // L: 2090 + if (var0 < 0) { // L: 2091 + var3 -= var0 * var28; // L: 2092 + var0 = 0; // L: 2093 } - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var41 = var1 - Rasterizer3D_clipMidY; // L: 2095 + var32 += var34 * var41; // L: 2096 + var35 += var37 * var41; // L: 2097 + var38 += var40 * var41; // L: 2098 + if (var26 < var27) { // L: 2099 + var2 -= var0; // L: 2100 + var0 -= var1; // L: 2101 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2102 while (true) { - --var0; + --var0; // L: 2103 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 2113 if (var2 < 0) { - return; + return; // L: 2123 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2114 + var3 += var28; // L: 2115 + var4 += var27; // L: 2116 + var7 += var31; // L: 2117 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2118 + var32 += var34; // L: 2119 + var35 += var37; // L: 2120 + var38 += var40; // L: 2121 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2104 + var5 += var26; // L: 2105 + var4 += var27; // L: 2106 + var7 += var31; // L: 2107 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2108 + var32 += var34; // L: 2109 + var35 += var37; // L: 2110 + var38 += var40; // L: 2111 } } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + var2 -= var0; // L: 2126 + var0 -= var1; // L: 2127 + var1 = Rasterizer3D_rowOffsets[var1]; // L: 2128 while (true) { - --var0; + --var0; // L: 2129 if (var0 < 0) { while (true) { - --var2; + --var2; // L: 2139 if (var2 < 0) { - return; + return; // L: 2149 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2140 + var3 += var28; // L: 2141 + var4 += var27; // L: 2142 + var7 += var31; // L: 2143 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2144 + var32 += var34; // L: 2145 + var35 += var37; // L: 2146 + var38 += var40; // L: 2147 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); // L: 2130 + var5 += var26; // L: 2131 + var4 += var27; // L: 2132 + var7 += var31; // L: 2133 + var1 += Rasterizer2D.Rasterizer2D_width; // L: 2134 + var32 += var34; // L: 2135 + var35 += var37; // L: 2136 + var38 += var40; // L: 2137 } } } } - } else if (var2 < Rasterizer3D_clipHeight) { - if (var0 > Rasterizer3D_clipHeight) { + } else if (var2 < Rasterizer3D_clipHeight) { // L: 2154 + if (var0 > Rasterizer3D_clipHeight) { // L: 2155 var0 = Rasterizer3D_clipHeight; } - if (var1 > Rasterizer3D_clipHeight) { + if (var1 > Rasterizer3D_clipHeight) { // L: 2156 var1 = Rasterizer3D_clipHeight; } - var8 = (var8 << 9) - var5 * var30 + var30; - if (var0 < var1) { - var4 = var5 <<= 14; - if (var2 < 0) { - var4 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var8 = (var8 << 9) - var5 * var30 + var30; // L: 2157 + if (var0 < var1) { // L: 2158 + var4 = var5 <<= 14; // L: 2159 + if (var2 < 0) { // L: 2160 + var4 -= var27 * var2; // L: 2161 + var5 -= var28 * var2; // L: 2162 + var8 -= var31 * var2; // L: 2163 + var2 = 0; // L: 2164 } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var26; - var0 = 0; + var3 <<= 14; // L: 2166 + if (var0 < 0) { // L: 2167 + var3 -= var0 * var26; // L: 2168 + var0 = 0; // L: 2169 } - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var41 = var2 - Rasterizer3D_clipMidY; // L: 2171 + var32 += var34 * var41; // L: 2172 + var35 += var37 * var41; // L: 2173 + var38 += var40 * var41; // L: 2174 + if (var27 < var28) { // L: 2175 + var1 -= var0; // L: 2176 + var0 -= var2; // L: 2177 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2178 while (true) { - --var0; + --var0; // L: 2179 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 2189 if (var1 < 0) { - return; + return; // L: 2199 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2190 + var4 += var27; // L: 2191 + var3 += var26; // L: 2192 + var8 += var31; // L: 2193 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2194 + var32 += var34; // L: 2195 + var35 += var37; // L: 2196 + var38 += var40; // L: 2197 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2180 + var4 += var27; // L: 2181 + var5 += var28; // L: 2182 + var8 += var31; // L: 2183 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2184 + var32 += var34; // L: 2185 + var35 += var37; // L: 2186 + var38 += var40; // L: 2187 } } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var1 -= var0; // L: 2202 + var0 -= var2; // L: 2203 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2204 while (true) { - --var0; + --var0; // L: 2205 if (var0 < 0) { while (true) { - --var1; + --var1; // L: 2215 if (var1 < 0) { - return; + return; // L: 2225 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2216 + var4 += var27; // L: 2217 + var3 += var26; // L: 2218 + var8 += var31; // L: 2219 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2220 + var32 += var34; // L: 2221 + var35 += var37; // L: 2222 + var38 += var40; // L: 2223 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2206 + var4 += var27; // L: 2207 + var5 += var28; // L: 2208 + var8 += var31; // L: 2209 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2210 + var32 += var34; // L: 2211 + var35 += var37; // L: 2212 + var38 += var40; // L: 2213 } } } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; + var3 = var5 <<= 14; // L: 2229 + if (var2 < 0) { // L: 2230 + var3 -= var27 * var2; // L: 2231 + var5 -= var28 * var2; // L: 2232 + var8 -= var31 * var2; // L: 2233 + var2 = 0; // L: 2234 } - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; + var4 <<= 14; // L: 2236 + if (var1 < 0) { // L: 2237 + var4 -= var26 * var1; // L: 2238 + var1 = 0; // L: 2239 } - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var41 = var2 - Rasterizer3D_clipMidY; // L: 2241 + var32 += var34 * var41; // L: 2242 + var35 += var37 * var41; // L: 2243 + var38 += var40 * var41; // L: 2244 + if (var27 < var28) { // L: 2245 + var0 -= var1; // L: 2246 + var1 -= var2; // L: 2247 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2248 while (true) { - --var1; + --var1; // L: 2249 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 2259 if (var0 < 0) { - return; + return; // L: 2269 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2260 + var4 += var26; // L: 2261 + var5 += var28; // L: 2262 + var8 += var31; // L: 2263 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2264 + var32 += var34; // L: 2265 + var35 += var37; // L: 2266 + var38 += var40; // L: 2267 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2250 + var3 += var27; // L: 2251 + var5 += var28; // L: 2252 + var8 += var31; // L: 2253 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2254 + var32 += var34; // L: 2255 + var35 += var37; // L: 2256 + var38 += var40; // L: 2257 } } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + var0 -= var1; // L: 2272 + var1 -= var2; // L: 2273 + var2 = Rasterizer3D_rowOffsets[var2]; // L: 2274 while (true) { - --var1; + --var1; // L: 2275 if (var1 < 0) { while (true) { - --var0; + --var0; // L: 2285 if (var0 < 0) { - return; + return; // L: 2295 } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2286 + var4 += var26; // L: 2287 + var5 += var28; // L: 2288 + var8 += var31; // L: 2289 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2290 + var32 += var34; // L: 2291 + var35 += var37; // L: 2292 + var38 += var40; // L: 2293 } } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); // L: 2276 + var3 += var27; // L: 2277 + var5 += var28; // L: 2278 + var8 += var31; // L: 2279 + var2 += Rasterizer2D.Rasterizer2D_width; // L: 2280 + var32 += var34; // L: 2281 + var35 += var37; // L: 2282 + var38 += var40; // L: 2283 } } } } } } - } + } // L: 1826 - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("Rasterizer3D_textureAlpha") static final void Rasterizer3D_textureAlpha(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14) { - if (field1796) { - if (var6 > Rasterizer3D_clipWidth) { + if (field1791) { // L: 2304 + if (var6 > Rasterizer3D_clipWidth) { // L: 2305 var6 = Rasterizer3D_clipWidth; } - if (var5 < 0) { + if (var5 < 0) { // L: 2306 var5 = 0; } } - if (var5 < var6) { - var4 += var5; - var7 += var5 * var8; - int var17 = var6 - var5; + if (var5 < var6) { // L: 2308 + var4 += var5; // L: 2309 + var7 += var5 * var8; // L: 2310 + int var17 = var6 - var5; // L: 2311 int var15; int var16; int var18; @@ -3120,336 +3110,336 @@ public class Rasterizer3D extends Rasterizer2D { int var21; int var22; int var23; - if (Rasterizer3D_isLowDetailTexture) { - var23 = var5 - Rasterizer3D_clipMidX; - var9 += var23 * var12; - var10 += var13 * var23; - var11 += var23 * var14; - var22 = var11 >> 12; - if (var22 != 0) { - var18 = var9 / var22; - var19 = var10 / var22; + if (Rasterizer3D_isLowDetailTexture) { // L: 2312 + var23 = var5 - Rasterizer3D_clipMidX; // L: 2319 + var9 += var23 * var12; // L: 2320 + var10 += var13 * var23; // L: 2321 + var11 += var23 * var14; // L: 2322 + var22 = var11 >> 12; // L: 2323 + if (var22 != 0) { // L: 2324 + var18 = var9 / var22; // L: 2325 + var19 = var10 / var22; // L: 2326 } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 2329 + var19 = 0; // L: 2330 } - var9 += var17 * var12; - var10 += var13 * var17; - var11 += var17 * var14; - var22 = var11 >> 12; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; + var9 += var17 * var12; // L: 2332 + var10 += var13 * var17; // L: 2333 + var11 += var17 * var14; // L: 2334 + var22 = var11 >> 12; // L: 2335 + if (var22 != 0) { // L: 2336 + var20 = var9 / var22; // L: 2337 + var21 = var10 / var22; // L: 2338 } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 2341 + var21 = 0; // L: 2342 } - var2 = (var18 << 20) + var19; - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field1809) { - if (var17 > 0) { + var2 = (var18 << 20) + var19; // L: 2344 + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20); // L: 2345 + var17 >>= 3; // L: 2346 + var8 <<= 3; // L: 2347 + var15 = var7 >> 8; // L: 2348 + if (field1808) { // L: 2350 + if (var17 > 0) { // L: 2351 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var7 += var8; - var15 = var7 >> 8; - --var17; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2353 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2354 + var2 += var16; // L: 2355 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2356 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2357 + var2 += var16; // L: 2358 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2359 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2360 + var2 += var16; // L: 2361 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2362 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2363 + var2 += var16; // L: 2364 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2365 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2366 + var2 += var16; // L: 2367 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2368 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2369 + var2 += var16; // L: 2370 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2371 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2372 + var2 += var16; // L: 2373 + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2374 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2375 + var2 += var16; // L: 2376 + var7 += var8; // L: 2377 + var15 = var7 >> 8; // L: 2378 + --var17; // L: 2379 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2381 + if (var17 > 0) { // L: 2382 do { - var3 = var1[(var2 >>> 26) + (var2 & 4032)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; + var3 = var1[(var2 >>> 26) + (var2 & 4032)]; // L: 2384 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2385 + var2 += var16; // L: 2386 + --var17; // L: 2387 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 2391 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2393 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2394 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2396 + var2 += var16; // L: 2397 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2398 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2399 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2401 + var2 += var16; // L: 2402 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2403 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2404 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2406 + var2 += var16; // L: 2407 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2408 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2409 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2411 + var2 += var16; // L: 2412 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2413 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2414 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2416 + var2 += var16; // L: 2417 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2418 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2419 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2421 + var2 += var16; // L: 2422 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2423 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2424 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2426 + var2 += var16; // L: 2427 + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2428 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2429 } - ++var4; - var2 += var16; - var7 += var8; - var15 = var7 >> 8; - --var17; + ++var4; // L: 2431 + var2 += var16; // L: 2432 + var7 += var8; // L: 2433 + var15 = var7 >> 8; // L: 2434 + --var17; // L: 2435 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2437 + if (var17 > 0) { // L: 2438 do { - if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) { // L: 2440 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2441 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 2443 + var2 += var16; // L: 2444 + --var17; // L: 2445 } while(var17 > 0); } } } else { - var23 = var5 - Rasterizer3D_clipMidX; - var9 += var23 * var12; - var10 += var13 * var23; - var11 += var23 * var14; - var22 = var11 >> 14; - if (var22 != 0) { - var18 = var9 / var22; - var19 = var10 / var22; + var23 = var5 - Rasterizer3D_clipMidX; // L: 2456 + var9 += var23 * var12; // L: 2457 + var10 += var13 * var23; // L: 2458 + var11 += var23 * var14; // L: 2459 + var22 = var11 >> 14; // L: 2460 + if (var22 != 0) { // L: 2461 + var18 = var9 / var22; // L: 2462 + var19 = var10 / var22; // L: 2463 } else { - var18 = 0; - var19 = 0; + var18 = 0; // L: 2466 + var19 = 0; // L: 2467 } - var9 += var17 * var12; - var10 += var13 * var17; - var11 += var17 * var14; - var22 = var11 >> 14; - if (var22 != 0) { - var20 = var9 / var22; - var21 = var10 / var22; + var9 += var17 * var12; // L: 2469 + var10 += var13 * var17; // L: 2470 + var11 += var17 * var14; // L: 2471 + var22 = var11 >> 14; // L: 2472 + if (var22 != 0) { // L: 2473 + var20 = var9 / var22; // L: 2474 + var21 = var10 / var22; // L: 2475 } else { - var20 = 0; - var21 = 0; + var20 = 0; // L: 2478 + var21 = 0; // L: 2479 } - var2 = (var18 << 18) + var19; - var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); - var17 >>= 3; - var8 <<= 3; - var15 = var7 >> 8; - if (field1809) { - if (var17 > 0) { + var2 = (var18 << 18) + var19; // L: 2481 + var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18); // L: 2482 + var17 >>= 3; // L: 2483 + var8 <<= 3; // L: 2484 + var15 = var7 >> 8; // L: 2485 + if (field1808) { // L: 2487 + if (var17 > 0) { // L: 2488 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - var7 += var8; - var15 = var7 >> 8; - --var17; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2490 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2491 + var2 += var16; // L: 2492 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2493 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2494 + var2 += var16; // L: 2495 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2496 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2497 + var2 += var16; // L: 2498 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2499 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2500 + var2 += var16; // L: 2501 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2502 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2503 + var2 += var16; // L: 2504 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2505 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2506 + var2 += var16; // L: 2507 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2508 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2509 + var2 += var16; // L: 2510 + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2511 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2512 + var2 += var16; // L: 2513 + var7 += var8; // L: 2514 + var15 = var7 >> 8; // L: 2515 + --var17; // L: 2516 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2518 + if (var17 > 0) { // L: 2519 do { - var3 = var1[(var2 & 16256) + (var2 >>> 25)]; - var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; - var2 += var16; - --var17; + var3 = var1[(var2 & 16256) + (var2 >>> 25)]; // L: 2521 + var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2522 + var2 += var16; // L: 2523 + --var17; // L: 2524 } while(var17 > 0); } } else { - if (var17 > 0) { + if (var17 > 0) { // L: 2528 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2530 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2531 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2533 + var2 += var16; // L: 2534 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2535 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2536 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2538 + var2 += var16; // L: 2539 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2540 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2541 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2543 + var2 += var16; // L: 2544 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2545 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2546 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2548 + var2 += var16; // L: 2549 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2550 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2551 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2553 + var2 += var16; // L: 2554 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2555 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2556 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2558 + var2 += var16; // L: 2559 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2560 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2561 } - ++var4; - var2 += var16; - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + ++var4; // L: 2563 + var2 += var16; // L: 2564 + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2565 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2566 } - ++var4; - var2 += var16; - var7 += var8; - var15 = var7 >> 8; - --var17; + ++var4; // L: 2568 + var2 += var16; // L: 2569 + var7 += var8; // L: 2570 + var15 = var7 >> 8; // L: 2571 + --var17; // L: 2572 } while(var17 > 0); } - var17 = var6 - var5 & 7; - if (var17 > 0) { + var17 = var6 - var5 & 7; // L: 2574 + if (var17 > 0) { // L: 2575 do { - if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { - var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; + if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) { // L: 2577 + var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8; // L: 2578 } - ++var4; - var2 += var16; - --var17; + ++var4; // L: 2580 + var2 += var16; // L: 2581 + --var17; // L: 2582 } while(var17 > 0); } } } } - } + } // L: 2586 - @ObfuscatedName("e") - static final int method3145(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { + @ObfuscatedName("r") + static final int method3134(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 2589 + if (var1 < 2) { // L: 2590 var1 = 2; - } else if (var1 > 126) { + } else if (var1 > 126) { // L: 2591 var1 = 126; } - return (var0 & 65408) + var1; + return (var0 & 65408) + var1; // L: 2592 + } + + @ObfuscatedName("u") + static final int method3129(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2596 + } + + @ObfuscatedName("p") + static final int method3130(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2600 + } + + @ObfuscatedName("b") + static final int method3131(int var0, int var1, int var2, int var3) { + return var0 * var2 - var3 * var1 >> 16; // L: 2604 } @ObfuscatedName("l") - static final int method3131(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; + static final int method3111(int var0, int var1, int var2, int var3) { + return var3 * var0 + var2 * var1 >> 16; // L: 2608 } - @ObfuscatedName("t") - static final int method3118(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; + @ObfuscatedName("e") + static final int method3132(int var0, int var1, int var2, int var3) { + return var0 * var2 + var3 * var1 >> 16; // L: 2612 } - @ObfuscatedName("x") - static final int method3158(int var0, int var1, int var2, int var3) { - return var0 * var2 - var3 * var1 >> 16; - } - - @ObfuscatedName("ah") - static final int method3134(int var0, int var1, int var2, int var3) { - return var3 * var0 + var2 * var1 >> 16; - } - - @ObfuscatedName("ai") - static final int method3135(int var0, int var1, int var2, int var3) { - return var0 * var2 + var3 * var1 >> 16; - } - - @ObfuscatedName("ao") - static final int method3136(int var0, int var1, int var2, int var3) { - return var2 * var1 - var3 * var0 >> 16; + @ObfuscatedName("ab") + static final int method3124(int var0, int var1, int var2, int var3) { + return var2 * var1 - var3 * var0 >> 16; // L: 2616 } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index 4354b9f0d9..a3cd07b733 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -3,1563 +3,1567 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dk") +@ObfuscatedName("dm") @Implements("RawPcmStream") public class RawPcmStream extends PcmStream { - @ObfuscatedName("m") + @ObfuscatedName("z") + int field1506; + @ObfuscatedName("k") int field1492; - @ObfuscatedName("o") - int field1491; - @ObfuscatedName("q") - int field1503; - @ObfuscatedName("j") - int field1493; - @ObfuscatedName("p") + @ObfuscatedName("s") int field1494; + @ObfuscatedName("t") + int field1503; + @ObfuscatedName("i") + int field1493; + @ObfuscatedName("o") + int field1497; + @ObfuscatedName("x") + int field1498; @ObfuscatedName("g") - int field1495; - @ObfuscatedName("n") - int field1496; - @ObfuscatedName("u") @Export("numLoops") int numLoops; - @ObfuscatedName("a") + @ObfuscatedName("m") @Export("start") int start; - @ObfuscatedName("z") + @ObfuscatedName("n") @Export("end") int end; - @ObfuscatedName("y") - boolean field1497; - @ObfuscatedName("c") - int field1501; + @ObfuscatedName("d") + boolean field1502; @ObfuscatedName("h") - int field1502; - @ObfuscatedName("k") - int field1490; - @ObfuscatedName("r") + int field1496; + @ObfuscatedName("a") int field1504; + @ObfuscatedName("q") + int field1505; + @ObfuscatedName("c") + int field1500; @ObfuscatedSignature( - descriptor = "(Ldp;III)V" + descriptor = "(Lde;III)V" ) RawPcmStream(RawSound var1, int var2, int var3, int var4) { - super.sound = var1; - this.start = var1.start; - this.end = var1.end; - this.field1497 = var1.field1423; - this.field1491 = var2; - this.field1503 = var3; - this.field1493 = var4; - this.field1492 = 0; - this.method2675(); - } + super.sound = var1; // L: 51 + this.start = var1.start; // L: 52 + this.end = var1.end; // L: 53 + this.field1502 = var1.field1417; // L: 54 + this.field1492 = var2; // L: 55 + this.field1494 = var3; // L: 56 + this.field1503 = var4; // L: 57 + this.field1506 = 0; // L: 58 + this.method2647(); // L: 59 + } // L: 60 @ObfuscatedSignature( - descriptor = "(Ldp;II)V" + descriptor = "(Lde;II)V" ) RawPcmStream(RawSound var1, int var2, int var3) { - super.sound = var1; - this.start = var1.start; - this.end = var1.end; - this.field1497 = var1.field1423; - this.field1491 = var2; - this.field1503 = var3; - this.field1493 = 8192; - this.field1492 = 0; - this.method2675(); - } + super.sound = var1; // L: 39 + this.start = var1.start; // L: 40 + this.end = var1.end; // L: 41 + this.field1502 = var1.field1417; // L: 42 + this.field1492 = var2; // L: 43 + this.field1494 = var3; // L: 44 + this.field1503 = 8192; // L: 45 + this.field1506 = 0; // L: 46 + this.method2647(); // L: 47 + } // L: 48 - @ObfuscatedName("p") - void method2675() { - this.field1494 = this.field1503; - this.field1495 = method2814(this.field1503, this.field1493); - this.field1496 = method2803(this.field1503, this.field1493); - } + @ObfuscatedName("i") + void method2647() { + this.field1493 = this.field1494; // L: 73 + this.field1497 = method2733(this.field1494, this.field1503); // L: 74 + this.field1498 = method2768(this.field1494, this.field1503); // L: 75 + } // L: 76 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "()Ldf;" + descriptor = "()Ldc;" ) @Export("firstSubStream") protected PcmStream firstSubStream() { - return null; + return null; // L: 200 } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "()Ldf;" + descriptor = "()Ldc;" ) @Export("nextSubStream") protected PcmStream nextSubStream() { - return null; + return null; // L: 204 } - @ObfuscatedName("u") - protected int vmethod4037() { - return this.field1503 == 0 && this.field1501 == 0 ? 0 : 1; + @ObfuscatedName("w") + protected int vmethod3987() { + return this.field1494 == 0 && this.field1496 == 0 ? 0 : 1; // L: 208 209 } - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("fill") public synchronized void fill(int[] var1, int var2, int var3) { - if (this.field1503 == 0 && this.field1501 == 0) { - this.skip(var3); + if (this.field1494 == 0 && this.field1496 == 0) { // L: 213 + this.skip(var3); // L: 214 } else { - RawSound var4 = (RawSound)super.sound; - int var5 = this.start << 8; - int var6 = this.end << 8; - int var7 = var4.samples.length << 8; - int var8 = var6 - var5; - if (var8 <= 0) { + RawSound var4 = (RawSound)super.sound; // L: 217 + int var5 = this.start << 8; // L: 218 + int var6 = this.end << 8; // L: 219 + int var7 = var4.samples.length << 8; // L: 220 + int var8 = var6 - var5; // L: 221 + if (var8 <= 0) { // L: 222 this.numLoops = 0; } - int var9 = var2; - var3 += var2; - if (this.field1492 < 0) { - if (this.field1491 <= 0) { - this.method2684(); - this.remove(); - return; + int var9 = var2; // L: 223 + var3 += var2; // L: 224 + if (this.field1506 < 0) { // L: 225 + if (this.field1492 <= 0) { // L: 226 + this.method2648(); // L: 228 + this.remove(); // L: 229 + return; // L: 230 } - this.field1492 = 0; + this.field1506 = 0; } - if (this.field1492 >= var7) { - if (this.field1491 >= 0) { - this.method2684(); - this.remove(); - return; + if (this.field1506 >= var7) { // L: 233 + if (this.field1492 >= 0) { // L: 234 + this.method2648(); // L: 236 + this.remove(); // L: 237 + return; // L: 238 } - this.field1492 = var7 - 1; + this.field1506 = var7 - 1; } - if (this.numLoops < 0) { - if (this.field1497) { - if (this.field1491 < 0) { - var9 = this.method2698(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1492 >= var5) { + if (this.numLoops < 0) { // L: 241 + if (this.field1502) { // L: 242 + if (this.field1492 < 0) { // L: 243 + var9 = this.method2664(var1, var2, var5, var3, var4.samples[this.start]); // L: 244 + if (this.field1506 >= var5) { // L: 245 return; } - this.field1492 = var5 + var5 - 1 - this.field1492; - this.field1491 = -this.field1491; + this.field1506 = var5 + var5 - 1 - this.field1506; // L: 246 + this.field1492 = -this.field1492; // L: 247 } while (true) { - var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1492 < var6) { + var9 = this.method2662(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 250 + if (this.field1506 < var6) { // L: 251 return; } - this.field1492 = var6 + var6 - 1 - this.field1492; - this.field1491 = -this.field1491; - var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1492 >= var5) { + this.field1506 = var6 + var6 - 1 - this.field1506; // L: 252 + this.field1492 = -this.field1492; // L: 253 + var9 = this.method2664(var1, var9, var5, var3, var4.samples[this.start]); // L: 254 + if (this.field1506 >= var5) { // L: 255 return; } - this.field1492 = var5 + var5 - 1 - this.field1492; - this.field1491 = -this.field1491; + this.field1506 = var5 + var5 - 1 - this.field1506; // L: 256 + this.field1492 = -this.field1492; // L: 257 } - } else if (this.field1491 < 0) { + } else if (this.field1492 < 0) { // L: 260 while (true) { - var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1492 >= var5) { + var9 = this.method2664(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 262 + if (this.field1506 >= var5) { // L: 263 return; } - this.field1492 = var6 - 1 - (var6 - 1 - this.field1492) % var8; + this.field1506 = var6 - 1 - (var6 - 1 - this.field1506) % var8; // L: 264 } } else { while (true) { - var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1492 < var6) { + var9 = this.method2662(var1, var9, var6, var3, var4.samples[this.start]); // L: 269 + if (this.field1506 < var6) { // L: 270 return; } - this.field1492 = var5 + (this.field1492 - var5) % var8; + this.field1506 = var5 + (this.field1506 - var5) % var8; // L: 271 } } } else { - if (this.numLoops > 0) { - if (this.field1497) { - label132: { - if (this.field1491 < 0) { - var9 = this.method2698(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1492 >= var5) { + if (this.numLoops > 0) { // L: 275 + if (this.field1502) { // L: 276 + label127: { + if (this.field1492 < 0) { // L: 277 + var9 = this.method2664(var1, var2, var5, var3, var4.samples[this.start]); // L: 278 + if (this.field1506 >= var5) { // L: 279 return; } - this.field1492 = var5 + var5 - 1 - this.field1492; - this.field1491 = -this.field1491; - if (--this.numLoops == 0) { - break label132; + this.field1506 = var5 + var5 - 1 - this.field1506; // L: 280 + this.field1492 = -this.field1492; // L: 281 + if (--this.numLoops == 0) { // L: 282 + break label127; } } do { - var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1492 < var6) { + var9 = this.method2662(var1, var9, var6, var3, var4.samples[this.end - 1]); // L: 285 + if (this.field1506 < var6) { // L: 286 return; } - this.field1492 = var6 + var6 - 1 - this.field1492; - this.field1491 = -this.field1491; - if (--this.numLoops == 0) { + this.field1506 = var6 + var6 - 1 - this.field1506; // L: 287 + this.field1492 = -this.field1492; // L: 288 + if (--this.numLoops == 0) { // L: 289 break; } - var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1492 >= var5) { + var9 = this.method2664(var1, var9, var5, var3, var4.samples[this.start]); // L: 290 + if (this.field1506 >= var5) { // L: 291 return; } - this.field1492 = var5 + var5 - 1 - this.field1492; - this.field1491 = -this.field1491; - } while(--this.numLoops != 0); + this.field1506 = var5 + var5 - 1 - this.field1506; // L: 292 + this.field1492 = -this.field1492; // L: 293 + } while(--this.numLoops != 0); // L: 294 } } else { int var10; - if (this.field1491 < 0) { + if (this.field1492 < 0) { // L: 297 while (true) { - var9 = this.method2698(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1492 >= var5) { + var9 = this.method2664(var1, var9, var5, var3, var4.samples[this.end - 1]); // L: 299 + if (this.field1506 >= var5) { // L: 300 return; } - var10 = (var6 - 1 - this.field1492) / var8; - if (var10 >= this.numLoops) { - this.field1492 += var8 * this.numLoops; - this.numLoops = 0; - break; + var10 = (var6 - 1 - this.field1506) / var8; // L: 301 + if (var10 >= this.numLoops) { // L: 302 + this.field1506 += var8 * this.numLoops; // L: 303 + this.numLoops = 0; // L: 304 + break; // L: 305 } - this.field1492 += var8 * var10; - this.numLoops -= var10; + this.field1506 += var8 * var10; // L: 307 + this.numLoops -= var10; // L: 308 } } else { while (true) { - var9 = this.method2697(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1492 < var6) { + var9 = this.method2662(var1, var9, var6, var3, var4.samples[this.start]); // L: 313 + if (this.field1506 < var6) { // L: 314 return; } - var10 = (this.field1492 - var5) / var8; - if (var10 >= this.numLoops) { - this.field1492 -= var8 * this.numLoops; - this.numLoops = 0; - break; + var10 = (this.field1506 - var5) / var8; // L: 315 + if (var10 >= this.numLoops) { // L: 316 + this.field1506 -= var8 * this.numLoops; // L: 317 + this.numLoops = 0; // L: 318 + break; // L: 319 } - this.field1492 -= var8 * var10; - this.numLoops -= var10; + this.field1506 -= var8 * var10; // L: 321 + this.numLoops -= var10; // L: 322 } } } } - if (this.field1491 < 0) { - this.method2698(var1, var9, 0, var3, 0); - if (this.field1492 < 0) { - this.field1492 = -1; - this.method2684(); - this.remove(); + if (this.field1492 < 0) { // L: 326 + this.method2664(var1, var9, 0, var3, 0); // L: 327 + if (this.field1506 < 0) { // L: 328 + this.field1506 = -1; // L: 329 + this.method2648(); // L: 330 + this.remove(); // L: 331 } } else { - this.method2697(var1, var9, var7, var3, 0); - if (this.field1492 >= var7) { - this.field1492 = var7; - this.method2684(); - this.remove(); + this.method2662(var1, var9, var7, var3, 0); // L: 335 + if (this.field1506 >= var7) { // L: 336 + this.field1506 = var7; // L: 337 + this.method2648(); // L: 338 + this.remove(); // L: 339 } } } } - } + } // L: 215 342 - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("setNumLoops") public synchronized void setNumLoops(int var1) { - this.numLoops = var1; - } + this.numLoops = var1; // L: 79 + } // L: 80 - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("skip") public synchronized void skip(int var1) { - if (this.field1501 > 0) { - if (var1 >= this.field1501) { - if (this.field1503 == Integer.MIN_VALUE) { - this.field1503 = 0; - this.field1496 = 0; - this.field1495 = 0; - this.field1494 = 0; - this.remove(); - var1 = this.field1501; + if (this.field1496 > 0) { // L: 345 + if (var1 >= this.field1496) { // L: 346 + if (this.field1494 == Integer.MIN_VALUE) { // L: 347 + this.field1494 = 0; // L: 348 + this.field1498 = 0; // L: 349 + this.field1497 = 0; // L: 350 + this.field1493 = 0; // L: 351 + this.remove(); // L: 352 + var1 = this.field1496; // L: 353 } - this.field1501 = 0; - this.method2675(); + this.field1496 = 0; // L: 355 + this.method2647(); // L: 356 } else { - this.field1494 += this.field1502 * var1; - this.field1495 += this.field1490 * var1; - this.field1496 += this.field1504 * var1; - this.field1501 -= var1; + this.field1493 += this.field1504 * var1; // L: 359 + this.field1497 += this.field1505 * var1; // L: 360 + this.field1498 += this.field1500 * var1; // L: 361 + this.field1496 -= var1; // L: 362 } } - RawSound var2 = (RawSound)super.sound; - int var3 = this.start << 8; - int var4 = this.end << 8; - int var5 = var2.samples.length << 8; - int var6 = var4 - var3; - if (var6 <= 0) { + RawSound var2 = (RawSound)super.sound; // L: 365 + int var3 = this.start << 8; // L: 366 + int var4 = this.end << 8; // L: 367 + int var5 = var2.samples.length << 8; // L: 368 + int var6 = var4 - var3; // L: 369 + if (var6 <= 0) { // L: 370 this.numLoops = 0; } - if (this.field1492 < 0) { - if (this.field1491 <= 0) { - this.method2684(); - this.remove(); - return; + if (this.field1506 < 0) { // L: 371 + if (this.field1492 <= 0) { // L: 372 + this.method2648(); // L: 374 + this.remove(); // L: 375 + return; // L: 376 } - this.field1492 = 0; + this.field1506 = 0; } - if (this.field1492 >= var5) { - if (this.field1491 >= 0) { - this.method2684(); - this.remove(); - return; + if (this.field1506 >= var5) { // L: 379 + if (this.field1492 >= 0) { // L: 380 + this.method2648(); // L: 382 + this.remove(); // L: 383 + return; // L: 384 } - this.field1492 = var5 - 1; + this.field1506 = var5 - 1; } - this.field1492 += this.field1491 * var1; - if (this.numLoops < 0) { - if (!this.field1497) { - if (this.field1491 < 0) { - if (this.field1492 >= var3) { + this.field1506 += this.field1492 * var1; // L: 387 + if (this.numLoops < 0) { // L: 388 + if (!this.field1502) { // L: 389 + if (this.field1492 < 0) { // L: 404 + if (this.field1506 >= var3) { // L: 405 return; } - this.field1492 = var4 - 1 - (var4 - 1 - this.field1492) % var6; + this.field1506 = var4 - 1 - (var4 - 1 - this.field1506) % var6; // L: 406 } else { - if (this.field1492 < var4) { + if (this.field1506 < var4) { // L: 409 return; } - this.field1492 = var3 + (this.field1492 - var3) % var6; + this.field1506 = var3 + (this.field1506 - var3) % var6; // L: 410 } } else { - if (this.field1491 < 0) { - if (this.field1492 >= var3) { + if (this.field1492 < 0) { // L: 390 + if (this.field1506 >= var3) { // L: 391 return; } - this.field1492 = var3 + var3 - 1 - this.field1492; - this.field1491 = -this.field1491; + this.field1506 = var3 + var3 - 1 - this.field1506; // L: 392 + this.field1492 = -this.field1492; // L: 393 } - while (this.field1492 >= var4) { - this.field1492 = var4 + var4 - 1 - this.field1492; - this.field1491 = -this.field1491; - if (this.field1492 >= var3) { + while (this.field1506 >= var4) { // L: 396 + this.field1506 = var4 + var4 - 1 - this.field1506; // L: 397 + this.field1492 = -this.field1492; // L: 398 + if (this.field1506 >= var3) { // L: 399 return; } - this.field1492 = var3 + var3 - 1 - this.field1492; - this.field1491 = -this.field1491; + this.field1506 = var3 + var3 - 1 - this.field1506; // L: 400 + this.field1492 = -this.field1492; // L: 401 } } } else { - if (this.numLoops > 0) { - if (this.field1497) { - label124: { - if (this.field1491 < 0) { - if (this.field1492 >= var3) { + if (this.numLoops > 0) { // L: 414 + if (this.field1502) { // L: 415 + label129: { + if (this.field1492 < 0) { // L: 416 + if (this.field1506 >= var3) { // L: 417 return; } - this.field1492 = var3 + var3 - 1 - this.field1492; - this.field1491 = -this.field1491; - if (--this.numLoops == 0) { - break label124; + this.field1506 = var3 + var3 - 1 - this.field1506; // L: 418 + this.field1492 = -this.field1492; // L: 419 + if (--this.numLoops == 0) { // L: 420 + break label129; } } do { - if (this.field1492 < var4) { + if (this.field1506 < var4) { // L: 423 return; } - this.field1492 = var4 + var4 - 1 - this.field1492; - this.field1491 = -this.field1491; - if (--this.numLoops == 0) { + this.field1506 = var4 + var4 - 1 - this.field1506; // L: 424 + this.field1492 = -this.field1492; // L: 425 + if (--this.numLoops == 0) { // L: 426 break; } - if (this.field1492 >= var3) { + if (this.field1506 >= var3) { // L: 427 return; } - this.field1492 = var3 + var3 - 1 - this.field1492; - this.field1491 = -this.field1491; - } while(--this.numLoops != 0); + this.field1506 = var3 + var3 - 1 - this.field1506; // L: 428 + this.field1492 = -this.field1492; // L: 429 + } while(--this.numLoops != 0); // L: 430 } } else { - int var7; - if (this.field1491 < 0) { - if (this.field1492 >= var3) { - return; + label161: { + int var7; + if (this.field1492 < 0) { // L: 433 + if (this.field1506 >= var3) { // L: 434 + return; + } + + var7 = (var4 - 1 - this.field1506) / var6; // L: 435 + if (var7 >= this.numLoops) { // L: 436 + this.field1506 += var6 * this.numLoops; // L: 437 + this.numLoops = 0; // L: 438 + break label161; // L: 439 + } + + this.field1506 += var6 * var7; // L: 441 + this.numLoops -= var7; // L: 442 + } else { + if (this.field1506 < var4) { // L: 445 + return; + } + + var7 = (this.field1506 - var3) / var6; // L: 446 + if (var7 >= this.numLoops) { // L: 447 + this.field1506 -= var6 * this.numLoops; // L: 448 + this.numLoops = 0; // L: 449 + break label161; // L: 450 + } + + this.field1506 -= var6 * var7; // L: 452 + this.numLoops -= var7; // L: 453 } - var7 = (var4 - 1 - this.field1492) / var6; - if (var7 < this.numLoops) { - this.field1492 += var6 * var7; - this.numLoops -= var7; - return; - } - - this.field1492 += var6 * this.numLoops; - this.numLoops = 0; - } else { - if (this.field1492 < var4) { - return; - } - - var7 = (this.field1492 - var3) / var6; - if (var7 < this.numLoops) { - this.field1492 -= var6 * var7; - this.numLoops -= var7; - return; - } - - this.field1492 -= var6 * this.numLoops; - this.numLoops = 0; + return; // L: 455 } } } - if (this.field1491 < 0) { - if (this.field1492 < 0) { - this.field1492 = -1; - this.method2684(); - this.remove(); + if (this.field1492 < 0) { // L: 457 + if (this.field1506 < 0) { // L: 458 + this.field1506 = -1; // L: 459 + this.method2648(); // L: 460 + this.remove(); // L: 461 } - } else if (this.field1492 >= var5) { - this.field1492 = var5; - this.method2684(); - this.remove(); + } else if (this.field1506 >= var5) { // L: 465 + this.field1506 = var5; // L: 466 + this.method2648(); // L: 467 + this.remove(); // L: 468 } } - } + } // L: 412 471 - @ObfuscatedName("y") - public synchronized void method2677(int var1) { - this.method2679(var1 << 6, this.method2710()); + @ObfuscatedName("d") + public synchronized void method2641(int var1) { + this.method2791(var1 << 6, this.method2675()); // L: 83 + } // L: 84 + + @ObfuscatedName("h") + synchronized void method2642(int var1) { + this.method2791(var1, this.method2675()); // L: 87 + } // L: 88 + + @ObfuscatedName("a") + synchronized void method2791(int var1, int var2) { + this.field1494 = var1; // L: 91 + this.field1503 = var2; // L: 92 + this.field1496 = 0; // L: 93 + this.method2647(); // L: 94 + } // L: 95 + + @ObfuscatedName("q") + public synchronized int method2644() { + return this.field1494 == Integer.MIN_VALUE ? 0 : this.field1494; // L: 98 } @ObfuscatedName("c") - synchronized void method2678(int var1) { - this.method2679(var1, this.method2710()); + public synchronized int method2675() { + return this.field1503 < 0 ? -1 : this.field1503; // L: 102 } - @ObfuscatedName("h") - synchronized void method2679(int var1, int var2) { - this.field1503 = var1; - this.field1493 = var2; - this.field1501 = 0; - this.method2675(); - } - - @ObfuscatedName("k") - public synchronized int method2680() { - return this.field1503 == Integer.MIN_VALUE ? 0 : this.field1503; - } - - @ObfuscatedName("r") - public synchronized int method2710() { - return this.field1493 < 0 ? -1 : this.field1493; - } - - @ObfuscatedName("d") - public synchronized void method2682(int var1) { - int var2 = ((RawSound)super.sound).samples.length << 8; - if (var1 < -1) { + @ObfuscatedName("j") + public synchronized void method2646(int var1) { + int var2 = ((RawSound)super.sound).samples.length << 8; // L: 106 + if (var1 < -1) { // L: 107 var1 = -1; } - if (var1 > var2) { + if (var1 > var2) { // L: 108 var1 = var2; } - this.field1492 = var1; - } + this.field1506 = var1; // L: 109 + } // L: 110 - @ObfuscatedName("e") + @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(Z)V", garbageValue = "1" ) - public synchronized void method2683() { - this.field1491 = (this.field1491 ^ this.field1491 >> 31) + (this.field1491 >>> 31); - this.field1491 = -this.field1491; - } + public synchronized void method2777() { + this.field1492 = (this.field1492 ^ this.field1492 >> 31) + (this.field1492 >>> 31); // L: 113 + this.field1492 = -this.field1492; // L: 114 + } // L: 115 - @ObfuscatedName("l") - void method2684() { - if (this.field1501 != 0) { - if (this.field1503 == Integer.MIN_VALUE) { - this.field1503 = 0; + @ObfuscatedName("u") + void method2648() { + if (this.field1496 != 0) { // L: 118 + if (this.field1494 == Integer.MIN_VALUE) { + this.field1494 = 0; // L: 119 } - this.field1501 = 0; - this.method2675(); + this.field1496 = 0; // L: 120 + this.method2647(); // L: 121 } - } + } // L: 123 - @ObfuscatedName("t") - public synchronized void method2685(int var1, int var2) { - this.method2775(var1, var2, this.method2710()); - } + @ObfuscatedName("p") + public synchronized void method2744(int var1, int var2) { + this.method2650(var1, var2, this.method2675()); // L: 126 + } // L: 127 - @ObfuscatedName("x") - public synchronized void method2775(int var1, int var2, int var3) { - if (var1 == 0) { - this.method2679(var2, var3); + @ObfuscatedName("b") + public synchronized void method2650(int var1, int var2, int var3) { + if (var1 == 0) { // L: 130 + this.method2791(var2, var3); // L: 131 } else { - int var4 = method2814(var2, var3); - int var5 = method2803(var2, var3); - if (var4 == this.field1495 && var5 == this.field1496) { - this.field1501 = 0; + int var4 = method2733(var2, var3); // L: 134 + int var5 = method2768(var2, var3); // L: 135 + if (var4 == this.field1497 && var5 == this.field1498) { // L: 136 + this.field1496 = 0; // L: 137 } else { - int var6 = var2 - this.field1494; - if (this.field1494 - var2 > var6) { - var6 = this.field1494 - var2; + int var6 = var2 - this.field1493; // L: 140 + if (this.field1493 - var2 > var6) { // L: 141 + var6 = this.field1493 - var2; } - if (var4 - this.field1495 > var6) { - var6 = var4 - this.field1495; + if (var4 - this.field1497 > var6) { // L: 142 + var6 = var4 - this.field1497; } - if (this.field1495 - var4 > var6) { - var6 = this.field1495 - var4; + if (this.field1497 - var4 > var6) { // L: 143 + var6 = this.field1497 - var4; } - if (var5 - this.field1496 > var6) { - var6 = var5 - this.field1496; + if (var5 - this.field1498 > var6) { + var6 = var5 - this.field1498; // L: 144 } - if (this.field1496 - var5 > var6) { - var6 = this.field1496 - var5; + if (this.field1498 - var5 > var6) { // L: 145 + var6 = this.field1498 - var5; } - if (var1 > var6) { + if (var1 > var6) { // L: 146 var1 = var6; } - this.field1501 = var1; - this.field1503 = var2; - this.field1493 = var3; - this.field1502 = (var2 - this.field1494) / var1; - this.field1490 = (var4 - this.field1495) / var1; - this.field1504 = (var5 - this.field1496) / var1; + this.field1496 = var1; // L: 147 + this.field1494 = var2; // L: 148 + this.field1503 = var3; // L: 149 + this.field1504 = (var2 - this.field1493) / var1; // L: 150 + this.field1505 = (var4 - this.field1497) / var1; // L: 151 + this.field1500 = (var5 - this.field1498) / var1; // L: 152 } } - } + } // L: 132 138 153 - @ObfuscatedName("ah") - public synchronized void method2732(int var1) { - if (var1 == 0) { - this.method2678(0); - this.remove(); - } else if (this.field1495 == 0 && this.field1496 == 0) { - this.field1501 = 0; - this.field1503 = 0; - this.field1494 = 0; - this.remove(); + @ObfuscatedName("l") + public synchronized void method2681(int var1) { + if (var1 == 0) { // L: 156 + this.method2642(0); // L: 157 + this.remove(); // L: 158 + } else if (this.field1497 == 0 && this.field1498 == 0) { // L: 161 + this.field1496 = 0; // L: 162 + this.field1494 = 0; // L: 163 + this.field1493 = 0; // L: 164 + this.remove(); // L: 165 } else { - int var2 = -this.field1494; - if (this.field1494 > var2) { - var2 = this.field1494; + int var2 = -this.field1493; // L: 168 + if (this.field1493 > var2) { // L: 169 + var2 = this.field1493; } - if (-this.field1495 > var2) { - var2 = -this.field1495; + if (-this.field1497 > var2) { // L: 170 + var2 = -this.field1497; } - if (this.field1495 > var2) { - var2 = this.field1495; + if (this.field1497 > var2) { // L: 171 + var2 = this.field1497; } - if (-this.field1496 > var2) { - var2 = -this.field1496; + if (-this.field1498 > var2) { // L: 172 + var2 = -this.field1498; } - if (this.field1496 > var2) { - var2 = this.field1496; + if (this.field1498 > var2) { // L: 173 + var2 = this.field1498; } - if (var1 > var2) { + if (var1 > var2) { // L: 174 var1 = var2; } - this.field1501 = var1; - this.field1503 = Integer.MIN_VALUE; - this.field1502 = -this.field1494 / var1; - this.field1490 = -this.field1495 / var1; - this.field1504 = -this.field1496 / var1; + this.field1496 = var1; // L: 175 + this.field1494 = Integer.MIN_VALUE; // L: 176 + this.field1504 = -this.field1493 / var1; // L: 177 + this.field1505 = -this.field1497 / var1; // L: 178 + this.field1500 = -this.field1498 / var1; // L: 179 } + } // L: 159 166 180 + + @ObfuscatedName("e") + public synchronized void method2652(int var1) { + if (this.field1492 < 0) { // L: 183 + this.field1492 = -var1; + } else { + this.field1492 = var1; // L: 184 + } + + } // L: 185 + + @ObfuscatedName("ab") + public synchronized int method2687() { + return this.field1492 < 0 ? -this.field1492 : this.field1492; // L: 188 } - @ObfuscatedName("ai") - public synchronized void method2688(int var1) { - if (this.field1491 < 0) { - this.field1491 = -var1; - } else { - this.field1491 = var1; - } - + @ObfuscatedName("ag") + public boolean method2654() { + return this.field1506 < 0 || this.field1506 >= ((RawSound)super.sound).samples.length << 8; // L: 192 } @ObfuscatedName("ao") - public synchronized int method2747() { - return this.field1491 < 0 ? -this.field1491 : this.field1491; + public boolean method2655() { + return this.field1496 != 0; // L: 196 } @ObfuscatedName("ae") - public boolean method2690() { - return this.field1492 < 0 || this.field1492 >= ((RawSound)super.sound).samples.length << 8; - } - - @ObfuscatedName("ax") - public boolean method2691() { - return this.field1501 != 0; - } - - @ObfuscatedName("an") - int method2697(int[] var1, int var2, int var3, int var4, int var5) { + int method2662(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field1501 > 0) { - int var6 = var2 + this.field1501; - if (var6 > var4) { + if (this.field1496 > 0) { // L: 474 + int var6 = var2 + this.field1496; // L: 475 + if (var6 > var4) { // L: 476 var6 = var4; } - this.field1501 += var2; - if (this.field1491 == 256 && (this.field1492 & 255) == 0) { - if (Messages.PcmPlayer_stereo) { - var2 = method2781(0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, this.field1490, this.field1504, 0, var6, var3, this); + this.field1496 += var2; // L: 477 + if (this.field1492 == 256 && (this.field1506 & 255) == 0) { // L: 478 + if (PcmPlayer.PcmPlayer_stereo) { // L: 479 + var2 = method2637(0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, this.field1505, this.field1500, 0, var6, var3, this); } else { - var2 = method2708(((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, this.field1502, 0, var6, var3, this); + var2 = method2672(((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, this.field1504, 0, var6, var3, this); // L: 480 } - } else if (Messages.PcmPlayer_stereo) { - var2 = method2738(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, this.field1490, this.field1504, 0, var6, var3, this, this.field1491, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 483 + var2 = method2759(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, this.field1505, this.field1500, 0, var6, var3, this, this.field1492, var5); } else { - var2 = method2712(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, this.field1502, 0, var6, var3, this, this.field1491, var5); + var2 = method2676(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, this.field1504, 0, var6, var3, this, this.field1492, var5); // L: 484 } - this.field1501 -= var2; - if (this.field1501 != 0) { + this.field1496 -= var2; // L: 486 + if (this.field1496 != 0) { // L: 487 return var2; } - if (!this.method2699()) { + if (!this.method2663()) { // L: 488 continue; } return var4; } - if (this.field1491 == 256 && (this.field1492 & 255) == 0) { - if (Messages.PcmPlayer_stereo) { - return method2742(0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, 0, var4, var3, this); + if (this.field1492 == 256 && (this.field1506 & 255) == 0) { // L: 490 + if (PcmPlayer.PcmPlayer_stereo) { // L: 491 + return method2685(0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, 0, var4, var3, this); } - return method2723(((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, 0, var4, var3, this); + return method2722(((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, 0, var4, var3, this); // L: 492 } - if (Messages.PcmPlayer_stereo) { - return method2705(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, 0, var4, var3, this, this.field1491, var5); + if (PcmPlayer.PcmPlayer_stereo) { // L: 495 + return method2669(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, 0, var4, var3, this, this.field1492, var5); } - return method2740(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, 0, var4, var3, this, this.field1491, var5); + return method2668(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, 0, var4, var3, this, this.field1492, var5); // L: 496 } } - @ObfuscatedName("av") - int method2698(int[] var1, int var2, int var3, int var4, int var5) { + @ObfuscatedName("ap") + int method2664(int[] var1, int var2, int var3, int var4, int var5) { while (true) { - if (this.field1501 > 0) { - int var6 = var2 + this.field1501; - if (var6 > var4) { + if (this.field1496 > 0) { // L: 501 + int var6 = var2 + this.field1496; // L: 502 + if (var6 > var4) { // L: 503 var6 = var4; } - this.field1501 += var2; - if (this.field1491 == -256 && (this.field1492 & 255) == 0) { - if (Messages.PcmPlayer_stereo) { - var2 = method2711(0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, this.field1490, this.field1504, 0, var6, var3, this); + this.field1496 += var2; // L: 504 + if (this.field1492 == -256 && (this.field1506 & 255) == 0) { // L: 505 + if (PcmPlayer.PcmPlayer_stereo) { // L: 506 + var2 = method2793(0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, this.field1505, this.field1500, 0, var6, var3, this); } else { - var2 = method2695(((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, this.field1502, 0, var6, var3, this); + var2 = method2674(((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, this.field1504, 0, var6, var3, this); // L: 507 } - } else if (Messages.PcmPlayer_stereo) { - var2 = method2672(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, this.field1490, this.field1504, 0, var6, var3, this, this.field1491, var5); + } else if (PcmPlayer.PcmPlayer_stereo) { // L: 510 + var2 = method2679(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, this.field1505, this.field1500, 0, var6, var3, this, this.field1492, var5); } else { - var2 = method2767(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, this.field1502, 0, var6, var3, this, this.field1491, var5); + var2 = method2678(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, this.field1504, 0, var6, var3, this, this.field1492, var5); // L: 511 } - this.field1501 -= var2; - if (this.field1501 != 0) { + this.field1496 -= var2; // L: 513 + if (this.field1496 != 0) { // L: 514 return var2; } - if (!this.method2699()) { + if (!this.method2663()) { // L: 515 continue; } return var4; } - if (this.field1491 == -256 && (this.field1492 & 255) == 0) { - if (Messages.PcmPlayer_stereo) { - return method2783(0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, 0, var4, var3, this); + if (this.field1492 == -256 && (this.field1506 & 255) == 0) { // L: 517 + if (PcmPlayer.PcmPlayer_stereo) { // L: 518 + return method2789(0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, 0, var4, var3, this); } - return method2702(((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, 0, var4, var3, this); + return method2666(((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, 0, var4, var3, this); // L: 519 } - if (Messages.PcmPlayer_stereo) { - return method2707(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1495, this.field1496, 0, var4, var3, this, this.field1491, var5); + if (PcmPlayer.PcmPlayer_stereo) { // L: 522 + return method2734(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1497, this.field1498, 0, var4, var3, this, this.field1492, var5); } - return method2706(0, 0, ((RawSound)super.sound).samples, var1, this.field1492, var2, this.field1494, 0, var4, var3, this, this.field1491, var5); + return method2753(0, 0, ((RawSound)super.sound).samples, var1, this.field1506, var2, this.field1493, 0, var4, var3, this, this.field1492, var5); // L: 523 } } - @ObfuscatedName("af") - int vmethod2840() { - int var1 = this.field1494 * 3 >> 6; - var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); - if (this.numLoops == 0) { - var1 -= var1 * this.field1492 / (((RawSound)super.sound).samples.length << 8); - } else if (this.numLoops >= 0) { - var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; - } - - return var1 > 255 ? 255 : var1; - } - - @ObfuscatedName("at") - boolean method2699() { - int var1 = this.field1503; + @ObfuscatedName("au") + boolean method2663() { + int var1 = this.field1494; // L: 528 int var2; int var3; - if (var1 == Integer.MIN_VALUE) { - var3 = 0; - var2 = 0; - var1 = 0; + if (var1 == Integer.MIN_VALUE) { // L: 531 + var3 = 0; // L: 532 + var2 = 0; // L: 533 + var1 = 0; // L: 534 } else { - var2 = method2814(var1, this.field1493); - var3 = method2803(var1, this.field1493); + var2 = method2733(var1, this.field1503); // L: 537 + var3 = method2768(var1, this.field1503); // L: 538 } - if (var1 == this.field1494 && var2 == this.field1495 && var3 == this.field1496) { - if (this.field1503 == Integer.MIN_VALUE) { - this.field1503 = 0; - this.field1496 = 0; - this.field1495 = 0; - this.field1494 = 0; - this.remove(); - return true; + if (var1 == this.field1493 && var2 == this.field1497 && var3 == this.field1498) { // L: 540 + if (this.field1494 == Integer.MIN_VALUE) { // L: 570 + this.field1494 = 0; // L: 571 + this.field1498 = 0; // L: 572 + this.field1497 = 0; // L: 573 + this.field1493 = 0; // L: 574 + this.remove(); // L: 575 + return true; // L: 576 } else { - this.method2675(); - return false; + this.method2647(); // L: 578 + return false; // L: 579 } } else { - if (this.field1494 < var1) { - this.field1502 = 1; - this.field1501 = var1 - this.field1494; - } else if (this.field1494 > var1) { - this.field1502 = -1; - this.field1501 = this.field1494 - var1; + if (this.field1493 < var1) { // L: 541 + this.field1504 = 1; // L: 542 + this.field1496 = var1 - this.field1493; // L: 543 + } else if (this.field1493 > var1) { // L: 545 + this.field1504 = -1; // L: 546 + this.field1496 = this.field1493 - var1; // L: 547 } else { - this.field1502 = 0; + this.field1504 = 0; // L: 549 } - if (this.field1495 < var2) { - this.field1490 = 1; - if (this.field1501 == 0 || this.field1501 > var2 - this.field1495) { - this.field1501 = var2 - this.field1495; + if (this.field1497 < var2) { // L: 550 + this.field1505 = 1; // L: 551 + if (this.field1496 == 0 || this.field1496 > var2 - this.field1497) { // L: 552 + this.field1496 = var2 - this.field1497; } - } else if (this.field1495 > var2) { - this.field1490 = -1; - if (this.field1501 == 0 || this.field1501 > this.field1495 - var2) { - this.field1501 = this.field1495 - var2; + } else if (this.field1497 > var2) { // L: 554 + this.field1505 = -1; // L: 555 + if (this.field1496 == 0 || this.field1496 > this.field1497 - var2) { // L: 556 + this.field1496 = this.field1497 - var2; } } else { - this.field1490 = 0; + this.field1505 = 0; // L: 558 } - if (this.field1496 < var3) { - this.field1504 = 1; - if (this.field1501 == 0 || this.field1501 > var3 - this.field1496) { - this.field1501 = var3 - this.field1496; + if (this.field1498 < var3) { // L: 559 + this.field1500 = 1; // L: 560 + if (this.field1496 == 0 || this.field1496 > var3 - this.field1498) { // L: 561 + this.field1496 = var3 - this.field1498; } - } else if (this.field1496 > var3) { - this.field1504 = -1; - if (this.field1501 == 0 || this.field1501 > this.field1496 - var3) { - this.field1501 = this.field1496 - var3; + } else if (this.field1498 > var3) { // L: 563 + this.field1500 = -1; // L: 564 + if (this.field1496 == 0 || this.field1496 > this.field1498 - var3) { // L: 565 + this.field1496 = this.field1498 - var3; } } else { - this.field1504 = 0; + this.field1500 = 0; // L: 567 } - return false; + return false; // L: 568 } } - @ObfuscatedName("m") - static int method2814(int var0, int var1) { - return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); - } - - @ObfuscatedName("o") - static int method2803(int var0, int var1) { - return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ldp;II)Ldk;" - ) - @Export("createRawPcmStream") - public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class237.field3113 * 100)), var2 << 6) : null; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Ldp;III)Ldk;" - ) - public static RawPcmStream method2674(RawSound var0, int var1, int var2, int var3) { - return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIILdk;)I" - ) - static int method2723(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { - var2 >>= 8; - var7 >>= 8; - var4 <<= 2; - if ((var5 = var3 + var7 - var2) > var6) { - var5 = var6; - } - - int var10001; - for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var10001 = var3++; - } - - for (var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { - var10001 = var3++; - } - - var8.field1492 = var2 << 8; - return var3; - } - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILdk;)I" - ) - static int method2742(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { - var3 >>= 8; - var9 >>= 8; - var5 <<= 2; - var6 <<= 2; - if ((var7 = var4 + var9 - var3) > var8) { - var7 = var8; + int vmethod2837() { + int var1 = this.field1493 * 3 >> 6; // L: 31 + var1 = (var1 ^ var1 >> 31) + (var1 >>> 31); // L: 32 + if (this.numLoops == 0) { // L: 33 + var1 -= var1 * this.field1506 / (((RawSound)super.sound).samples.length << 8); + } else if (this.numLoops >= 0) { + var1 -= var1 * this.start / ((RawSound)super.sound).samples.length; // L: 34 } - var4 <<= 1; - var7 <<= 1; - - int var10001; - byte var11; - for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - var2[var10001] += var11 * var6; - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - var2[var10001] += var11 * var6; - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - var2[var10001] += var11 * var6; - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - } - - for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; - } - - var10.field1492 = var3 << 8; - return var4 >> 1; + return var1 > 255 ? 255 : var1; // L: 35 } - @ObfuscatedName("az") + @ObfuscatedName("z") + static int method2733(int var0, int var1) { + return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D); // L: 23 + } + + @ObfuscatedName("k") + static int method2768(int var0, int var1) { + return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D); // L: 27 + } + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([B[IIIIIIILdk;)I" + descriptor = "(Lde;II)Ldm;" ) - static int method2702(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { - var2 >>= 8; - var7 >>= 8; - var4 <<= 2; - if ((var5 = var3 + var2 - (var7 - 1)) > var6) { + @Export("createRawPcmStream") + public static RawPcmStream createRawPcmStream(RawSound var0, int var1, int var2) { + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(PcmPlayer.field1447 * 100)), var2 << 6) : null; // L: 63 64 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lde;III)Ldm;" + ) + public static RawPcmStream method2638(RawSound var0, int var1, int var2, int var3) { + return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null; // L: 68 69 + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "([B[IIIIIIILdm;)I" + ) + static int method2722(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + var2 >>= 8; // L: 583 + var7 >>= 8; // L: 584 + var4 <<= 2; // L: 585 + if ((var5 = var3 + var7 - var2) > var6) { // L: 586 var5 = var6; } int var10001; - for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var10001 = var3++; + for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { // L: 587 588 + var10001 = var3++; // L: 589 + var1[var10001] += var0[var2++] * var4; + var10001 = var3++; // L: 590 + var1[var10001] += var0[var2++] * var4; + var10001 = var3++; // L: 591 + var1[var10001] += var0[var2++] * var4; + var10001 = var3++; // L: 592 } - for (var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { - var10001 = var3++; + for (var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) { // L: 594 595 + var10001 = var3++; // L: 596 } - var8.field1492 = var2 << 8; - return var3; + var8.field1506 = var2 << 8; // L: 598 + return var3; // L: 599 } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIILdk;)I" + descriptor = "(I[B[IIIIIIIILdm;)I" ) - static int method2783(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { - var3 >>= 8; - var9 >>= 8; - var5 <<= 2; - var6 <<= 2; - if ((var7 = var3 + var4 - (var9 - 1)) > var8) { + static int method2685(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + var3 >>= 8; // L: 603 + var9 >>= 8; // L: 604 + var5 <<= 2; // L: 605 + var6 <<= 2; // L: 606 + if ((var7 = var4 + var9 - var3) > var8) { // L: 607 var7 = var8; } - var4 <<= 1; - var7 <<= 1; + var4 <<= 1; // L: 608 + var7 <<= 1; // L: 609 int var10001; byte var11; - for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3--]; - var10001 = var4++; + for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 610 611 + var11 = var1[var3++]; // L: 612 + var10001 = var4++; // L: 613 var2[var10001] += var11 * var5; - var10001 = var4++; + var10001 = var4++; // L: 614 var2[var10001] += var11 * var6; - var11 = var1[var3--]; - var10001 = var4++; + var11 = var1[var3++]; // L: 615 + var10001 = var4++; // L: 616 var2[var10001] += var11 * var5; - var10001 = var4++; + var10001 = var4++; // L: 617 var2[var10001] += var11 * var6; - var11 = var1[var3--]; - var10001 = var4++; + var11 = var1[var3++]; // L: 618 + var10001 = var4++; // L: 619 var2[var10001] += var11 * var5; - var10001 = var4++; + var10001 = var4++; // L: 620 var2[var10001] += var11 * var6; - var11 = var1[var3--]; + var11 = var1[var3++]; // L: 621 var10001 = var4++; + var2[var10001] += var11 * var5; // L: 622 + var10001 = var4++; // L: 623 + } + + for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 625 626 629 + var11 = var1[var3++]; // L: 627 + var10001 = var4++; // L: 628 var2[var10001] += var11 * var5; var10001 = var4++; } - for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { - var11 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var11 * var5; - var10001 = var4++; + var10.field1506 = var3 << 8; // L: 631 + return var4 >> 1; // L: 632 + } + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "([B[IIIIIIILdm;)I" + ) + static int method2666(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, RawPcmStream var8) { + var2 >>= 8; // L: 636 + var7 >>= 8; // L: 637 + var4 <<= 2; // L: 638 + if ((var5 = var3 + var2 - (var7 - 1)) > var6) { // L: 639 + var5 = var6; } - var10.field1492 = var3 << 8; - return var4 >> 1; + int var10001; + for (var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { // L: 640 641 + var10001 = var3++; // L: 642 + var1[var10001] += var0[var2--] * var4; + var10001 = var3++; + var1[var10001] += var0[var2--] * var4; // L: 643 + var10001 = var3++; // L: 644 + var1[var10001] += var0[var2--] * var4; + var10001 = var3++; // L: 645 + } + + for (var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) { // L: 647 648 + var10001 = var3++; // L: 649 + } + + var8.field1506 = var2 << 8; // L: 651 + return var3; // L: 652 } @ObfuscatedName("ay") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILdk;II)I" + descriptor = "(I[B[IIIIIIIILdm;)I" ) - static int method2740(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { + static int method2789(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10) { + var3 >>= 8; // L: 656 + var9 >>= 8; // L: 657 + var5 <<= 2; // L: 658 + var6 <<= 2; // L: 659 + if ((var7 = var3 + var4 - (var9 - 1)) > var8) { // L: 660 var7 = var8; } - byte var13; + var4 <<= 1; // L: 661 + var7 <<= 1; // L: 662 + int var10001; - while (var5 < var7) { - var1 = var4 >> 8; - var13 = var2[var1]; - var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6; - var4 += var11; + byte var11; + for (var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 663 664 + var11 = var1[var3--]; // L: 665 + var10001 = var4++; // L: 666 + var2[var10001] += var11 * var5; + var10001 = var4++; // L: 667 + var2[var10001] += var11 * var6; + var11 = var1[var3--]; // L: 668 + var10001 = var4++; // L: 669 + var2[var10001] += var11 * var5; + var10001 = var4++; // L: 670 + var2[var10001] += var11 * var6; + var11 = var1[var3--]; // L: 671 + var10001 = var4++; // L: 672 + var2[var10001] += var11 * var5; + var10001 = var4++; // L: 673 + var2[var10001] += var11 * var6; + var11 = var1[var3--]; // L: 674 + var10001 = var4++; + var2[var10001] += var11 * var5; // L: 675 + var10001 = var4++; // L: 676 } - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { - var7 = var8; + for (var7 += 6; var4 < var7; var2[var10001] += var11 * var6) { // L: 678 679 682 + var11 = var1[var3--]; // L: 680 + var10001 = var4++; // L: 681 + var2[var10001] += var11 * var5; + var10001 = var4++; } - for (var1 = var12; var5 < var7; var4 += var11) { - var13 = var2[var4 >> 8]; - var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; - } - - var10.field1492 = var4; - return var5; - } - - @ObfuscatedName("au") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdk;II)I" - ) - static int method2705(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { - var8 = var9; - } - - var5 <<= 1; - - byte var14; - int var10001; - for (var8 <<= 1; var5 < var8; var4 += var12) { - var1 = var4 >> 8; - var14 = var2[var1]; - var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; - } - - if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { - var8 = var9; - } - - var8 <<= 1; - - for (var1 = var13; var5 < var8; var4 += var12) { - var14 = var2[var4 >> 8]; - var0 = (var14 << 8) + (var1 - var14) * (var4 & 255); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; - } - - var11.field1492 = var4; - return var5 >> 1; + var10.field1506 = var3 << 8; // L: 684 + return var4 >> 1; // L: 685 } @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIILdm;II)I" ) - static int method2706(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { - if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { + static int method2668(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) { // L: 689 var7 = var8; } + byte var13; int var10001; - while (var5 < var7) { - var1 = var4 >> 8; - byte var13 = var2[var1 - 1]; - var10001 = var5++; - var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6; - var4 += var11; + while (var5 < var7) { // L: 690 + var1 = var4 >> 8; // L: 691 + var13 = var2[var1]; // L: 692 + var10001 = var5++; // L: 693 + var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6; + var4 += var11; // L: 694 } - if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) { // L: 696 var7 = var8; } - var0 = var12; - - for (var1 = var11; var5 < var7; var4 += var1) { + for (var1 = var12; var5 < var7; var4 += var11) { // L: 697 698 701 + var13 = var2[var4 >> 8]; // L: 699 var10001 = var5++; - var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; + var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6; // L: 700 } - var10.field1492 = var4; - return var5; + var10.field1506 = var4; // L: 703 + return var5; // L: 704 } - @ObfuscatedName("bk") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIILdm;II)I" ) - static int method2707(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { + static int method2669(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 708 var8 = var9; } - var5 <<= 1; + var5 <<= 1; // L: 709 + + byte var14; + int var10001; + for (var8 <<= 1; var5 < var8; var4 += var12) { // L: 710 711 717 + var1 = var4 >> 8; // L: 712 + var14 = var2[var1]; // L: 713 + var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14); // L: 714 + var10001 = var5++; // L: 715 + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; // L: 716 + var3[var10001] += var0 * var7 >> 6; + } + + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) { // L: 719 + var8 = var9; + } + + var8 <<= 1; // L: 720 + + for (var1 = var13; var5 < var8; var4 += var12) { // L: 721 722 727 + var14 = var2[var4 >> 8]; // L: 723 + var0 = (var14 << 8) + (var1 - var14) * (var4 & 255); // L: 724 + var10001 = var5++; // L: 725 + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; // L: 726 + var3[var10001] += var0 * var7 >> 6; + } + + var11.field1506 = var4; // L: 729 + return var5 >> 1; // L: 730 + } + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIILdm;II)I" + ) + static int method2753(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, RawPcmStream var10, int var11, int var12) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) { // L: 734 + var7 = var8; + } int var10001; - for (var8 <<= 1; var5 < var8; var4 += var12) { - var1 = var4 >> 8; - byte var14 = var2[var1 - 1]; - var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8); - var10001 = var5++; - var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; - var3[var10001] += var0 * var7 >> 6; + while (var5 < var7) { // L: 735 + var1 = var4 >> 8; // L: 736 + byte var13 = var2[var1 - 1]; // L: 737 + var10001 = var5++; // L: 738 + var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6; + var4 += var11; // L: 739 } - if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { + if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) { // L: 741 + var7 = var8; + } + + var0 = var12; // L: 742 + + for (var1 = var11; var5 < var7; var4 += var1) { // L: 743 744 746 + var10001 = var5++; + var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; // L: 745 + } + + var10.field1506 = var4; // L: 748 + return var5; // L: 749 + } + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(II[B[IIIIIIIILdm;II)I" + ) + static int method2734(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 753 var8 = var9; } - var8 <<= 1; + var5 <<= 1; // L: 754 - for (var1 = var13; var5 < var8; var4 += var12) { - var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); - var10001 = var5++; + int var10001; + for (var8 <<= 1; var5 < var8; var4 += var12) { // L: 755 756 762 + var1 = var4 >> 8; // L: 757 + byte var14 = var2[var1 - 1]; // L: 758 + var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8); // L: 759 + var10001 = var5++; // L: 760 var3[var10001] += var0 * var6 >> 6; - var10001 = var5++; + var10001 = var5++; // L: 761 var3[var10001] += var0 * var7 >> 6; } - var11.field1492 = var4; - return var5 >> 1; + if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) { // L: 764 + var8 = var9; + } + + var8 <<= 1; // L: 765 + + for (var1 = var13; var5 < var8; var4 += var12) { // L: 766 767 771 + var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); // L: 768 + var10001 = var5++; // L: 769 + var3[var10001] += var0 * var6 >> 6; + var10001 = var5++; // L: 770 + var3[var10001] += var0 * var7 >> 6; + } + + var11.field1506 = var4; // L: 773 + return var5 >> 1; // L: 774 + } + + @ObfuscatedName("bl") + @ObfuscatedSignature( + descriptor = "([B[IIIIIIIILdm;)I" + ) + static int method2672(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + var2 >>= 8; // L: 778 + var8 >>= 8; // L: 779 + var4 <<= 2; // L: 780 + var5 <<= 2; // L: 781 + if ((var6 = var3 + var8 - var2) > var7) { // L: 782 + var6 = var7; + } + + var9.field1497 += var9.field1505 * (var6 - var3); // L: 783 + var9.field1498 += var9.field1500 * (var6 - var3); // L: 784 + + int var10001; + for (var6 -= 3; var3 < var6; var4 += var5) { // L: 785 786 794 + var10001 = var3++; // L: 787 + var1[var10001] += var0[var2++] * var4; + var4 += var5; // L: 788 + var10001 = var3++; // L: 789 + var1[var10001] += var0[var2++] * var4; + var4 += var5; // L: 790 + var10001 = var3++; // L: 791 + var1[var10001] += var0[var2++] * var4; + var4 += var5; // L: 792 + var10001 = var3++; // L: 793 + var1[var10001] += var0[var2++] * var4; + } + + for (var6 += 3; var3 < var6; var4 += var5) { // L: 796 797 799 + var10001 = var3++; // L: 798 + var1[var10001] += var0[var2++] * var4; + } + + var9.field1493 = var4 >> 2; // L: 801 + var9.field1506 = var2 << 8; // L: 802 + return var3; // L: 803 + } + + @ObfuscatedName("bc") + @ObfuscatedSignature( + descriptor = "(I[B[IIIIIIIIIILdm;)I" + ) + static int method2637(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + var3 >>= 8; // L: 807 + var11 >>= 8; // L: 808 + var5 <<= 2; // L: 809 + var6 <<= 2; // L: 810 + var7 <<= 2; // L: 811 + var8 <<= 2; // L: 812 + if ((var9 = var11 + var4 - var3) > var10) { // L: 813 + var9 = var10; + } + + var12.field1493 += var12.field1504 * (var9 - var4); // L: 814 + var4 <<= 1; // L: 815 + var9 <<= 1; // L: 816 + + byte var13; + int var10001; + for (var9 -= 6; var4 < var9; var6 += var8) { // L: 817 818 838 + var13 = var1[var3++]; // L: 819 + var10001 = var4++; // L: 820 + var2[var10001] += var13 * var5; + var5 += var7; // L: 821 + var10001 = var4++; // L: 822 + var2[var10001] += var13 * var6; + var6 += var8; // L: 823 + var13 = var1[var3++]; // L: 824 + var10001 = var4++; // L: 825 + var2[var10001] += var13 * var5; + var5 += var7; // L: 826 + var10001 = var4++; // L: 827 + var2[var10001] += var13 * var6; + var6 += var8; // L: 828 + var13 = var1[var3++]; // L: 829 + var10001 = var4++; // L: 830 + var2[var10001] += var13 * var5; + var5 += var7; // L: 831 + var10001 = var4++; // L: 832 + var2[var10001] += var13 * var6; + var6 += var8; // L: 833 + var13 = var1[var3++]; // L: 834 + var10001 = var4++; // L: 835 + var2[var10001] += var13 * var5; + var5 += var7; // L: 836 + var10001 = var4++; + var2[var10001] += var13 * var6; // L: 837 + } + + for (var9 += 6; var4 < var9; var6 += var8) { // L: 840 841 846 + var13 = var1[var3++]; // L: 842 + var10001 = var4++; // L: 843 + var2[var10001] += var13 * var5; + var5 += var7; // L: 844 + var10001 = var4++; // L: 845 + var2[var10001] += var13 * var6; + } + + var12.field1497 = var5 >> 2; // L: 848 + var12.field1498 = var6 >> 2; // L: 849 + var12.field1506 = var3 << 8; // L: 850 + return var4 >> 1; // L: 851 + } + + @ObfuscatedName("bz") + @ObfuscatedSignature( + descriptor = "([B[IIIIIIIILdm;)I" + ) + static int method2674(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { + var2 >>= 8; // L: 855 + var8 >>= 8; // L: 856 + var4 <<= 2; // L: 857 + var5 <<= 2; // L: 858 + if ((var6 = var3 + var2 - (var8 - 1)) > var7) { // L: 859 + var6 = var7; + } + + var9.field1497 += var9.field1505 * (var6 - var3); // L: 860 + var9.field1498 += var9.field1500 * (var6 - var3); // L: 861 + + int var10001; + for (var6 -= 3; var3 < var6; var4 += var5) { // L: 862 863 871 + var10001 = var3++; // L: 864 + var1[var10001] += var0[var2--] * var4; + var4 += var5; // L: 865 + var10001 = var3++; // L: 866 + var1[var10001] += var0[var2--] * var4; + var4 += var5; // L: 867 + var10001 = var3++; // L: 868 + var1[var10001] += var0[var2--] * var4; + var4 += var5; // L: 869 + var10001 = var3++; // L: 870 + var1[var10001] += var0[var2--] * var4; + } + + for (var6 += 3; var3 < var6; var4 += var5) { // L: 873 874 876 + var10001 = var3++; // L: 875 + var1[var10001] += var0[var2--] * var4; + } + + var9.field1493 = var4 >> 2; // L: 878 + var9.field1506 = var2 << 8; // L: 879 + return var3; // L: 880 + } + + @ObfuscatedName("bj") + @ObfuscatedSignature( + descriptor = "(I[B[IIIIIIIIIILdm;)I" + ) + static int method2793(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { + var3 >>= 8; // L: 884 + var11 >>= 8; // L: 885 + var5 <<= 2; // L: 886 + var6 <<= 2; // L: 887 + var7 <<= 2; // L: 888 + var8 <<= 2; // L: 889 + if ((var9 = var3 + var4 - (var11 - 1)) > var10) { // L: 890 + var9 = var10; + } + + var12.field1493 += var12.field1504 * (var9 - var4); // L: 891 + var4 <<= 1; // L: 892 + var9 <<= 1; // L: 893 + + byte var13; + int var10001; + for (var9 -= 6; var4 < var9; var6 += var8) { // L: 894 895 915 + var13 = var1[var3--]; // L: 896 + var10001 = var4++; // L: 897 + var2[var10001] += var13 * var5; + var5 += var7; // L: 898 + var10001 = var4++; // L: 899 + var2[var10001] += var13 * var6; + var6 += var8; // L: 900 + var13 = var1[var3--]; // L: 901 + var10001 = var4++; // L: 902 + var2[var10001] += var13 * var5; + var5 += var7; // L: 903 + var10001 = var4++; // L: 904 + var2[var10001] += var13 * var6; + var6 += var8; // L: 905 + var13 = var1[var3--]; // L: 906 + var10001 = var4++; // L: 907 + var2[var10001] += var13 * var5; + var5 += var7; // L: 908 + var10001 = var4++; // L: 909 + var2[var10001] += var13 * var6; + var6 += var8; // L: 910 + var13 = var1[var3--]; // L: 911 + var10001 = var4++; // L: 912 + var2[var10001] += var13 * var5; + var5 += var7; // L: 913 + var10001 = var4++; // L: 914 + var2[var10001] += var13 * var6; + } + + for (var9 += 6; var4 < var9; var6 += var8) { // L: 917 918 923 + var13 = var1[var3--]; // L: 919 + var10001 = var4++; // L: 920 + var2[var10001] += var13 * var5; + var5 += var7; // L: 921 + var10001 = var4++; // L: 922 + var2[var10001] += var13 * var6; + } + + var12.field1497 = var5 >> 2; // L: 925 + var12.field1498 = var6 >> 2; // L: 926 + var12.field1506 = var3 << 8; // L: 927 + return var4 >> 1; // L: 928 } @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILdk;)I" + descriptor = "(II[B[IIIIIIIILdm;II)I" ) - static int method2708(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { - var2 >>= 8; - var8 >>= 8; - var4 <<= 2; - var5 <<= 2; - if ((var6 = var3 + var8 - var2) > var7) { - var6 = var7; - } - - var9.field1495 += var9.field1490 * (var6 - var3); - var9.field1496 += var9.field1504 * (var6 - var3); - - int var10001; - for (var6 -= 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - } - - for (var6 += 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2++] * var4; - } - - var9.field1494 = var4 >> 2; - var9.field1492 = var2 << 8; - return var3; - } - - @ObfuscatedName("bg") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILdk;)I" - ) - static int method2781(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { - var3 >>= 8; - var11 >>= 8; - var5 <<= 2; - var6 <<= 2; - var7 <<= 2; - var8 <<= 2; - if ((var9 = var11 + var4 - var3) > var10) { - var9 = var10; - } - - var12.field1494 += var12.field1502 * (var9 - var4); - var4 <<= 1; - var9 <<= 1; - - byte var13; - int var10001; - for (var9 -= 6; var4 < var9; var6 += var8) { - var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - } - - for (var9 += 6; var4 < var9; var6 += var8) { - var13 = var1[var3++]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - } - - var12.field1495 = var5 >> 2; - var12.field1496 = var6 >> 2; - var12.field1492 = var3 << 8; - return var4 >> 1; - } - - @ObfuscatedName("be") - @ObfuscatedSignature( - descriptor = "([B[IIIIIIIILdk;)I" - ) - static int method2695(byte[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RawPcmStream var9) { - var2 >>= 8; - var8 >>= 8; - var4 <<= 2; - var5 <<= 2; - if ((var6 = var3 + var2 - (var8 - 1)) > var7) { - var6 = var7; - } - - var9.field1495 += var9.field1490 * (var6 - var3); - var9.field1496 += var9.field1504 * (var6 - var3); - - int var10001; - for (var6 -= 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - var4 += var5; - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - } - - for (var6 += 3; var3 < var6; var4 += var5) { - var10001 = var3++; - var1[var10001] += var0[var2--] * var4; - } - - var9.field1494 = var4 >> 2; - var9.field1492 = var2 << 8; - return var3; - } - - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "(I[B[IIIIIIIIIILdk;)I" - ) - static int method2711(int var0, byte[] var1, int[] var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, RawPcmStream var12) { - var3 >>= 8; - var11 >>= 8; - var5 <<= 2; - var6 <<= 2; - var7 <<= 2; - var8 <<= 2; - if ((var9 = var3 + var4 - (var11 - 1)) > var10) { - var9 = var10; - } - - var12.field1494 += var12.field1502 * (var9 - var4); - var4 <<= 1; - var9 <<= 1; - - byte var13; - int var10001; - for (var9 -= 6; var4 < var9; var6 += var8) { - var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - var6 += var8; - var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - } - - for (var9 += 6; var4 < var9; var6 += var8) { - var13 = var1[var3--]; - var10001 = var4++; - var2[var10001] += var13 * var5; - var5 += var7; - var10001 = var4++; - var2[var10001] += var13 * var6; - } - - var12.field1495 = var5 >> 2; - var12.field1496 = var6 >> 2; - var12.field1492 = var3 << 8; - return var4 >> 1; - } - - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdk;II)I" - ) - static int method2712(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field1495 -= var11.field1490 * var5; - var11.field1496 -= var11.field1504 * var5; - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { + static int method2676(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field1497 -= var11.field1505 * var5; // L: 932 + var11.field1498 -= var11.field1500 * var5; // L: 933 + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) { // L: 934 var8 = var9; } byte var14; int var10001; - while (var5 < var8) { - var1 = var4 >> 8; - var14 = var2[var1]; + while (var5 < var8) { // L: 935 + var1 = var4 >> 8; // L: 936 + var14 = var2[var1]; // L: 937 var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; - var6 += var7; - var4 += var12; + var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6; // L: 938 + var6 += var7; // L: 939 + var4 += var12; // L: 940 } - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) { // L: 942 var8 = var9; } - for (var1 = var13; var5 < var8; var4 += var12) { - var14 = var2[var4 >> 8]; - var10001 = var5++; + for (var1 = var13; var5 < var8; var4 += var12) { // L: 943 944 948 + var14 = var2[var4 >> 8]; // L: 945 + var10001 = var5++; // L: 946 var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6; - var6 += var7; + var6 += var7; // L: 947 } - var11.field1495 += var11.field1490 * var5; - var11.field1496 += var11.field1504 * var5; - var11.field1494 = var6; - var11.field1492 = var4; - return var5; + var11.field1497 += var11.field1505 * var5; // L: 950 + var11.field1498 += var11.field1500 * var5; // L: 951 + var11.field1493 = var6; // L: 952 + var11.field1506 = var4; // L: 953 + return var5; // L: 954 } - @ObfuscatedName("bd") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIIIILdm;II)I" ) - static int method2738(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field1494 -= var5 * var13.field1502; - if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { + static int method2759(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field1493 -= var5 * var13.field1504; // L: 958 + if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) { // L: 959 var10 = var11; } - var5 <<= 1; + var5 <<= 1; // L: 960 byte var16; int var10001; - for (var10 <<= 1; var5 < var10; var4 += var14) { - var1 = var4 >> 8; - var16 = var2[var1]; - var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16); - var10001 = var5++; + for (var10 <<= 1; var5 < var10; var4 += var14) { // L: 961 962 970 + var1 = var4 >> 8; // L: 963 + var16 = var2[var1]; // L: 964 + var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16); // L: 965 + var10001 = var5++; // L: 966 var3[var10001] += var0 * var6 >> 6; - var6 += var8; - var10001 = var5++; + var6 += var8; // L: 967 + var10001 = var5++; // L: 968 var3[var10001] += var0 * var7 >> 6; - var7 += var9; + var7 += var9; // L: 969 } - if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) { // L: 972 var10 = var11; } - var10 <<= 1; + var10 <<= 1; // L: 973 - for (var1 = var15; var5 < var10; var4 += var14) { - var16 = var2[var4 >> 8]; - var0 = (var16 << 8) + (var1 - var16) * (var4 & 255); - var10001 = var5++; + for (var1 = var15; var5 < var10; var4 += var14) { // L: 974 975 982 + var16 = var2[var4 >> 8]; // L: 976 + var0 = (var16 << 8) + (var1 - var16) * (var4 & 255); // L: 977 + var10001 = var5++; // L: 978 var3[var10001] += var0 * var6 >> 6; - var6 += var8; - var10001 = var5++; + var6 += var8; // L: 979 + var10001 = var5++; // L: 980 var3[var10001] += var0 * var7 >> 6; - var7 += var9; + var7 += var9; // L: 981 } - var5 >>= 1; - var13.field1494 += var13.field1502 * var5; - var13.field1495 = var6; - var13.field1496 = var7; - var13.field1492 = var4; - return var5; + var5 >>= 1; // L: 984 + var13.field1493 += var13.field1504 * var5; // L: 985 + var13.field1497 = var6; // L: 986 + var13.field1498 = var7; // L: 987 + var13.field1506 = var4; // L: 988 + return var5; // L: 989 } - @ObfuscatedName("bb") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIILdm;II)I" ) - static int method2767(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { - var11.field1495 -= var11.field1490 * var5; - var11.field1496 -= var11.field1504 * var5; - if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { + static int method2678(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, RawPcmStream var11, int var12, int var13) { + var11.field1497 -= var11.field1505 * var5; // L: 993 + var11.field1498 -= var11.field1500 * var5; // L: 994 + if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) { // L: 995 var8 = var9; } int var10001; - while (var5 < var8) { - var1 = var4 >> 8; - byte var14 = var2[var1 - 1]; + while (var5 < var8) { // L: 996 + var1 = var4 >> 8; // L: 997 + byte var14 = var2[var1 - 1]; // L: 998 var10001 = var5++; - var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; - var6 += var7; - var4 += var12; + var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6; // L: 999 + var6 += var7; // L: 1000 + var4 += var12; // L: 1001 } - if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { + if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) { // L: 1003 var8 = var9; } - var0 = var13; + var0 = var13; // L: 1004 - for (var1 = var12; var5 < var8; var4 += var1) { - var10001 = var5++; + for (var1 = var12; var5 < var8; var4 += var1) { // L: 1005 1006 1009 + var10001 = var5++; // L: 1007 var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6; - var6 += var7; + var6 += var7; // L: 1008 } - var11.field1495 += var11.field1490 * var5; - var11.field1496 += var11.field1504 * var5; - var11.field1494 = var6; - var11.field1492 = var4; - return var5; + var11.field1497 += var11.field1505 * var5; // L: 1011 + var11.field1498 += var11.field1500 * var5; // L: 1012 + var11.field1493 = var6; // L: 1013 + var11.field1506 = var4; // L: 1014 + return var5; // L: 1015 } - @ObfuscatedName("bw") + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "(II[B[IIIIIIIIIILdk;II)I" + descriptor = "(II[B[IIIIIIIIIILdm;II)I" ) - static int method2672(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { - var13.field1494 -= var5 * var13.field1502; - if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { + static int method2679(int var0, int var1, byte[] var2, int[] var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, RawPcmStream var13, int var14, int var15) { + var13.field1493 -= var5 * var13.field1504; // L: 1019 + if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) { // L: 1020 var10 = var11; } - var5 <<= 1; + var5 <<= 1; // L: 1021 int var10001; - for (var10 <<= 1; var5 < var10; var4 += var14) { - var1 = var4 >> 8; - byte var16 = var2[var1 - 1]; - var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8); - var10001 = var5++; + for (var10 <<= 1; var5 < var10; var4 += var14) { // L: 1022 1023 1031 + var1 = var4 >> 8; // L: 1024 + byte var16 = var2[var1 - 1]; // L: 1025 + var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8); // L: 1026 + var10001 = var5++; // L: 1027 var3[var10001] += var0 * var6 >> 6; - var6 += var8; - var10001 = var5++; + var6 += var8; // L: 1028 + var10001 = var5++; // L: 1029 var3[var10001] += var0 * var7 >> 6; - var7 += var9; + var7 += var9; // L: 1030 } - if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { + if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) { // L: 1033 var10 = var11; } - var10 <<= 1; + var10 <<= 1; // L: 1034 - for (var1 = var15; var5 < var10; var4 += var14) { - var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); - var10001 = var5++; + for (var1 = var15; var5 < var10; var4 += var14) { // L: 1035 1036 1042 + var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1); // L: 1037 + var10001 = var5++; // L: 1038 var3[var10001] += var0 * var6 >> 6; - var6 += var8; - var10001 = var5++; + var6 += var8; // L: 1039 + var10001 = var5++; // L: 1040 var3[var10001] += var0 * var7 >> 6; - var7 += var9; + var7 += var9; // L: 1041 } - var5 >>= 1; - var13.field1494 += var13.field1502 * var5; - var13.field1495 = var6; - var13.field1496 = var7; - var13.field1492 = var4; - return var5; + var5 >>= 1; // L: 1044 + var13.field1493 += var13.field1504 * var5; // L: 1045 + var13.field1497 = var6; // L: 1046 + var13.field1498 = var7; // L: 1047 + var13.field1506 = var4; // L: 1048 + return var5; // L: 1049 } } diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java index c3188df87b..7a15f61cdb 100644 --- a/runescape-client/src/main/java/RawSound.java +++ b/runescape-client/src/main/java/RawSound.java @@ -3,57 +3,57 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dp") +@ObfuscatedName("de") @Implements("RawSound") public class RawSound extends AbstractSound { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("sampleRate") public int sampleRate; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("samples") public byte[] samples; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("start") public int start; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("end") int end; - @ObfuscatedName("p") - public boolean field1423; + @ObfuscatedName("i") + public boolean field1417; RawSound(int var1, byte[] var2, int var3, int var4) { - this.sampleRate = var1; - this.samples = var2; - this.start = var3; - this.end = var4; - } + this.sampleRate = var1; // L: 13 + this.samples = var2; // L: 14 + this.start = var3; // L: 15 + this.end = var4; // L: 16 + } // L: 17 RawSound(int var1, byte[] var2, int var3, int var4, boolean var5) { - this.sampleRate = var1; - this.samples = var2; - this.start = var3; - this.end = var4; - this.field1423 = var5; - } + this.sampleRate = var1; // L: 20 + this.samples = var2; // L: 21 + this.start = var3; // L: 22 + this.end = var4; // L: 23 + this.field1417 = var5; // L: 24 + } // L: 25 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ldv;)Ldp;" + descriptor = "(Ldf;)Lde;" ) @Export("resample") public RawSound resample(Decimator var1) { - this.samples = var1.resample(this.samples); - this.sampleRate = var1.scaleRate(this.sampleRate); - if (this.start == this.end) { + this.samples = var1.resample(this.samples); // L: 28 + this.sampleRate = var1.scaleRate(this.sampleRate); // L: 29 + if (this.start == this.end) { // L: 30 this.start = this.end = var1.scalePosition(this.start); } else { - this.start = var1.scalePosition(this.start); - this.end = var1.scalePosition(this.end); - if (this.start == this.end) { + this.start = var1.scalePosition(this.start); // L: 32 + this.end = var1.scalePosition(this.end); // L: 33 + if (this.start == this.end) { // L: 34 --this.start; } } - return this; + return this; // L: 36 } } diff --git a/runescape-client/src/main/java/ReflectionCheck.java b/runescape-client/src/main/java/ReflectionCheck.java index 02e81c0691..852fc2a885 100644 --- a/runescape-client/src/main/java/ReflectionCheck.java +++ b/runescape-client/src/main/java/ReflectionCheck.java @@ -5,99 +5,85 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dm") +@ObfuscatedName("dv") @Implements("ReflectionCheck") public class ReflectionCheck extends Node { - @ObfuscatedName("m") - @Export("arguments") - byte[][][] arguments; - @ObfuscatedName("o") + @ObfuscatedName("aw") @ObfuscatedGetter( - intValue = -1835332677 + intValue = 1592667411 + ) + static int field1364; + @ObfuscatedName("go") + @ObfuscatedSignature( + descriptor = "[Lls;" + ) + @Export("mapSceneSprites") + static IndexedSprite[] mapSceneSprites; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -1209180911 ) @Export("id") int id; - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -514712003 + intValue = -2142089503 ) @Export("size") int size; - @ObfuscatedName("j") + @ObfuscatedName("s") @Export("operations") int[] operations; - @ObfuscatedName("p") + @ObfuscatedName("t") @Export("creationErrors") int[] creationErrors; - @ObfuscatedName("g") + @ObfuscatedName("i") @Export("fields") Field[] fields; - @ObfuscatedName("n") + @ObfuscatedName("o") @Export("intReplaceValues") int[] intReplaceValues; - @ObfuscatedName("u") + @ObfuscatedName("x") @Export("methods") Method[] methods; + @ObfuscatedName("w") + @Export("arguments") + byte[][][] arguments; ReflectionCheck() { - } + } // L: 17 - @ObfuscatedName("h") + @ObfuscatedName("jn") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1841893741" + descriptor = "(I)V", + garbageValue = "947123708" ) - static int method2418(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - if (var0 == ScriptOpcodes.CC_GETSCROLLX) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.text; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollWidth; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.scrollHeight; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelZoom; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleZ; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyTop; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.transparencyBot; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.color2; - return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); - return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; - return 1; + static final void method2380() { + Client.field871 = Client.cycleCntr; // L: 10682 + class8.ClanChat_inClanChat = true; // L: 10683 + } // L: 10684 + + @ObfuscatedName("kp") + @ObfuscatedSignature( + descriptor = "(Lhq;I)Lhq;", + garbageValue = "-697509377" + ) + static Widget method2381(Widget var0) { + int var2 = WorldMapIcon_0.getWidgetFlags(var0); // L: 10718 + int var1 = var2 >> 17 & 7; // L: 10720 + int var3 = var1; // L: 10722 + if (var1 == 0) { // L: 10723 + return null; } else { - return 2; + for (int var4 = 0; var4 < var3; ++var4) { // L: 10724 + var0 = TileItem.getWidget(var0.parentId); // L: 10725 + if (var0 == null) { // L: 10726 + return null; + } + } + + return var0; // L: 10728 } } } diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java index 1d3d81a34e..71be4448d1 100644 --- a/runescape-client/src/main/java/RouteStrategy.java +++ b/runescape-client/src/main/java/RouteStrategy.java @@ -4,48 +4,96 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ga") +@ObfuscatedName("gk") @Implements("RouteStrategy") public abstract class RouteStrategy { - @ObfuscatedName("r") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 193339833 - ) - @Export("cacheGamebuild") - static int cacheGamebuild; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -508607035 + intValue = 1047579843 ) @Export("approxDestinationX") public int approxDestinationX; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1154057799 + intValue = -1846311175 ) @Export("approxDestinationY") public int approxDestinationY; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1924382877 + intValue = -1025962081 ) @Export("approxDestinationSizeX") public int approxDestinationSizeX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 399050389 + intValue = -881860999 ) @Export("approxDestinationSizeY") public int approxDestinationSizeY; protected RouteStrategy() { - } + } // L: 9 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIILfz;I)Z", - garbageValue = "-1966963917" + descriptor = "(IIILft;I)Z", + garbageValue = "-1274441547" ) @Export("hasArrived") protected abstract boolean hasArrived(int var1, int var2, int var3, CollisionMap var4); + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lic;Lic;III)Lkr;", + garbageValue = "87805054" + ) + public static Font method3688(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + byte[] var5 = var0.takeFile(var2, var3); // L: 111 + boolean var4; + if (var5 == null) { // L: 112 + var4 = false; // L: 113 + } else { + Occluder.SpriteBuffer_decode(var5); // L: 116 + var4 = true; // L: 117 + } + + if (!var4) { // L: 119 + return null; + } else { + byte[] var6 = var1.takeFile(var2, var3); // L: 121 + Font var8; + if (var6 == null) { // L: 123 + var8 = null; // L: 124 + } else { + Font var7 = new Font(var6, Username.SpriteBuffer_xOffsets, class335.SpriteBuffer_yOffsets, class335.SpriteBuffer_spriteWidths, class335.SpriteBuffer_spriteHeights, TaskHandler.SpriteBuffer_spritePalette, class92.SpriteBuffer_pixels); // L: 127 + Username.SpriteBuffer_xOffsets = null; // L: 129 + class335.SpriteBuffer_yOffsets = null; // L: 130 + class335.SpriteBuffer_spriteWidths = null; // L: 131 + class335.SpriteBuffer_spriteHeights = null; // L: 132 + TaskHandler.SpriteBuffer_spritePalette = null; // L: 133 + class92.SpriteBuffer_pixels = null; // L: 134 + var8 = var7; // L: 136 + } + + return var8; // L: 138 + } + } + + @ObfuscatedName("fv") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1480468521" + ) + @Export("playPcmPlayers") + static final void playPcmPlayers() { + if (IntHashTable.pcmPlayer1 != null) { // L: 3254 + IntHashTable.pcmPlayer1.run(); + } + + if (WorldMapManager.pcmPlayer0 != null) { // L: 3255 + WorldMapManager.pcmPlayer0.run(); + } + + } // L: 3256 } diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java index dbacc962c8..2a76621cf8 100644 --- a/runescape-client/src/main/java/RunException.java +++ b/runescape-client/src/main/java/RunException.java @@ -1,39 +1,26 @@ import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mr") +@ObfuscatedName("me") @Implements("RunException") public class RunException extends RuntimeException { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("RunException_applet") public static Applet RunException_applet; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("localPlayerName") public static String localPlayerName; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 2064059247 - ) - @Export("RunException_revision") - public static int RunException_revision; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 810638289 - ) - @Export("clientType") - public static int clientType; - @ObfuscatedName("p") + @ObfuscatedName("o") @Export("message") String message; - @ObfuscatedName("g") + @ObfuscatedName("x") @Export("throwable") Throwable throwable; RunException(Throwable var1, String var2) { - this.message = var2; - this.throwable = var1; - } + this.message = var2; // L: 27 + this.throwable = var1; // L: 28 + } // L: 29 } diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 5b0906d3d3..748142113b 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -3,52 +3,52 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("em") +@ObfuscatedName("ec") @Implements("Scene") public class Scene { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("Scene_isLowDetail") public static boolean Scene_isLowDetail; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("tileUpdateCount") static int tileUpdateCount; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("Scene_plane") static int Scene_plane; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("Scene_drawnCount") static int Scene_drawnCount; - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("Scene_cameraXTileMin") static int Scene_cameraXTileMin; - @ObfuscatedName("d") + @ObfuscatedName("v") @Export("Scene_cameraXTileMax") static int Scene_cameraXTileMax; - @ObfuscatedName("e") + @ObfuscatedName("j") @Export("Scene_cameraYTileMin") static int Scene_cameraYTileMin; - @ObfuscatedName("l") + @ObfuscatedName("r") @Export("Scene_cameraYTileMax") static int Scene_cameraYTileMax; - @ObfuscatedName("t") + @ObfuscatedName("u") @Export("Scene_cameraXTile") static int Scene_cameraXTile; - @ObfuscatedName("x") + @ObfuscatedName("p") @Export("Scene_cameraYTile") static int Scene_cameraYTile; @ObfuscatedName("b") @Export("Scene_cameraX") static int Scene_cameraX; - @ObfuscatedName("i") + @ObfuscatedName("l") @Export("Scene_cameraY") static int Scene_cameraY; - @ObfuscatedName("f") + @ObfuscatedName("e") @Export("Scene_cameraZ") static int Scene_cameraZ; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @Export("Scene_cameraPitchSine") static int Scene_cameraPitchSine; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @Export("Scene_cameraPitchCosine") static int Scene_cameraPitchCosine; @ObfuscatedName("ao") @@ -57,904 +57,902 @@ public class Scene { @ObfuscatedName("ae") @Export("Scene_cameraYawCosine") static int Scene_cameraYawCosine; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedSignature( - descriptor = "[Lev;" + descriptor = "[Led;" ) @Export("gameObjects") static GameObject[] gameObjects; - @ObfuscatedName("ag") + @ObfuscatedName("am") @Export("checkClick") static boolean checkClick; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @Export("Scene_selectedPlane") static int Scene_selectedPlane; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("Scene_selectedScreenX") static int Scene_selectedScreenX; - @ObfuscatedName("ak") + @ObfuscatedName("aa") @Export("Scene_selectedScreenY") static int Scene_selectedScreenY; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @Export("Scene_selectedX") public static int Scene_selectedX; - @ObfuscatedName("as") + @ObfuscatedName("at") @Export("Scene_selectedY") public static int Scene_selectedY; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("viewportWalking") static boolean viewportWalking; - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("Scene_planesCount") static int Scene_planesCount; - @ObfuscatedName("ac") + @ObfuscatedName("ax") @Export("Scene_planeOccluderCounts") static int[] Scene_planeOccluderCounts; - @ObfuscatedName("av") + @ObfuscatedName("as") @ObfuscatedSignature( descriptor = "[[Lew;" ) @Export("Scene_planeOccluders") static Occluder[][] Scene_planeOccluders; - @ObfuscatedName("af") + @ObfuscatedName("az") @Export("Scene_currentOccludersCount") static int Scene_currentOccludersCount; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedSignature( descriptor = "[Lew;" ) @Export("Scene_currentOccluders") static Occluder[] Scene_currentOccluders; - @ObfuscatedName("aa") + @ObfuscatedName("ai") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("Scene_tilesDeque") static NodeDeque Scene_tilesDeque; - @ObfuscatedName("aw") - static final int[] field1874; - @ObfuscatedName("az") - static final int[] field1875; - @ObfuscatedName("aq") - static final int[] field1876; @ObfuscatedName("ay") - static final int[] field1862; - @ObfuscatedName("au") - static final int[] field1834; + static final int[] field1874; @ObfuscatedName("aj") - static final int[] field1829; - @ObfuscatedName("bk") - static final int[] field1880; - @ObfuscatedName("bb") + static final int[] field1851; + @ObfuscatedName("aw") + static final int[] field1869; + @ObfuscatedName("af") + static final int[] field1881; + @ObfuscatedName("ak") + static final int[] field1882; + @ObfuscatedName("ac") + static final int[] field1883; + @ObfuscatedName("bl") + static final int[] field1884; + @ObfuscatedName("br") @Export("visibilityMap") static boolean[][][][] visibilityMap; - @ObfuscatedName("bw") + @ObfuscatedName("bp") @Export("visibleTiles") static boolean[][] visibleTiles; - @ObfuscatedName("bq") + @ObfuscatedName("bn") @Export("Scene_viewportXCenter") static int Scene_viewportXCenter; - @ObfuscatedName("bn") + @ObfuscatedName("bw") @Export("Scene_viewportYCenter") static int Scene_viewportYCenter; - @ObfuscatedName("bc") + @ObfuscatedName("be") @Export("Scene_viewportXMin") static int Scene_viewportXMin; - @ObfuscatedName("bo") + @ObfuscatedName("bu") @Export("Scene_viewportYMin") static int Scene_viewportYMin; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @Export("Scene_viewportXMax") static int Scene_viewportXMax; @ObfuscatedName("bm") @Export("Scene_viewportYMax") static int Scene_viewportYMax; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("planes") int planes; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("xSize") int xSize; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("ySize") int ySize; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("tileHeights") int[][][] tileHeights; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[[[Lea;" + descriptor = "[[[Lek;" ) @Export("tiles") Tile[][][] tiles; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("minPlane") int minPlane; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("tempGameObjectsCount") int tempGameObjectsCount; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[Lev;" + descriptor = "[Led;" ) @Export("tempGameObjects") GameObject[] tempGameObjects; - @ObfuscatedName("z") - int[][][] field1839; - @ObfuscatedName("ba") + @ObfuscatedName("m") + int[][][] field1841; + @ObfuscatedName("bi") @Export("tileShape2D") int[][] tileShape2D; - @ObfuscatedName("bd") + @ObfuscatedName("bg") @Export("tileRotation2D") int[][] tileRotation2D; static { - Scene_isLowDetail = true; - tileUpdateCount = 0; - Scene_plane = 0; - gameObjects = new GameObject[100]; - checkClick = false; - Scene_selectedPlane = 0; - Scene_selectedScreenX = 0; - Scene_selectedScreenY = 0; - Scene_selectedX = -1; - Scene_selectedY = -1; - viewportWalking = false; - Scene_planesCount = 4; - Scene_planeOccluderCounts = new int[Scene_planesCount]; - Scene_planeOccluders = new Occluder[Scene_planesCount][500]; - Scene_currentOccludersCount = 0; - Scene_currentOccluders = new Occluder[500]; - Scene_tilesDeque = new NodeDeque(); - field1874 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; - field1875 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; - field1876 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; - field1862 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - field1834 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - field1829 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; - field1880 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; - visibilityMap = new boolean[8][32][51][51]; + Scene_isLowDetail = true; // L: 8 + tileUpdateCount = 0; // L: 22 + Scene_plane = 0; // L: 23 + gameObjects = new GameObject[100]; // L: 38 + checkClick = false; // L: 39 + Scene_selectedPlane = 0; // L: 40 + Scene_selectedScreenX = 0; // L: 41 + Scene_selectedScreenY = 0; // L: 42 + Scene_selectedX = -1; // L: 43 + Scene_selectedY = -1; // L: 44 + viewportWalking = false; // L: 45 + Scene_planesCount = 4; // L: 48 + Scene_planeOccluderCounts = new int[Scene_planesCount]; // L: 49 + Scene_planeOccluders = new Occluder[Scene_planesCount][500]; // L: 50 + Scene_currentOccludersCount = 0; // L: 51 + Scene_currentOccluders = new Occluder[500]; // L: 52 + Scene_tilesDeque = new NodeDeque(); // L: 53 + field1874 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76}; // L: 54 + field1851 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160}; // L: 55 + field1869 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19}; // L: 56 + field1881 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; // L: 57 + field1882 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; // L: 58 + field1883 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0}; // L: 59 + field1884 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8}; // L: 60 + visibilityMap = new boolean[8][32][51][51]; // L: 86 } public Scene(int var1, int var2, int var3, int[][][] var4) { - this.minPlane = 0; - this.tempGameObjectsCount = 0; - this.tempGameObjects = new GameObject[5000]; - this.tileShape2D = 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}}; - this.tileRotation2D = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; - this.planes = var1; - this.xSize = var2; - this.ySize = var3; - this.tiles = new Tile[var1][var2][var3]; - this.field1839 = new int[var1][var2 + 1][var3 + 1]; - this.tileHeights = var4; - this.clear(); - } + this.minPlane = 0; // L: 14 + this.tempGameObjectsCount = 0; // L: 15 + this.tempGameObjects = new GameObject[5000]; // L: 16 + this.tileShape2D = 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}}; // L: 65 + this.tileRotation2D = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; // L: 80 + this.planes = var1; // L: 96 + this.xSize = var2; // L: 97 + this.ySize = var3; // L: 98 + this.tiles = new Tile[var1][var2][var3]; // L: 99 + this.field1841 = new int[var1][var2 + 1][var3 + 1]; // L: 100 + this.tileHeights = var4; // L: 101 + this.clear(); // L: 102 + } // L: 103 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("clear") public void clear() { int var1; int var2; - for (var1 = 0; var1 < this.planes; ++var1) { - for (var2 = 0; var2 < this.xSize; ++var2) { - for (int var3 = 0; var3 < this.ySize; ++var3) { + for (var1 = 0; var1 < this.planes; ++var1) { // L: 106 + for (var2 = 0; var2 < this.xSize; ++var2) { // L: 107 + for (int var3 = 0; var3 < this.ySize; ++var3) { // L: 108 this.tiles[var1][var2][var3] = null; } } } - for (var1 = 0; var1 < Scene_planesCount; ++var1) { - for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { + for (var1 = 0; var1 < Scene_planesCount; ++var1) { // L: 111 + for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) { // L: 112 Scene_planeOccluders[var1][var2] = null; } - Scene_planeOccluderCounts[var1] = 0; + Scene_planeOccluderCounts[var1] = 0; // L: 113 } - for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { - this.tempGameObjects[var1] = null; + for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 115 + this.tempGameObjects[var1] = null; // L: 116 } - this.tempGameObjectsCount = 0; + this.tempGameObjectsCount = 0; // L: 118 - for (var1 = 0; var1 < gameObjects.length; ++var1) { + for (var1 = 0; var1 < gameObjects.length; ++var1) { // L: 119 gameObjects[var1] = null; } - } + } // L: 120 - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("init") public void init(int var1) { - this.minPlane = var1; + this.minPlane = var1; // L: 123 - for (int var2 = 0; var2 < this.xSize; ++var2) { - for (int var3 = 0; var3 < this.ySize; ++var3) { - if (this.tiles[var1][var2][var3] == null) { + for (int var2 = 0; var2 < this.xSize; ++var2) { // L: 124 + for (int var3 = 0; var3 < this.ySize; ++var3) { // L: 125 + if (this.tiles[var1][var2][var3] == null) { // L: 126 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } } } - } + } // L: 129 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("setLinkBelow") public void setLinkBelow(int var1, int var2) { - Tile var3 = this.tiles[0][var1][var2]; + Tile var3 = this.tiles[0][var1][var2]; // L: 132 - for (int var4 = 0; var4 < 3; ++var4) { - Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; - if (var5 != null) { - --var5.plane; + for (int var4 = 0; var4 < 3; ++var4) { // L: 133 + Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2]; // L: 134 + if (var5 != null) { // L: 135 + --var5.plane; // L: 136 - for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { - GameObject var7 = var5.gameObjects[var6]; - if (FloorDecoration.method2977(var7.tag) && var7.startX == var1 && var2 == var7.startY) { + for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) { // L: 137 + GameObject var7 = var5.gameObjects[var6]; // L: 138 + if (Tiles.method1191(var7.tag) && var7.startX == var1 && var2 == var7.startY) { // L: 139 --var7.plane; } } } } - if (this.tiles[0][var1][var2] == null) { + if (this.tiles[0][var1][var2] == null) { // L: 143 this.tiles[0][var1][var2] = new Tile(0, var1, var2); } - this.tiles[0][var1][var2].linkedBelowTile = var3; - this.tiles[3][var1][var2] = null; - } + this.tiles[0][var1][var2].linkedBelowTile = var3; // L: 144 + this.tiles[3][var1][var2] = null; // L: 145 + } // L: 146 - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("setTileMinPlane") public void setTileMinPlane(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; - if (var5 != null) { - this.tiles[var1][var2][var3].minPlane = var4; + Tile var5 = this.tiles[var1][var2][var3]; // L: 165 + if (var5 != null) { // L: 166 + this.tiles[var1][var2][var3].minPlane = var4; // L: 167 } - } + } // L: 168 - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("addTile") public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) { TilePaint var21; int var22; - if (var4 == 0) { - var21 = new TilePaint(var11, var12, var13, var14, -1, var19, false); + if (var4 == 0) { // L: 171 + var21 = new TilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172 - for (var22 = var1; var22 >= 0; --var22) { + for (var22 = var1; var22 >= 0; --var22) { // L: 173 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; - } else if (var4 != 1) { - TileModel var23 = new TileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); + this.tiles[var1][var2][var3].paint = var21; // L: 174 + } else if (var4 != 1) { // L: 177 + TileModel var23 = new TileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183 - for (var22 = var1; var22 >= 0; --var22) { + for (var22 = var1; var22 >= 0; --var22) { // L: 184 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].model = var23; + this.tiles[var1][var2][var3].model = var23; // L: 185 } else { - var21 = new TilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); + var21 = new TilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178 - for (var22 = var1; var22 >= 0; --var22) { + for (var22 = var1; var22 >= 0; --var22) { // L: 179 if (this.tiles[var22][var2][var3] == null) { this.tiles[var22][var2][var3] = new Tile(var22, var2, var3); } } - this.tiles[var1][var2][var3].paint = var21; + this.tiles[var1][var2][var3].paint = var21; // L: 180 } - } + } // L: 175 181 186 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIIILel;JI)V" + descriptor = "(IIIILez;JI)V" ) @Export("newFloorDecoration") public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) { - if (var5 != null) { - FloorDecoration var9 = new FloorDecoration(); - var9.entity = var5; - var9.x = var2 * 128 + 64; - var9.y = var3 * 128 + 64; - var9.tileHeight = var4; - var9.tag = var6; - var9.flags = var8; - if (this.tiles[var1][var2][var3] == null) { + if (var5 != null) { // L: 189 + FloorDecoration var9 = new FloorDecoration(); // L: 190 + var9.entity = var5; // L: 191 + var9.x = var2 * 128 + 64; // L: 192 + var9.y = var3 * 128 + 64; // L: 193 + var9.tileHeight = var4; // L: 194 + var9.tag = var6; // L: 195 + var9.flags = var8; // L: 196 + if (this.tiles[var1][var2][var3] == null) { // L: 197 this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); } - this.tiles[var1][var2][var3].floorDecoration = var9; + this.tiles[var1][var2][var3].floorDecoration = var9; // L: 198 } - } + } // L: 199 - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIILel;JLel;Lel;)V" + descriptor = "(IIIILez;JLez;Lez;)V" ) @Export("newGroundItemPile") public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) { - TileItemPile var10 = new TileItemPile(); - var10.first = var5; - var10.x = var2 * 128 + 64; - var10.y = var3 * 128 + 64; - var10.tileHeight = var4; - var10.tag = var6; - var10.second = var8; - var10.third = var9; - int var11 = 0; - Tile var12 = this.tiles[var1][var2][var3]; - if (var12 != null) { - for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { - if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) { - Model var14 = (Model)var12.gameObjects[var13].entity; - var14.calculateBoundsCylinder(); - if (var14.height > var11) { + TileItemPile var10 = new TileItemPile(); // L: 202 + var10.first = var5; // L: 203 + var10.x = var2 * 128 + 64; // L: 204 + var10.y = var3 * 128 + 64; // L: 205 + var10.tileHeight = var4; // L: 206 + var10.tag = var6; // L: 207 + var10.second = var8; // L: 208 + var10.third = var9; // L: 209 + int var11 = 0; // L: 210 + Tile var12 = this.tiles[var1][var2][var3]; // L: 211 + if (var12 != null) { // L: 212 + for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 213 + if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) { // L: 214 + Model var14 = (Model)var12.gameObjects[var13].entity; // L: 215 + var14.calculateBoundsCylinder(); // L: 216 + if (var14.height > var11) { // L: 217 var11 = var14.height; } } } } - var10.height = var11; + var10.height = var11; // L: 221 if (this.tiles[var1][var2][var3] == null) { - this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); + this.tiles[var1][var2][var3] = new Tile(var1, var2, var3); // L: 222 } - this.tiles[var1][var2][var3].tileItemPile = var10; - } + this.tiles[var1][var2][var3].tileItemPile = var10; // L: 223 + } // L: 224 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(IIIILel;Lel;IIJI)V" + descriptor = "(IIIILez;Lez;IIJI)V" ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { - if (var5 != null || var6 != null) { - BoundaryObject var12 = new BoundaryObject(); - var12.tag = var9; - var12.flags = var11; - var12.x = var2 * 128 + 64; - var12.y = var3 * 128 + 64; - var12.tileHeight = var4; - var12.entity1 = var5; - var12.entity2 = var6; - var12.orientationA = var7; - var12.orientationB = var8; + if (var5 != null || var6 != null) { // L: 227 + BoundaryObject var12 = new BoundaryObject(); // L: 228 + var12.tag = var9; // L: 229 + var12.flags = var11; // L: 230 + var12.x = var2 * 128 + 64; // L: 231 + var12.y = var3 * 128 + 64; // L: 232 + var12.tileHeight = var4; // L: 233 + var12.entity1 = var5; // L: 234 + var12.entity2 = var6; // L: 235 + var12.orientationA = var7; // L: 236 + var12.orientationB = var8; // L: 237 for (int var13 = var1; var13 >= 0; --var13) { if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); // L: 238 } } - this.tiles[var1][var2][var3].boundaryObject = var12; + this.tiles[var1][var2][var3].boundaryObject = var12; // L: 239 } - } + } // L: 240 - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIILel;Lel;IIIIJI)V" + descriptor = "(IIIILez;Lez;IIIIJI)V" ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if (var5 != null) { - WallDecoration var14 = new WallDecoration(); - var14.tag = var11; - var14.flags = var13; - var14.x = var2 * 128 + 64; - var14.y = var3 * 128 + 64; - var14.tileHeight = var4; - var14.entity1 = var5; - var14.entity2 = var6; - var14.orientation = var7; - var14.orientation2 = var8; - var14.xOffset = var9; - var14.yOffset = var10; + if (var5 != null) { // L: 243 + WallDecoration var14 = new WallDecoration(); // L: 244 + var14.tag = var11; // L: 245 + var14.flags = var13; // L: 246 + var14.x = var2 * 128 + 64; // L: 247 + var14.y = var3 * 128 + 64; // L: 248 + var14.tileHeight = var4; // L: 249 + var14.entity1 = var5; // L: 250 + var14.entity2 = var6; // L: 251 + var14.orientation = var7; // L: 252 + var14.orientation2 = var8; // L: 253 + var14.xOffset = var9; // L: 254 + var14.yOffset = var10; // L: 255 for (int var15 = var1; var15 >= 0; --var15) { if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); // L: 256 } } - this.tiles[var1][var2][var3].wallDecoration = var14; + this.tiles[var1][var2][var3].wallDecoration = var14; // L: 257 } - } + } // L: 258 - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIIIIILel;IJI)Z" + descriptor = "(IIIIIILez;IJI)Z" ) - public boolean method3356(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { - if (var7 == null) { + public boolean method3263(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { + if (var7 == null) { // L: 261 return true; } else { - int var12 = var5 * 64 + var2 * 128; - int var13 = var6 * 64 + var3 * 128; - return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); + int var12 = var5 * 64 + var2 * 128; // L: 262 + int var13 = var6 * 64 + var3 * 128; // L: 263 + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); // L: 264 } } - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIIIILel;IJZ)Z" + descriptor = "(IIIIILez;IJZ)Z" ) @Export("drawEntity") public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { - if (var6 == null) { + if (var6 == null) { // L: 268 return true; } else { - int var11 = var2 - var5; - int var12 = var3 - var5; - int var13 = var5 + var2; - int var14 = var3 + var5; - if (var10) { - if (var7 > 640 && var7 < 1408) { + int var11 = var2 - var5; // L: 269 + int var12 = var3 - var5; // L: 270 + int var13 = var5 + var2; // L: 271 + int var14 = var3 + var5; // L: 272 + if (var10) { // L: 273 + if (var7 > 640 && var7 < 1408) { // L: 274 var14 += 128; } - if (var7 > 1152 && var7 < 1920) { + if (var7 > 1152 && var7 < 1920) { // L: 275 var13 += 128; } - if (var7 > 1664 || var7 < 384) { + if (var7 > 1664 || var7 < 384) { // L: 276 var12 -= 128; } - if (var7 > 128 && var7 < 896) { + if (var7 > 128 && var7 < 896) { // L: 277 var11 -= 128; } } - var11 /= 128; - var12 /= 128; - var13 /= 128; - var14 /= 128; - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); + var11 /= 128; // L: 279 + var12 /= 128; // L: 280 + var13 /= 128; // L: 281 + var14 /= 128; // L: 282 + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 283 } } - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(IIIIILel;IJIIII)Z" - ) - @Export("addNullableObject") - public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) { - return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); - } - @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIIIIIIILel;IZJI)Z" + descriptor = "(IIIIILez;IJIIII)Z" + ) + @Export("addNullableObject") + public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) { + return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 287 288 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIIIIIILez;IZJI)Z" ) @Export("newGameObject") boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) { int var16; - for (int var15 = var2; var15 < var2 + var4; ++var15) { - for (var16 = var3; var16 < var3 + var5; ++var16) { - if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { + for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 292 + for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 293 + if (var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) { // L: 294 return false; } - Tile var23 = this.tiles[var1][var15][var16]; - if (var23 != null && var23.gameObjectsCount >= 5) { + Tile var23 = this.tiles[var1][var15][var16]; // L: 295 + if (var23 != null && var23.gameObjectsCount >= 5) { // L: 296 return false; } } } - GameObject var21 = new GameObject(); - var21.tag = var12; - var21.flags = var14; - var21.plane = var1; - var21.centerX = var6; - var21.centerY = var7; - var21.height = var8; - var21.entity = var9; - var21.orientation = var10; - var21.startX = var2; - var21.startY = var3; - var21.endX = var2 + var4 - 1; - var21.endY = var3 + var5 - 1; + GameObject var21 = new GameObject(); // L: 299 + var21.tag = var12; // L: 300 + var21.flags = var14; // L: 301 + var21.plane = var1; // L: 302 + var21.centerX = var6; // L: 303 + var21.centerY = var7; // L: 304 + var21.height = var8; // L: 305 + var21.entity = var9; // L: 306 + var21.orientation = var10; // L: 307 + var21.startX = var2; // L: 308 + var21.startY = var3; // L: 309 + var21.endX = var2 + var4 - 1; // L: 310 + var21.endY = var3 + var5 - 1; // L: 311 - for (var16 = var2; var16 < var2 + var4; ++var16) { - for (int var17 = var3; var17 < var3 + var5; ++var17) { - int var18 = 0; - if (var16 > var2) { + for (var16 = var2; var16 < var2 + var4; ++var16) { // L: 312 + for (int var17 = var3; var17 < var3 + var5; ++var17) { // L: 313 + int var18 = 0; // L: 314 + if (var16 > var2) { // L: 315 ++var18; } - if (var16 < var2 + var4 - 1) { + if (var16 < var2 + var4 - 1) { // L: 316 var18 += 4; } - if (var17 > var3) { + if (var17 > var3) { // L: 317 var18 += 8; } - if (var17 < var3 + var5 - 1) { + if (var17 < var3 + var5 - 1) { // L: 318 var18 += 2; } for (int var19 = var1; var19 >= 0; --var19) { if (this.tiles[var19][var16][var17] == null) { - this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); + this.tiles[var19][var16][var17] = new Tile(var19, var16, var17); // L: 319 } } - Tile var22 = this.tiles[var1][var16][var17]; - var22.gameObjects[var22.gameObjectsCount] = var21; - var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; - var22.gameObjectsEdgeMask |= var18; - ++var22.gameObjectsCount; + Tile var22 = this.tiles[var1][var16][var17]; // L: 320 + var22.gameObjects[var22.gameObjectsCount] = var21; // L: 321 + var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18; // L: 322 + var22.gameObjectsEdgeMask |= var18; // L: 324 + ++var22.gameObjectsCount; // L: 325 } } - if (var11) { + if (var11) { // L: 328 this.tempGameObjects[this.tempGameObjectsCount++] = var21; } - return true; + return true; // L: 329 } - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("clearTempGameObjects") public void clearTempGameObjects() { - for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { - GameObject var2 = this.tempGameObjects[var1]; - this.removeGameObject(var2); - this.tempGameObjects[var1] = null; + for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) { // L: 333 + GameObject var2 = this.tempGameObjects[var1]; // L: 334 + this.removeGameObject(var2); // L: 335 + this.tempGameObjects[var1] = null; // L: 336 } - this.tempGameObjectsCount = 0; - } + this.tempGameObjectsCount = 0; // L: 338 + } // L: 339 - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lev;)V" + descriptor = "(Led;)V" ) @Export("removeGameObject") void removeGameObject(GameObject var1) { - for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { - for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { - Tile var4 = this.tiles[var1.plane][var2][var3]; - if (var4 != null) { + for (int var2 = var1.startX; var2 <= var1.endX; ++var2) { // L: 342 + for (int var3 = var1.startY; var3 <= var1.endY; ++var3) { // L: 343 + Tile var4 = this.tiles[var1.plane][var2][var3]; // L: 344 + if (var4 != null) { // L: 345 int var5; - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - if (var4.gameObjects[var5] == var1) { - --var4.gameObjectsCount; + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 346 + if (var4.gameObjects[var5] == var1) { // L: 347 + --var4.gameObjectsCount; // L: 348 - for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { - var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; - var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; + for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) { // L: 349 + var4.gameObjects[var6] = var4.gameObjects[var6 + 1]; // L: 350 + var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1]; // L: 351 } - var4.gameObjects[var4.gameObjectsCount] = null; + var4.gameObjects[var4.gameObjectsCount] = null; // L: 353 break; } } - var4.gameObjectsEdgeMask = 0; + var4.gameObjectsEdgeMask = 0; // L: 357 - for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; + for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 358 + var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5]; // L: 360 } } } } - } + } // L: 365 - @ObfuscatedName("d") - public void method3208(int var1, int var2, int var3, int var4) { - Tile var5 = this.tiles[var1][var2][var3]; - if (var5 != null) { - WallDecoration var6 = var5.wallDecoration; - if (var6 != null) { - var6.xOffset = var4 * var6.xOffset / 16; - var6.yOffset = var4 * var6.yOffset / 16; + @ObfuscatedName("j") + public void method3204(int var1, int var2, int var3, int var4) { + Tile var5 = this.tiles[var1][var2][var3]; // L: 368 + if (var5 != null) { // L: 369 + WallDecoration var6 = var5.wallDecoration; // L: 370 + if (var6 != null) { // L: 371 + var6.xOffset = var4 * var6.xOffset / 16; // L: 372 + var6.yOffset = var4 * var6.yOffset / 16; // L: 373 } } - } + } // L: 374 - @ObfuscatedName("e") + @ObfuscatedName("r") @Export("removeBoundaryObject") public void removeBoundaryObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + Tile var4 = this.tiles[var1][var2][var3]; // L: 377 if (var4 != null) { - var4.boundaryObject = null; + var4.boundaryObject = null; // L: 379 } - } + } // L: 378 380 - @ObfuscatedName("l") + @ObfuscatedName("u") @Export("removeWallDecoration") public void removeWallDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + Tile var4 = this.tiles[var1][var2][var3]; // L: 383 if (var4 != null) { - var4.wallDecoration = null; + var4.wallDecoration = null; // L: 385 } - } + } // L: 384 386 - @ObfuscatedName("t") + @ObfuscatedName("p") @Export("removeGameObject") public void removeGameObject(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 != null) { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - if (FloorDecoration.method2977(var6.tag) && var2 == var6.startX && var3 == var6.startY) { - this.removeGameObject(var6); - return; + Tile var4 = this.tiles[var1][var2][var3]; // L: 389 + if (var4 != null) { // L: 390 + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 391 + GameObject var6 = var4.gameObjects[var5]; // L: 392 + if (Tiles.method1191(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 393 + this.removeGameObject(var6); // L: 394 + return; // L: 395 } } } - } + } // L: 398 - @ObfuscatedName("x") + @ObfuscatedName("b") @Export("removeFloorDecoration") public void removeFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + Tile var4 = this.tiles[var1][var2][var3]; // L: 401 if (var4 != null) { - var4.floorDecoration = null; + var4.floorDecoration = null; // L: 403 } - } + } // L: 402 404 - @ObfuscatedName("ah") + @ObfuscatedName("l") @Export("removeGroundItemPile") public void removeGroundItemPile(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; + Tile var4 = this.tiles[var1][var2][var3]; // L: 407 if (var4 != null) { - var4.tileItemPile = null; + var4.tileItemPile = null; // L: 409 } + } // L: 408 410 + + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "(III)Leb;" + ) + public BoundaryObject method3276(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 413 + return var4 == null ? null : var4.boundaryObject; // L: 414 415 } - @ObfuscatedName("ai") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(III)Lez;" + descriptor = "(III)Lex;" ) - public BoundaryObject method3213(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 == null ? null : var4.boundaryObject; + public WallDecoration method3211(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 419 + return var4 == null ? null : var4.wallDecoration; // L: 420 421 } - @ObfuscatedName("ao") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(III)Lep;" + descriptor = "(III)Led;" ) - public WallDecoration method3214(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 == null ? null : var4.wallDecoration; - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(III)Lev;" - ) - public GameObject method3215(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 == null) { + public GameObject method3197(int var1, int var2, int var3) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 425 + if (var4 == null) { // L: 426 return null; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - if (FloorDecoration.method2977(var6.tag) && var2 == var6.startX && var3 == var6.startY) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 427 + GameObject var6 = var4.gameObjects[var5]; // L: 428 + if (Tiles.method1191(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 429 return var6; } } - return null; + return null; // L: 431 } } - @ObfuscatedName("ax") + @ObfuscatedName("ao") @ObfuscatedSignature( descriptor = "(III)Leu;" ) @Export("getFloorDecoration") public FloorDecoration getFloorDecoration(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; + Tile var4 = this.tiles[var1][var2][var3]; // L: 435 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null; // L: 436 437 } - @ObfuscatedName("ag") + @ObfuscatedName("ae") @Export("getBoundaryObjectTag") public long getBoundaryObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; + Tile var4 = this.tiles[var1][var2][var3]; // L: 441 + return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L; // L: 442 443 } - @ObfuscatedName("ab") + @ObfuscatedName("ap") @Export("getWallDecorationTag") public long getWallDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; + Tile var4 = this.tiles[var1][var2][var3]; // L: 447 + return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L; // L: 448 449 } - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("getGameObjectTag") public long getGameObjectTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - if (var4 == null) { + Tile var4 = this.tiles[var1][var2][var3]; // L: 453 + if (var4 == null) { // L: 454 return 0L; } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = class171.Entity_unpackType(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { // L: 455 + GameObject var6 = var4.gameObjects[var5]; // L: 456 + if (Tiles.method1191(var6.tag) && var2 == var6.startX && var3 == var6.startY) { // L: 457 return var6.tag; } } - return 0L; + return 0L; // L: 459 } } - @ObfuscatedName("ak") + @ObfuscatedName("aa") @Export("getFloorDecorationTag") public long getFloorDecorationTag(int var1, int var2, int var3) { - Tile var4 = this.tiles[var1][var2][var3]; - return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; + Tile var4 = this.tiles[var1][var2][var3]; // L: 463 + return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L; // L: 464 465 } - @ObfuscatedName("ad") + @ObfuscatedName("ar") @Export("getObjectFlags") public int getObjectFlags(int var1, int var2, int var3, long var4) { - Tile var6 = this.tiles[var1][var2][var3]; - if (var6 == null) { + Tile var6 = this.tiles[var1][var2][var3]; // L: 469 + if (var6 == null) { // L: 470 return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { + } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { // L: 471 return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { + } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { // L: 472 return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { + } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { // L: 473 return var6.floorDecoration.flags & 255; } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { - if (var6.gameObjects[var7].tag == var4) { + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { // L: 474 + if (var6.gameObjects[var7].tag == var4) { // L: 475 return var6.gameObjects[var7].flags & 255; } } - return -1; + return -1; // L: 477 } } - @ObfuscatedName("as") - public void method3222(int var1, int var2, int var3) { - for (int var4 = 0; var4 < this.planes; ++var4) { - for (int var5 = 0; var5 < this.xSize; ++var5) { - for (int var6 = 0; var6 < this.ySize; ++var6) { - Tile var7 = this.tiles[var4][var5][var6]; - if (var7 != null) { - BoundaryObject var8 = var7.boundaryObject; + @ObfuscatedName("at") + public void method3219(int var1, int var2, int var3) { + for (int var4 = 0; var4 < this.planes; ++var4) { // L: 481 + for (int var5 = 0; var5 < this.xSize; ++var5) { // L: 482 + for (int var6 = 0; var6 < this.ySize; ++var6) { // L: 483 + Tile var7 = this.tiles[var4][var5][var6]; // L: 484 + if (var7 != null) { // L: 485 + BoundaryObject var8 = var7.boundaryObject; // L: 486 ModelData var10; - if (var8 != null && var8.entity1 instanceof ModelData) { - ModelData var9 = (ModelData)var8.entity1; - this.method3224(var9, var4, var5, var6, 1, 1); - if (var8.entity2 instanceof ModelData) { - var10 = (ModelData)var8.entity2; - this.method3224(var10, var4, var5, var6, 1, 1); - ModelData.method2924(var9, var10, 0, 0, 0, false); - var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + if (var8 != null && var8.entity1 instanceof ModelData) { // L: 487 + ModelData var9 = (ModelData)var8.entity1; // L: 488 + this.method3221(var9, var4, var5, var6, 1, 1); // L: 489 + if (var8.entity2 instanceof ModelData) { // L: 490 + var10 = (ModelData)var8.entity2; // L: 491 + this.method3221(var10, var4, var5, var6, 1, 1); // L: 492 + ModelData.method2935(var9, var10, 0, 0, 0, false); // L: 493 + var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494 } - var8.entity1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); + var8.entity1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496 } - for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { - GameObject var14 = var7.gameObjects[var12]; - if (var14 != null && var14.entity instanceof ModelData) { - ModelData var11 = (ModelData)var14.entity; - this.method3224(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); - var14.entity = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); + for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 498 + GameObject var14 = var7.gameObjects[var12]; // L: 499 + if (var14 != null && var14.entity instanceof ModelData) { // L: 500 + ModelData var11 = (ModelData)var14.entity; // L: 501 + this.method3221(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502 + var14.entity = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503 } } - FloorDecoration var13 = var7.floorDecoration; - if (var13 != null && var13.entity instanceof ModelData) { - var10 = (ModelData)var13.entity; - this.method3283(var10, var4, var5, var6); - var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); + FloorDecoration var13 = var7.floorDecoration; // L: 506 + if (var13 != null && var13.entity instanceof ModelData) { // L: 507 + var10 = (ModelData)var13.entity; // L: 508 + this.method3220(var10, var4, var5, var6); // L: 509 + var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510 } } } } } - } + } // L: 516 - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(Lek;III)V" + descriptor = "(Lee;III)V" ) - void method3283(ModelData var1, int var2, int var3, int var4) { + void method3220(ModelData var1, int var2, int var3, int var4) { Tile var5; ModelData var6; - if (var3 < this.xSize) { - var5 = this.tiles[var2][var3 + 1][var4]; - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { - var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2924(var1, var6, 128, 0, 0, true); + if (var3 < this.xSize) { // L: 519 + var5 = this.tiles[var2][var3 + 1][var4]; // L: 520 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 521 + var6 = (ModelData)var5.floorDecoration.entity; // L: 522 + ModelData.method2935(var1, var6, 128, 0, 0, true); // L: 523 } } - if (var4 < this.xSize) { - var5 = this.tiles[var2][var3][var4 + 1]; - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { - var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2924(var1, var6, 0, 0, 128, true); + if (var4 < this.xSize) { // L: 526 + var5 = this.tiles[var2][var3][var4 + 1]; // L: 527 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 528 + var6 = (ModelData)var5.floorDecoration.entity; // L: 529 + ModelData.method2935(var1, var6, 0, 0, 128, true); // L: 530 } } - if (var3 < this.xSize && var4 < this.ySize) { - var5 = this.tiles[var2][var3 + 1][var4 + 1]; - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { - var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2924(var1, var6, 128, 0, 128, true); + if (var3 < this.xSize && var4 < this.ySize) { // L: 533 + var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 534 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 535 + var6 = (ModelData)var5.floorDecoration.entity; // L: 536 + ModelData.method2935(var1, var6, 128, 0, 128, true); // L: 537 } } - if (var3 < this.xSize && var4 > 0) { - var5 = this.tiles[var2][var3 + 1][var4 - 1]; - if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { - var6 = (ModelData)var5.floorDecoration.entity; - ModelData.method2924(var1, var6, 128, 0, -128, true); + if (var3 < this.xSize && var4 > 0) { // L: 540 + var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 541 + if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 542 + var6 = (ModelData)var5.floorDecoration.entity; // L: 543 + ModelData.method2935(var1, var6, 128, 0, -128, true); // L: 544 } } - } + } // L: 547 - @ObfuscatedName("ap") + @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lek;IIIII)V" + descriptor = "(Lee;IIIII)V" ) - void method3224(ModelData var1, int var2, int var3, int var4, int var5, int var6) { - boolean var7 = true; - int var8 = var3; - int var9 = var3 + var5; - int var10 = var4 - 1; - int var11 = var4 + var6; + void method3221(ModelData var1, int var2, int var3, int var4, int var5, int var6) { + boolean var7 = true; // L: 550 + int var8 = var3; // L: 551 + int var9 = var3 + var5; // L: 552 + int var10 = var4 - 1; // L: 553 + int var11 = var4 + var6; // L: 554 - for (int var12 = var2; var12 <= var2 + 1; ++var12) { - if (var12 != this.planes) { - for (int var13 = var8; var13 <= var9; ++var13) { - if (var13 >= 0 && var13 < this.xSize) { - for (int var14 = var10; var14 <= var11; ++var14) { - if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { - Tile var15 = this.tiles[var12][var13][var14]; - if (var15 != null) { - int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; - BoundaryObject var17 = var15.boundaryObject; - if (var17 != null) { + for (int var12 = var2; var12 <= var2 + 1; ++var12) { // L: 555 + if (var12 != this.planes) { // L: 556 + for (int var13 = var8; var13 <= var9; ++var13) { // L: 557 + if (var13 >= 0 && var13 < this.xSize) { // L: 558 + for (int var14 = var10; var14 <= var11; ++var14) { // L: 559 + if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { // L: 560 561 + Tile var15 = this.tiles[var12][var13][var14]; // L: 562 + if (var15 != null) { // L: 563 + int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; // L: 564 + BoundaryObject var17 = var15.boundaryObject; // L: 565 + if (var17 != null) { // L: 566 ModelData var18; - if (var17.entity1 instanceof ModelData) { - var18 = (ModelData)var17.entity1; - ModelData.method2924(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + if (var17.entity1 instanceof ModelData) { // L: 567 + var18 = (ModelData)var17.entity1; // L: 568 + ModelData.method2935(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569 } - if (var17.entity2 instanceof ModelData) { - var18 = (ModelData)var17.entity2; - ModelData.method2924(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); + if (var17.entity2 instanceof ModelData) { // L: 571 + var18 = (ModelData)var17.entity2; // L: 572 + ModelData.method2935(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573 } } - for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { - GameObject var19 = var15.gameObjects[var23]; - if (var19 != null && var19.entity instanceof ModelData) { - ModelData var20 = (ModelData)var19.entity; - int var21 = var19.endX - var19.startX + 1; - int var22 = var19.endY - var19.startY + 1; - ModelData.method2924(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); + for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 576 + GameObject var19 = var15.gameObjects[var23]; // L: 577 + if (var19 != null && var19.entity instanceof ModelData) { // L: 578 + ModelData var20 = (ModelData)var19.entity; // L: 579 + int var21 = var19.endX - var19.startX + 1; // L: 580 + int var22 = var19.endY - var19.startY + 1; // L: 581 + ModelData.method2935(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582 } } } @@ -963,302 +961,302 @@ public class Scene { } } - --var8; - var7 = false; + --var8; // L: 587 + var7 = false; // L: 588 } } - } + } // L: 590 - @ObfuscatedName("al") + @ObfuscatedName("ah") @Export("drawTileMinimap") public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { - Tile var7 = this.tiles[var4][var5][var6]; - if (var7 != null) { - TilePaint var8 = var7.paint; + Tile var7 = this.tiles[var4][var5][var6]; // L: 593 + if (var7 != null) { // L: 594 + TilePaint var8 = var7.paint; // L: 595 int var10; - if (var8 != null) { - int var9 = var8.rgb; - if (var9 != 0) { - for (var10 = 0; var10 < 4; ++var10) { - var1[var2] = var9; - var1[var2 + 1] = var9; - var1[var2 + 2] = var9; - var1[var2 + 3] = var9; - var2 += var3; + if (var8 != null) { // L: 596 + int var18 = var8.rgb; // L: 597 + if (var18 != 0) { // L: 598 + for (var10 = 0; var10 < 4; ++var10) { // L: 599 + var1[var2] = var18; // L: 600 + var1[var2 + 1] = var18; // L: 601 + var1[var2 + 2] = var18; // L: 602 + var1[var2 + 3] = var18; // L: 603 + var2 += var3; // L: 604 } } } else { - TileModel var18 = var7.model; - if (var18 != null) { - var10 = var18.shape; - int var11 = var18.rotation; - int var12 = var18.underlayRgb; - int var13 = var18.overlayRgb; - int[] var14 = this.tileShape2D[var10]; - int[] var15 = this.tileRotation2D[var11]; - int var16 = 0; + TileModel var9 = var7.model; // L: 608 + if (var9 != null) { // L: 609 + var10 = var9.shape; // L: 610 + int var11 = var9.rotation; // L: 611 + int var12 = var9.underlayRgb; // L: 612 + int var13 = var9.overlayRgb; // L: 613 + int[] var14 = this.tileShape2D[var10]; // L: 614 + int[] var15 = this.tileRotation2D[var11]; // L: 615 + int var16 = 0; // L: 616 int var17; - if (var12 != 0) { - for (var17 = 0; var17 < 4; ++var17) { - var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; - var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; - var2 += var3; + if (var12 != 0) { // L: 617 + for (var17 = 0; var17 < 4; ++var17) { // L: 618 + var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 619 + var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 620 + var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 621 + var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13; // L: 622 + var2 += var3; // L: 623 } } else { - for (var17 = 0; var17 < 4; ++var17) { - if (var14[var15[var16++]] != 0) { + for (var17 = 0; var17 < 4; ++var17) { // L: 627 + if (var14[var15[var16++]] != 0) { // L: 628 var1[var2] = var13; } - if (var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { // L: 629 var1[var2 + 1] = var13; } - if (var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { // L: 630 var1[var2 + 2] = var13; } - if (var14[var15[var16++]] != 0) { + if (var14[var15[var16++]] != 0) { // L: 631 var1[var2 + 3] = var13; } - var2 += var3; + var2 += var3; // L: 632 } } } } } - } + } // L: 606 635 - @ObfuscatedName("av") + @ObfuscatedName("as") @Export("menuOpen") - public void menuOpen(int plane, int mouseX, int mouseY, boolean walking) { - if (!shouldSendWalk() || walking) { - checkClick = true; - viewportWalking = walking; - Scene_selectedPlane = plane; - Scene_selectedScreenX = mouseX; - Scene_selectedScreenY = mouseY; - Scene_selectedX = -1; - Scene_selectedY = -1; + public void menuOpen(int var1, int var2, int var3, boolean var4) { + if (!shouldSendWalk() || var4) { // L: 714 + checkClick = true; // L: 715 + viewportWalking = var4; // L: 716 + Scene_selectedPlane = var1; // L: 717 + Scene_selectedScreenX = var2; // L: 718 + Scene_selectedScreenY = var3; // L: 719 + Scene_selectedX = -1; // L: 720 + Scene_selectedY = -1; // L: 721 } - } + } // L: 722 - @ObfuscatedName("af") + @ObfuscatedName("az") @Export("setViewportWalking") public void setViewportWalking() { - viewportWalking = true; - } + viewportWalking = true; // L: 725 + } // L: 726 - @ObfuscatedName("aw") + @ObfuscatedName("ay") @Export("draw") public void draw(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var1 < 0) { + if (var1 < 0) { // L: 738 var1 = 0; - } else if (var1 >= this.xSize * 128) { + } else if (var1 >= this.xSize * 128) { // L: 739 var1 = this.xSize * 128 - 1; } - if (var3 < 0) { + if (var3 < 0) { // L: 740 var3 = 0; - } else if (var3 >= this.ySize * 128) { + } else if (var3 >= this.ySize * 128) { // L: 741 var3 = this.ySize * 128 - 1; } - if (var4 < 128) { + if (var4 < 128) { // L: 742 var4 = 128; - } else if (var4 > 383) { + } else if (var4 > 383) { // L: 743 var4 = 383; } - ++Scene_drawnCount; - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; - visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; - Scene_cameraX = var1; - Scene_cameraY = var2; - Scene_cameraZ = var3; - Scene_cameraXTile = var1 / 128; - Scene_cameraYTile = var3 / 128; - Scene_plane = var6; - Scene_cameraXTileMin = Scene_cameraXTile - 25; - if (Scene_cameraXTileMin < 0) { + ++Scene_drawnCount; // L: 744 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4]; // L: 745 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4]; // L: 746 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5]; // L: 747 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5]; // L: 748 + visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64]; // L: 749 + Scene_cameraX = var1; // L: 750 + Scene_cameraY = var2; // L: 751 + Scene_cameraZ = var3; // L: 752 + Scene_cameraXTile = var1 / 128; // L: 753 + Scene_cameraYTile = var3 / 128; // L: 754 + Scene_plane = var6; // L: 755 + Scene_cameraXTileMin = Scene_cameraXTile - 25; // L: 756 + if (Scene_cameraXTileMin < 0) { // L: 757 Scene_cameraXTileMin = 0; } - Scene_cameraYTileMin = Scene_cameraYTile - 25; - if (Scene_cameraYTileMin < 0) { + Scene_cameraYTileMin = Scene_cameraYTile - 25; // L: 758 + if (Scene_cameraYTileMin < 0) { // L: 759 Scene_cameraYTileMin = 0; } - Scene_cameraXTileMax = Scene_cameraXTile + 25; - if (Scene_cameraXTileMax > this.xSize) { + Scene_cameraXTileMax = Scene_cameraXTile + 25; // L: 760 + if (Scene_cameraXTileMax > this.xSize) { // L: 761 Scene_cameraXTileMax = this.xSize; } - Scene_cameraYTileMax = Scene_cameraYTile + 25; - if (Scene_cameraYTileMax > this.ySize) { + Scene_cameraYTileMax = Scene_cameraYTile + 25; // L: 762 + if (Scene_cameraYTileMax > this.ySize) { // L: 763 Scene_cameraYTileMax = this.ySize; } - this.occlude(); - tileUpdateCount = 0; + this.occlude(); // L: 764 + tileUpdateCount = 0; // L: 765 int var7; Tile[][] var8; int var9; int var10; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { - var8 = this.tiles[var7]; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 766 + var8 = this.tiles[var7]; // L: 767 - for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { - for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { - Tile var11 = var8[var9][var10]; - if (var11 != null) { - if (var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) { - var11.drawPrimary = false; - var11.drawSecondary = false; - var11.drawGameObjectEdges = 0; - } else { - var11.drawPrimary = true; - var11.drawSecondary = true; - if (var11.gameObjectsCount > 0) { - var11.drawGameObjects = true; + for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) { // L: 768 + for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) { // L: 769 + Tile var16 = var8[var9][var10]; // L: 770 + if (var16 != null) { // L: 771 + if (var16.minPlane <= var6 && (visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] || this.tileHeights[var7][var9][var10] - var2 >= 2000)) { // L: 772 + var16.drawPrimary = true; // L: 778 + var16.drawSecondary = true; // L: 779 + if (var16.gameObjectsCount > 0) { // L: 780 + var16.drawGameObjects = true; } else { - var11.drawGameObjects = false; + var16.drawGameObjects = false; // L: 781 } - ++tileUpdateCount; + ++tileUpdateCount; // L: 782 + } else { + var16.drawPrimary = false; // L: 773 + var16.drawSecondary = false; // L: 774 + var16.drawGameObjectEdges = 0; // L: 775 } } } } } + int var11; int var12; int var13; int var14; Tile var15; - int var16; - for (var7 = this.minPlane; var7 < this.planes; ++var7) { - var8 = this.tiles[var7]; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 788 + var8 = this.tiles[var7]; // L: 789 - for (var9 = -25; var9 <= 0; ++var9) { - var10 = var9 + Scene_cameraXTile; - var16 = Scene_cameraXTile - var9; - if (var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) { - for (var12 = -25; var12 <= 0; ++var12) { - var13 = var12 + Scene_cameraYTile; - var14 = Scene_cameraYTile - var12; - if (var10 >= Scene_cameraXTileMin) { - if (var13 >= Scene_cameraYTileMin) { - var15 = var8[var10][var13]; - if (var15 != null && var15.drawPrimary) { + for (var9 = -25; var9 <= 0; ++var9) { // L: 790 + var10 = var9 + Scene_cameraXTile; // L: 791 + var11 = Scene_cameraXTile - var9; // L: 792 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 793 + for (var12 = -25; var12 <= 0; ++var12) { // L: 794 + var13 = var12 + Scene_cameraYTile; // L: 795 + var14 = Scene_cameraYTile - var12; // L: 796 + if (var10 >= Scene_cameraXTileMin) { // L: 797 + if (var13 >= Scene_cameraYTileMin) { // L: 798 + var15 = var8[var10][var13]; // L: 799 + if (var15 != null && var15.drawPrimary) { // L: 800 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var10][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 802 + var15 = var8[var10][var14]; // L: 803 + if (var15 != null && var15.drawPrimary) { // L: 804 this.drawTile(var15, true); } } } - if (var16 < Scene_cameraXTileMax) { - if (var13 >= Scene_cameraYTileMin) { - var15 = var8[var16][var13]; - if (var15 != null && var15.drawPrimary) { + if (var11 < Scene_cameraXTileMax) { // L: 807 + if (var13 >= Scene_cameraYTileMin) { // L: 808 + var15 = var8[var11][var13]; // L: 809 + if (var15 != null && var15.drawPrimary) { // L: 810 this.drawTile(var15, true); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var16][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 812 + var15 = var8[var11][var14]; // L: 813 + if (var15 != null && var15.drawPrimary) { // L: 814 this.drawTile(var15, true); } } } - if (tileUpdateCount == 0) { - checkClick = false; - return; + if (tileUpdateCount == 0) { // L: 817 + checkClick = false; // L: 818 + return; // L: 819 } } } } } - for (var7 = this.minPlane; var7 < this.planes; ++var7) { - var8 = this.tiles[var7]; + for (var7 = this.minPlane; var7 < this.planes; ++var7) { // L: 825 + var8 = this.tiles[var7]; // L: 826 - for (var9 = -25; var9 <= 0; ++var9) { - var10 = var9 + Scene_cameraXTile; - var16 = Scene_cameraXTile - var9; - if (var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) { - for (var12 = -25; var12 <= 0; ++var12) { - var13 = var12 + Scene_cameraYTile; - var14 = Scene_cameraYTile - var12; - if (var10 >= Scene_cameraXTileMin) { - if (var13 >= Scene_cameraYTileMin) { - var15 = var8[var10][var13]; - if (var15 != null && var15.drawPrimary) { + for (var9 = -25; var9 <= 0; ++var9) { // L: 827 + var10 = var9 + Scene_cameraXTile; // L: 828 + var11 = Scene_cameraXTile - var9; // L: 829 + if (var10 >= Scene_cameraXTileMin || var11 < Scene_cameraXTileMax) { // L: 830 + for (var12 = -25; var12 <= 0; ++var12) { // L: 831 + var13 = var12 + Scene_cameraYTile; // L: 832 + var14 = Scene_cameraYTile - var12; // L: 833 + if (var10 >= Scene_cameraXTileMin) { // L: 834 + if (var13 >= Scene_cameraYTileMin) { // L: 835 + var15 = var8[var10][var13]; // L: 836 + if (var15 != null && var15.drawPrimary) { // L: 837 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var10][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 839 + var15 = var8[var10][var14]; // L: 840 + if (var15 != null && var15.drawPrimary) { // L: 841 this.drawTile(var15, false); } } } - if (var16 < Scene_cameraXTileMax) { - if (var13 >= Scene_cameraYTileMin) { - var15 = var8[var16][var13]; - if (var15 != null && var15.drawPrimary) { + if (var11 < Scene_cameraXTileMax) { // L: 844 + if (var13 >= Scene_cameraYTileMin) { // L: 845 + var15 = var8[var11][var13]; // L: 846 + if (var15 != null && var15.drawPrimary) { // L: 847 this.drawTile(var15, false); } } - if (var14 < Scene_cameraYTileMax) { - var15 = var8[var16][var14]; - if (var15 != null && var15.drawPrimary) { + if (var14 < Scene_cameraYTileMax) { // L: 849 + var15 = var8[var11][var14]; // L: 850 + if (var15 != null && var15.drawPrimary) { // L: 851 this.drawTile(var15, false); } } } - if (tileUpdateCount == 0) { - checkClick = false; - return; + if (tileUpdateCount == 0) { // L: 854 + checkClick = false; // L: 855 + return; // L: 856 } } } } } - checkClick = false; - } + checkClick = false; // L: 862 + } // L: 863 - @ObfuscatedName("az") + @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "(Lea;Z)V" + descriptor = "(Lek;Z)V" ) @Export("drawTile") void drawTile(Tile var1, boolean var2) { - Scene_tilesDeque.addFirst(var1); + Scene_tilesDeque.addFirst(var1); // L: 866 while (true) { Tile var3; @@ -1290,227 +1288,227 @@ public class Scene { Tile var36; while (true) { do { - var3 = (Tile)Scene_tilesDeque.removeLast(); - if (var3 == null) { + var3 = (Tile)Scene_tilesDeque.removeLast(); // L: 868 + if (var3 == null) { // L: 869 return; } - } while(!var3.drawSecondary); + } while(!var3.drawSecondary); // L: 870 - var4 = var3.x; - var5 = var3.y; - var6 = var3.plane; - var7 = var3.originalPlane; - var8 = this.tiles[var6]; - if (!var3.drawPrimary) { + var4 = var3.x; // L: 871 + var5 = var3.y; // L: 872 + var6 = var3.plane; // L: 873 + var7 = var3.originalPlane; // L: 874 + var8 = this.tiles[var6]; // L: 875 + if (!var3.drawPrimary) { // L: 876 break; } - if (var2) { - if (var6 > 0) { - var9 = this.tiles[var6 - 1][var4][var5]; - if (var9 != null && var9.drawSecondary) { + if (var2) { // L: 877 + if (var6 > 0) { // L: 878 + var9 = this.tiles[var6 - 1][var4][var5]; // L: 879 + if (var9 != null && var9.drawSecondary) { // L: 880 continue; } } - if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { - var9 = var8[var4 - 1][var5]; - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { + if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) { // L: 882 + var9 = var8[var4 - 1][var5]; // L: 883 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) { // L: 884 continue; } } - if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { - var9 = var8[var4 + 1][var5]; - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { + if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) { // L: 886 + var9 = var8[var4 + 1][var5]; // L: 887 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) { // L: 888 continue; } } - if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { - var9 = var8[var4][var5 - 1]; - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { + if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) { // L: 890 + var9 = var8[var4][var5 - 1]; // L: 891 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) { // L: 892 continue; } } - if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { - var9 = var8[var4][var5 + 1]; - if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { + if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) { // L: 894 + var9 = var8[var4][var5 + 1]; // L: 895 + if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) { // L: 896 continue; } } } else { - var2 = true; + var2 = true; // L: 899 } - var3.drawPrimary = false; - if (var3.linkedBelowTile != null) { - var9 = var3.linkedBelowTile; - if (var9.paint != null) { - if (!this.method3196(0, var4, var5)) { + var3.drawPrimary = false; // L: 900 + if (var3.linkedBelowTile != null) { // L: 901 + var9 = var3.linkedBelowTile; // L: 902 + if (var9.paint != null) { // L: 903 + if (!this.method3236(0, var4, var5)) { // L: 904 this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - } else if (var9.model != null && !this.method3196(0, var4, var5)) { + } else if (var9.model != null && !this.method3236(0, var4, var5)) { // L: 906 907 this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } - var10 = var9.boundaryObject; - if (var10 != null) { + var10 = var9.boundaryObject; // L: 909 + if (var10 != null) { // L: 910 var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { - var12 = var9.gameObjects[var11]; - if (var12 != null) { + for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911 + var12 = var9.gameObjects[var11]; // L: 912 + if (var12 != null) { // L: 913 var12.entity.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); } } } - var20 = false; - if (var3.paint != null) { - if (!this.method3196(var7, var4, var5)) { - var20 = true; - if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { + var20 = false; // L: 916 + if (var3.paint != null) { // L: 917 + if (!this.method3236(var7, var4, var5)) { // L: 918 + var20 = true; // L: 919 + if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) { // L: 920 this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); } } - } else if (var3.model != null && !this.method3196(var7, var4, var5)) { - var20 = true; - this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); + } else if (var3.model != null && !this.method3236(var7, var4, var5)) { // L: 923 924 + var20 = true; // L: 925 + this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5); // L: 926 } - var21 = 0; - var11 = 0; - BoundaryObject var31 = var3.boundaryObject; - WallDecoration var13 = var3.wallDecoration; - if (var31 != null || var13 != null) { - if (var4 == Scene_cameraXTile) { + var21 = 0; // L: 929 + var11 = 0; // L: 930 + BoundaryObject var31 = var3.boundaryObject; // L: 931 + WallDecoration var13 = var3.wallDecoration; // L: 932 + if (var31 != null || var13 != null) { // L: 933 + if (var4 == Scene_cameraXTile) { // L: 934 ++var21; - } else if (Scene_cameraXTile < var4) { + } else if (Scene_cameraXTile < var4) { // L: 935 var21 += 2; } - if (var5 == Scene_cameraYTile) { + if (var5 == Scene_cameraYTile) { // L: 936 var21 += 3; - } else if (Scene_cameraYTile > var5) { + } else if (Scene_cameraYTile > var5) { // L: 937 var21 += 6; } - var11 = field1874[var21]; - var3.field1692 = field1876[var21]; + var11 = field1874[var21]; // L: 938 + var3.field1689 = field1869[var21]; // L: 939 } - if (var31 != null) { - if ((var31.orientationA & field1875[var21]) != 0) { - if (var31.orientationA == 16) { - var3.drawGameObjectEdges = 3; - var3.field1690 = field1862[var21]; - var3.field1691 = 3 - var3.field1690; - } else if (var31.orientationA == 32) { - var3.drawGameObjectEdges = 6; - var3.field1690 = field1834[var21]; - var3.field1691 = 6 - var3.field1690; - } else if (var31.orientationA == 64) { - var3.drawGameObjectEdges = 12; - var3.field1690 = field1829[var21]; - var3.field1691 = 12 - var3.field1690; + if (var31 != null) { // L: 941 + if ((var31.orientationA & field1851[var21]) != 0) { // L: 942 + if (var31.orientationA == 16) { // L: 943 + var3.drawGameObjectEdges = 3; // L: 944 + var3.field1678 = field1881[var21]; // L: 945 + var3.field1687 = 3 - var3.field1678; // L: 946 + } else if (var31.orientationA == 32) { // L: 948 + var3.drawGameObjectEdges = 6; // L: 949 + var3.field1678 = field1882[var21]; // L: 950 + var3.field1687 = 6 - var3.field1678; // L: 951 + } else if (var31.orientationA == 64) { // L: 953 + var3.drawGameObjectEdges = 12; // L: 954 + var3.field1678 = field1883[var21]; // L: 955 + var3.field1687 = 12 - var3.field1678; // L: 956 } else { - var3.drawGameObjectEdges = 9; - var3.field1690 = field1880[var21]; - var3.field1691 = 9 - var3.field1690; + var3.drawGameObjectEdges = 9; // L: 959 + var3.field1678 = field1884[var21]; // L: 960 + var3.field1687 = 9 - var3.field1678; // L: 961 } } else { - var3.drawGameObjectEdges = 0; + var3.drawGameObjectEdges = 0; // L: 964 } - if ((var31.orientationA & var11) != 0 && !this.method3240(var7, var4, var5, var31.orientationA)) { + if ((var31.orientationA & var11) != 0 && !this.method3208(var7, var4, var5, var31.orientationA)) { // L: 965 var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } - if ((var31.orientationB & var11) != 0 && !this.method3240(var7, var4, var5, var31.orientationB)) { + if ((var31.orientationB & var11) != 0 && !this.method3208(var7, var4, var5, var31.orientationB)) { // L: 966 var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag); } } - if (var13 != null && !this.method3241(var7, var4, var5, var13.entity1.height)) { - if ((var13.orientation & var11) != 0) { - var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); - } else if (var13.orientation == 256) { - var14 = var13.x - Scene_cameraX; - var15 = var13.tileHeight - Scene_cameraY; - var16 = var13.y - Scene_cameraZ; - var17 = var13.orientation2; - if (var17 != 1 && var17 != 2) { - var18 = var14; + if (var13 != null && !this.method3238(var7, var4, var5, var13.entity1.height)) { // L: 968 + if ((var13.orientation & var11) != 0) { // L: 969 + var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970 + } else if (var13.orientation == 256) { // L: 972 + var14 = var13.x - Scene_cameraX; // L: 973 + var15 = var13.tileHeight - Scene_cameraY; // L: 974 + var16 = var13.y - Scene_cameraZ; // L: 975 + var17 = var13.orientation2; // L: 976 + if (var17 != 1 && var17 != 2) { // L: 978 + var18 = var14; // L: 979 } else { var18 = -var14; } int var19; - if (var17 != 2 && var17 != 3) { - var19 = var16; + if (var17 != 2 && var17 != 3) { // L: 981 + var19 = var16; // L: 982 } else { var19 = -var16; } - if (var19 < var18) { - var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); - } else if (var13.entity2 != null) { - var13.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); + if (var19 < var18) { // L: 983 + var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984 + } else if (var13.entity2 != null) { // L: 986 + var13.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987 } } } - if (var20) { - FloorDecoration var22 = var3.floorDecoration; - if (var22 != null) { + if (var20) { // L: 991 + FloorDecoration var22 = var3.floorDecoration; // L: 992 + if (var22 != null) { // L: 993 var22.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag); } - TileItemPile var23 = var3.tileItemPile; - if (var23 != null && var23.height == 0) { - if (var23.second != null) { + TileItemPile var23 = var3.tileItemPile; // L: 994 + if (var23 != null && var23.height == 0) { // L: 995 + if (var23.second != null) { // L: 996 var23.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.third != null) { + if (var23.third != null) { // L: 997 var23.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } - if (var23.first != null) { + if (var23.first != null) { // L: 998 var23.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag); } } } - var14 = var3.gameObjectsEdgeMask; - if (var14 != 0) { - if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { - var36 = var8[var4 + 1][var5]; - if (var36 != null && var36.drawSecondary) { + var14 = var3.gameObjectsEdgeMask; // L: 1001 + if (var14 != 0) { // L: 1002 + if (var4 < Scene_cameraXTile && (var14 & 4) != 0) { // L: 1003 + var36 = var8[var4 + 1][var5]; // L: 1004 + if (var36 != null && var36.drawSecondary) { // L: 1005 Scene_tilesDeque.addFirst(var36); } } - if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { - var36 = var8[var4][var5 + 1]; - if (var36 != null && var36.drawSecondary) { + if (var5 < Scene_cameraYTile && (var14 & 2) != 0) { // L: 1007 + var36 = var8[var4][var5 + 1]; // L: 1008 + if (var36 != null && var36.drawSecondary) { // L: 1009 Scene_tilesDeque.addFirst(var36); } } - if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { - var36 = var8[var4 - 1][var5]; - if (var36 != null && var36.drawSecondary) { + if (var4 > Scene_cameraXTile && (var14 & 1) != 0) { // L: 1011 + var36 = var8[var4 - 1][var5]; // L: 1012 + if (var36 != null && var36.drawSecondary) { // L: 1013 Scene_tilesDeque.addFirst(var36); } } - if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { - var36 = var8[var4][var5 - 1]; - if (var36 != null && var36.drawSecondary) { + if (var5 > Scene_cameraYTile && (var14 & 8) != 0) { // L: 1015 + var36 = var8[var4][var5 - 1]; // L: 1016 + if (var36 != null && var36.drawSecondary) { // L: 1017 Scene_tilesDeque.addFirst(var36); } } @@ -1518,372 +1516,372 @@ public class Scene { break; } - if (var3.drawGameObjectEdges != 0) { - var20 = true; + if (var3.drawGameObjectEdges != 0) { // L: 1021 + var20 = true; // L: 1022 - for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { - if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1690) { - var20 = false; - break; + for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) { // L: 1023 + if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field1678) { // L: 1024 + var20 = false; // L: 1025 + break; // L: 1026 } } - if (var20) { - var10 = var3.boundaryObject; - if (!this.method3240(var7, var4, var5, var10.orientationA)) { + if (var20) { // L: 1029 + var10 = var3.boundaryObject; // L: 1030 + if (!this.method3208(var7, var4, var5, var10.orientationA)) { // L: 1031 var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag); } - var3.drawGameObjectEdges = 0; + var3.drawGameObjectEdges = 0; // L: 1032 } } - if (!var3.drawGameObjects) { + if (!var3.drawGameObjects) { // L: 1035 break; } try { - int var34 = var3.gameObjectsCount; - var3.drawGameObjects = false; - var21 = 0; + int var34 = var3.gameObjectsCount; // L: 1037 + var3.drawGameObjects = false; // L: 1038 + var21 = 0; // L: 1039 label563: - for (var11 = 0; var11 < var34; ++var11) { - var12 = var3.gameObjects[var11]; - if (var12.lastDrawn != Scene_drawnCount) { - for (var24 = var12.startX; var24 <= var12.endX; ++var24) { - for (var14 = var12.startY; var14 <= var12.endY; ++var14) { - var36 = var8[var24][var14]; - if (var36.drawPrimary) { - var3.drawGameObjects = true; - continue label563; + for (var11 = 0; var11 < var34; ++var11) { // L: 1040 + var12 = var3.gameObjects[var11]; // L: 1041 + if (var12.lastDrawn != Scene_drawnCount) { // L: 1042 + for (var24 = var12.startX; var24 <= var12.endX; ++var24) { // L: 1043 + for (var14 = var12.startY; var14 <= var12.endY; ++var14) { // L: 1044 + var36 = var8[var24][var14]; // L: 1045 + if (var36.drawPrimary) { // L: 1046 + var3.drawGameObjects = true; // L: 1047 + continue label563; // L: 1048 } - if (var36.drawGameObjectEdges != 0) { - var16 = 0; - if (var24 > var12.startX) { + if (var36.drawGameObjectEdges != 0) { // L: 1050 + var16 = 0; // L: 1051 + if (var24 > var12.startX) { // L: 1052 ++var16; } - if (var24 < var12.endX) { + if (var24 < var12.endX) { // L: 1053 var16 += 4; } - if (var14 > var12.startY) { + if (var14 > var12.startY) { // L: 1054 var16 += 8; } - if (var14 < var12.endY) { + if (var14 < var12.endY) { // L: 1055 var16 += 2; } - if ((var16 & var36.drawGameObjectEdges) == var3.field1691) { - var3.drawGameObjects = true; - continue label563; + if ((var16 & var36.drawGameObjectEdges) == var3.field1687) { // L: 1056 + var3.drawGameObjects = true; // L: 1057 + continue label563; // L: 1058 } } } } - gameObjects[var21++] = var12; - var24 = Scene_cameraXTile - var12.startX; - var14 = var12.endX - Scene_cameraXTile; - if (var14 > var24) { + gameObjects[var21++] = var12; // L: 1063 + var24 = Scene_cameraXTile - var12.startX; // L: 1064 + var14 = var12.endX - Scene_cameraXTile; // L: 1065 + if (var14 > var24) { // L: 1066 var24 = var14; } - var15 = Scene_cameraYTile - var12.startY; - var16 = var12.endY - Scene_cameraYTile; - if (var16 > var15) { - var12.field1959 = var24 + var16; + var15 = Scene_cameraYTile - var12.startY; // L: 1067 + var16 = var12.endY - Scene_cameraYTile; // L: 1068 + if (var16 > var15) { // L: 1069 + var12.field1974 = var24 + var16; } else { - var12.field1959 = var24 + var15; + var12.field1974 = var24 + var15; // L: 1070 } } } - while (var21 > 0) { - var11 = -50; - var25 = -1; + while (var21 > 0) { // L: 1073 + var11 = -50; // L: 1074 + var25 = -1; // L: 1075 - for (var24 = 0; var24 < var21; ++var24) { - GameObject var35 = gameObjects[var24]; - if (var35.lastDrawn != Scene_drawnCount) { - if (var35.field1959 > var11) { - var11 = var35.field1959; - var25 = var24; - } else if (var11 == var35.field1959) { - var15 = var35.centerX - Scene_cameraX; - var16 = var35.centerY - Scene_cameraZ; - var17 = gameObjects[var25].centerX - Scene_cameraX; - var18 = gameObjects[var25].centerY - Scene_cameraZ; - if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { + for (var24 = 0; var24 < var21; ++var24) { // L: 1076 + GameObject var35 = gameObjects[var24]; // L: 1077 + if (var35.lastDrawn != Scene_drawnCount) { // L: 1078 + if (var35.field1974 > var11) { // L: 1079 + var11 = var35.field1974; // L: 1080 + var25 = var24; // L: 1081 + } else if (var11 == var35.field1974) { // L: 1083 + var15 = var35.centerX - Scene_cameraX; // L: 1084 + var16 = var35.centerY - Scene_cameraZ; // L: 1085 + var17 = gameObjects[var25].centerX - Scene_cameraX; // L: 1086 + var18 = gameObjects[var25].centerY - Scene_cameraZ; // L: 1087 + if (var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) { // L: 1088 var25 = var24; } } } } - if (var25 == -1) { + if (var25 == -1) { // L: 1092 break; } - GameObject var33 = gameObjects[var25]; - var33.lastDrawn = Scene_drawnCount; - if (!this.method3367(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { - var33.entity.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); + GameObject var33 = gameObjects[var25]; // L: 1093 + var33.lastDrawn = Scene_drawnCount; // L: 1094 + if (!this.method3297(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { // L: 1095 + var33.entity.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096 } - for (var14 = var33.startX; var14 <= var33.endX; ++var14) { - for (var15 = var33.startY; var15 <= var33.endY; ++var15) { - Tile var26 = var8[var14][var15]; - if (var26.drawGameObjectEdges != 0) { + for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1098 + for (var15 = var33.startY; var15 <= var33.endY; ++var15) { // L: 1099 + Tile var26 = var8[var14][var15]; // L: 1100 + if (var26.drawGameObjectEdges != 0) { // L: 1101 Scene_tilesDeque.addFirst(var26); - } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { + } else if ((var14 != var4 || var15 != var5) && var26.drawSecondary) { // L: 1102 Scene_tilesDeque.addFirst(var26); } } } } - if (!var3.drawGameObjects) { + if (!var3.drawGameObjects) { // L: 1106 break; } - } catch (Exception var28) { - var3.drawGameObjects = false; + } catch (Exception var28) { // L: 1108 + var3.drawGameObjects = false; // L: 1109 break; } } - } while(!var3.drawSecondary); - } while(var3.drawGameObjectEdges != 0); + } while(!var3.drawSecondary); // L: 1112 + } while(var3.drawGameObjectEdges != 0); // L: 1113 - if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { + if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) { // L: 1114 break; } - var9 = var8[var4 - 1][var5]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4 - 1][var5]; // L: 1115 + } while(var9 != null && var9.drawSecondary); // L: 1116 - if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { + if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) { // L: 1118 break; } - var9 = var8[var4 + 1][var5]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4 + 1][var5]; // L: 1119 + } while(var9 != null && var9.drawSecondary); // L: 1120 - if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { + if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) { // L: 1122 break; } - var9 = var8[var4][var5 - 1]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4][var5 - 1]; // L: 1123 + } while(var9 != null && var9.drawSecondary); // L: 1124 - if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { + if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) { // L: 1126 break; } - var9 = var8[var4][var5 + 1]; - } while(var9 != null && var9.drawSecondary); + var9 = var8[var4][var5 + 1]; // L: 1127 + } while(var9 != null && var9.drawSecondary); // L: 1128 - var3.drawSecondary = false; - --tileUpdateCount; - TileItemPile var32 = var3.tileItemPile; - if (var32 != null && var32.height != 0) { - if (var32.second != null) { + var3.drawSecondary = false; // L: 1130 + --tileUpdateCount; // L: 1131 + TileItemPile var32 = var3.tileItemPile; // L: 1132 + if (var32 != null && var32.height != 0) { // L: 1133 + if (var32.second != null) { // L: 1134 var32.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.third != null) { + if (var32.third != null) { // L: 1135 var32.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } - if (var32.first != null) { + if (var32.first != null) { // L: 1136 var32.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var32.x - Scene_cameraX, var32.tileHeight - Scene_cameraY - var32.height, var32.y - Scene_cameraZ, var32.tag); } } - if (var3.field1692 != 0) { - WallDecoration var29 = var3.wallDecoration; - if (var29 != null && !this.method3241(var7, var4, var5, var29.entity1.height)) { - if ((var29.orientation & var3.field1692) != 0) { - var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); - } else if (var29.orientation == 256) { - var11 = var29.x - Scene_cameraX; - var25 = var29.tileHeight - Scene_cameraY; - var24 = var29.y - Scene_cameraZ; - var14 = var29.orientation2; - if (var14 != 1 && var14 != 2) { - var15 = var11; + if (var3.field1689 != 0) { // L: 1138 + WallDecoration var29 = var3.wallDecoration; // L: 1139 + if (var29 != null && !this.method3238(var7, var4, var5, var29.entity1.height)) { // L: 1140 + if ((var29.orientation & var3.field1689) != 0) { // L: 1141 + var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142 + } else if (var29.orientation == 256) { // L: 1144 + var11 = var29.x - Scene_cameraX; // L: 1145 + var25 = var29.tileHeight - Scene_cameraY; // L: 1146 + var24 = var29.y - Scene_cameraZ; // L: 1147 + var14 = var29.orientation2; // L: 1148 + if (var14 != 1 && var14 != 2) { // L: 1150 + var15 = var11; // L: 1151 } else { var15 = -var11; } - if (var14 != 2 && var14 != 3) { - var16 = var24; + if (var14 != 2 && var14 != 3) { // L: 1153 + var16 = var24; // L: 1154 } else { var16 = -var24; } - if (var16 >= var15) { - var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); - } else if (var29.entity2 != null) { - var29.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); + if (var16 >= var15) { // L: 1155 + var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156 + } else if (var29.entity2 != null) { // L: 1158 + var29.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159 } } } - BoundaryObject var27 = var3.boundaryObject; - if (var27 != null) { - if ((var27.orientationB & var3.field1692) != 0 && !this.method3240(var7, var4, var5, var27.orientationB)) { + BoundaryObject var27 = var3.boundaryObject; // L: 1163 + if (var27 != null) { // L: 1164 + if ((var27.orientationB & var3.field1689) != 0 && !this.method3208(var7, var4, var5, var27.orientationB)) { // L: 1165 var27.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } - if ((var27.orientationA & var3.field1692) != 0 && !this.method3240(var7, var4, var5, var27.orientationA)) { + if ((var27.orientationA & var3.field1689) != 0 && !this.method3208(var7, var4, var5, var27.orientationA)) { // L: 1166 var27.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag); } } } Tile var30; - if (var6 < this.planes - 1) { - var30 = this.tiles[var6 + 1][var4][var5]; - if (var30 != null && var30.drawSecondary) { + if (var6 < this.planes - 1) { // L: 1169 + var30 = this.tiles[var6 + 1][var4][var5]; // L: 1170 + if (var30 != null && var30.drawSecondary) { // L: 1171 Scene_tilesDeque.addFirst(var30); } } - if (var4 < Scene_cameraXTile) { - var30 = var8[var4 + 1][var5]; - if (var30 != null && var30.drawSecondary) { + if (var4 < Scene_cameraXTile) { // L: 1173 + var30 = var8[var4 + 1][var5]; // L: 1174 + if (var30 != null && var30.drawSecondary) { // L: 1175 Scene_tilesDeque.addFirst(var30); } } - if (var5 < Scene_cameraYTile) { - var30 = var8[var4][var5 + 1]; - if (var30 != null && var30.drawSecondary) { + if (var5 < Scene_cameraYTile) { // L: 1177 + var30 = var8[var4][var5 + 1]; // L: 1178 + if (var30 != null && var30.drawSecondary) { // L: 1179 Scene_tilesDeque.addFirst(var30); } } - if (var4 > Scene_cameraXTile) { - var30 = var8[var4 - 1][var5]; - if (var30 != null && var30.drawSecondary) { + if (var4 > Scene_cameraXTile) { // L: 1181 + var30 = var8[var4 - 1][var5]; // L: 1182 + if (var30 != null && var30.drawSecondary) { // L: 1183 Scene_tilesDeque.addFirst(var30); } } - if (var5 > Scene_cameraYTile) { - var30 = var8[var4][var5 - 1]; - if (var30 != null && var30.drawSecondary) { + if (var5 > Scene_cameraYTile) { // L: 1185 + var30 = var8[var4][var5 - 1]; // L: 1186 + if (var30 != null && var30.drawSecondary) { // L: 1187 Scene_tilesDeque.addFirst(var30); } } } } - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "(Lex;IIIIIII)V" + descriptor = "(Lem;IIIIIII)V" ) @Export("drawTileUnderlay") void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { int var9; - int var10 = var9 = (var7 << 7) - Scene_cameraX; + int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1195 int var11; - int var12 = var11 = (var8 << 7) - Scene_cameraZ; + int var12 = var11 = (var8 << 7) - Scene_cameraZ; // L: 1197 int var13; - int var14 = var13 = var10 + 128; + int var14 = var13 = var10 + 128; // L: 1199 int var15; - int var16 = var15 = var12 + 128; - int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; - int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; - int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; - int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; - int var21 = var10 * var6 + var5 * var12 >> 16; - var12 = var12 * var6 - var5 * var10 >> 16; - var10 = var21; - var21 = var17 * var4 - var3 * var12 >> 16; - var12 = var3 * var17 + var12 * var4 >> 16; - var17 = var21; - if (var12 >= 50) { - var21 = var14 * var6 + var5 * var11 >> 16; - var11 = var11 * var6 - var5 * var14 >> 16; - var14 = var21; - var21 = var18 * var4 - var3 * var11 >> 16; - var11 = var3 * var18 + var11 * var4 >> 16; - var18 = var21; - if (var11 >= 50) { - var21 = var13 * var6 + var5 * var16 >> 16; - var16 = var16 * var6 - var5 * var13 >> 16; - var13 = var21; - var21 = var19 * var4 - var3 * var16 >> 16; - var16 = var3 * var19 + var16 * var4 >> 16; - var19 = var21; - if (var16 >= 50) { - var21 = var9 * var6 + var5 * var15 >> 16; - var15 = var15 * var6 - var5 * var9 >> 16; - var9 = var21; - var21 = var20 * var4 - var3 * var15 >> 16; - var15 = var3 * var20 + var15 * var4 >> 16; - if (var15 >= 50) { - int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; - int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; - int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; - int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; - int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; - int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; - int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; - Rasterizer3D.Rasterizer3D_alpha = 0; + int var16 = var15 = var12 + 128; // L: 1201 + int var17 = this.tileHeights[var2][var7][var8] - Scene_cameraY; // L: 1202 + int var18 = this.tileHeights[var2][var7 + 1][var8] - Scene_cameraY; // L: 1203 + int var19 = this.tileHeights[var2][var7 + 1][var8 + 1] - Scene_cameraY; // L: 1204 + int var20 = this.tileHeights[var2][var7][var8 + 1] - Scene_cameraY; // L: 1205 + int var21 = var10 * var6 + var5 * var12 >> 16; // L: 1206 + var12 = var12 * var6 - var5 * var10 >> 16; // L: 1207 + var10 = var21; // L: 1208 + var21 = var17 * var4 - var3 * var12 >> 16; // L: 1209 + var12 = var3 * var17 + var12 * var4 >> 16; // L: 1210 + var17 = var21; // L: 1211 + if (var12 >= 50) { // L: 1212 + var21 = var14 * var6 + var5 * var11 >> 16; // L: 1213 + var11 = var11 * var6 - var5 * var14 >> 16; // L: 1214 + var14 = var21; // L: 1215 + var21 = var18 * var4 - var3 * var11 >> 16; // L: 1216 + var11 = var3 * var18 + var11 * var4 >> 16; // L: 1217 + var18 = var21; // L: 1218 + if (var11 >= 50) { // L: 1219 + var21 = var13 * var6 + var5 * var16 >> 16; // L: 1220 + var16 = var16 * var6 - var5 * var13 >> 16; // L: 1221 + var13 = var21; // L: 1222 + var21 = var19 * var4 - var3 * var16 >> 16; // L: 1223 + var16 = var3 * var19 + var16 * var4 >> 16; // L: 1224 + var19 = var21; // L: 1225 + if (var16 >= 50) { // L: 1226 + var21 = var9 * var6 + var5 * var15 >> 16; // L: 1227 + var15 = var15 * var6 - var5 * var9 >> 16; // L: 1228 + var9 = var21; // L: 1229 + var21 = var20 * var4 - var3 * var15 >> 16; // L: 1230 + var15 = var3 * var20 + var15 * var4 >> 16; // L: 1231 + if (var15 >= 50) { // L: 1233 + int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1234 + int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1235 + int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1236 + int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1237 + int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1238 + int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1239 + int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1240 + int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1241 + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1242 int var30; - if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { - Rasterizer3D.field1796 = false; - if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1796 = true; + if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { // L: 1243 + Rasterizer3D.field1791 = false; // L: 1244 + if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1245 + Rasterizer3D.field1791 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { - Scene_selectedX = var7; - Scene_selectedY = var8; + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { // L: 1246 + Scene_selectedX = var7; // L: 1247 + Scene_selectedY = var8; // L: 1248 } - if (var1.texture == -1) { - if (var1.neColor != 12345678) { - Rasterizer3D.method3122(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); + if (var1.texture == -1) { // L: 1250 + if (var1.neColor != 12345678) { // L: 1251 + Rasterizer3D.method3117(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); } - } else if (!Scene_isLowDetail) { - if (var1.isFlat) { + } else if (!Scene_isLowDetail) { // L: 1253 + if (var1.isFlat) { // L: 1254 Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); } else { - Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); + Rasterizer3D.drawTexturedTile(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture); // L: 1255 } } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3122(var27, var29, var25, var26, var28, var24, method3236(var30, var1.neColor), method3236(var30, var1.nwColor), method3236(var30, var1.seColor)); + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1258 + Rasterizer3D.method3117(var27, var29, var25, var26, var28, var24, method3355(var30, var1.neColor), method3355(var30, var1.nwColor), method3355(var30, var1.seColor)); // L: 1259 } } - if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { - Rasterizer3D.field1796 = false; - if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1796 = true; + if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) { // L: 1262 + Rasterizer3D.field1791 = false; // L: 1263 + if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1264 + Rasterizer3D.field1791 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { - Scene_selectedX = var7; - Scene_selectedY = var8; + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) { // L: 1265 + Scene_selectedX = var7; // L: 1266 + Scene_selectedY = var8; // L: 1267 } - if (var1.texture == -1) { - if (var1.swColor != 12345678) { - Rasterizer3D.method3122(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); + if (var1.texture == -1) { // L: 1269 + if (var1.swColor != 12345678) { // L: 1270 + Rasterizer3D.method3117(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor); } - } else if (!Scene_isLowDetail) { - Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); + } else if (!Scene_isLowDetail) { // L: 1272 + Rasterizer3D.drawTexturedTile(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture); // L: 1273 } else { - var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); - Rasterizer3D.method3122(var23, var25, var29, var22, var24, var28, method3236(var30, var1.swColor), method3236(var30, var1.seColor), method3236(var30, var1.nwColor)); + var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture); // L: 1276 + Rasterizer3D.method3117(var23, var25, var29, var22, var24, var28, method3355(var30, var1.swColor), method3355(var30, var1.seColor), method3355(var30, var1.nwColor)); // L: 1277 } } @@ -1891,566 +1889,566 @@ public class Scene { } } } - } + } // L: 1280 - @ObfuscatedName("ay") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "(Lej;IIIIII)V" + descriptor = "(Len;IIIIII)V" ) @Export("drawTileOverlay") void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) { - int var8 = var1.vertexX.length; + int var8 = var1.vertexX.length; // L: 1283 int var9; int var10; int var11; int var12; int var13; - for (var9 = 0; var9 < var8; ++var9) { - var10 = var1.vertexX[var9] - Scene_cameraX; - var11 = var1.vertexY[var9] - Scene_cameraY; - var12 = var1.vertexZ[var9] - Scene_cameraZ; - var13 = var12 * var4 + var5 * var10 >> 16; - var12 = var5 * var12 - var10 * var4 >> 16; - var10 = var13; - var13 = var3 * var11 - var12 * var2 >> 16; - var12 = var11 * var2 + var3 * var12 >> 16; - if (var12 < 50) { + for (var9 = 0; var9 < var8; ++var9) { // L: 1284 + var10 = var1.vertexX[var9] - Scene_cameraX; // L: 1285 + var11 = var1.vertexY[var9] - Scene_cameraY; // L: 1286 + var12 = var1.vertexZ[var9] - Scene_cameraZ; // L: 1287 + var13 = var12 * var4 + var5 * var10 >> 16; // L: 1288 + var12 = var5 * var12 - var10 * var4 >> 16; // L: 1289 + var10 = var13; // L: 1290 + var13 = var3 * var11 - var12 * var2 >> 16; // L: 1291 + var12 = var11 * var2 + var3 * var12 >> 16; // L: 1292 + if (var12 < 50) { // L: 1294 return; } - if (var1.triangleTextureId != null) { - TileModel.field1634[var9] = var10; - TileModel.field1635[var9] = var13; - TileModel.field1636[var9] = var12; + if (var1.triangleTextureId != null) { // L: 1295 + TileModel.field1628[var9] = var10; // L: 1296 + TileModel.field1624[var9] = var13; // L: 1297 + TileModel.field1630[var9] = var12; // L: 1298 } - TileModel.field1632[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; - TileModel.field1625[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; + TileModel.field1626[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300 + TileModel.field1627[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301 } - Rasterizer3D.Rasterizer3D_alpha = 0; - var8 = var1.faceX.length; + Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303 + var8 = var1.faceX.length; // L: 1304 - for (var9 = 0; var9 < var8; ++var9) { - var10 = var1.faceX[var9]; - var11 = var1.faceY[var9]; - var12 = var1.faceZ[var9]; - var13 = TileModel.field1632[var10]; - int var14 = TileModel.field1632[var11]; - int var15 = TileModel.field1632[var12]; - int var16 = TileModel.field1625[var10]; - int var17 = TileModel.field1625[var11]; - int var18 = TileModel.field1625[var12]; - if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { - Rasterizer3D.field1796 = false; - if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { - Rasterizer3D.field1796 = true; + for (var9 = 0; var9 < var8; ++var9) { // L: 1305 + var10 = var1.faceX[var9]; // L: 1306 + var11 = var1.faceY[var9]; // L: 1307 + var12 = var1.faceZ[var9]; // L: 1308 + var13 = TileModel.field1626[var10]; // L: 1309 + int var14 = TileModel.field1626[var11]; // L: 1310 + int var15 = TileModel.field1626[var12]; // L: 1311 + int var16 = TileModel.field1627[var10]; // L: 1312 + int var17 = TileModel.field1627[var11]; // L: 1313 + int var18 = TileModel.field1627[var12]; // L: 1314 + if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315 + Rasterizer3D.field1791 = false; // L: 1316 + if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317 + Rasterizer3D.field1791 = true; } - if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { - Scene_selectedX = var6; - Scene_selectedY = var7; + if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { // L: 1318 + Scene_selectedX = var6; // L: 1319 + Scene_selectedY = var7; // L: 1320 } - if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { - if (!Scene_isLowDetail) { - if (var1.isFlat) { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1634[0], TileModel.field1634[1], TileModel.field1634[3], TileModel.field1635[0], TileModel.field1635[1], TileModel.field1635[3], TileModel.field1636[0], TileModel.field1636[1], TileModel.field1636[3], var1.triangleTextureId[var9]); + if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322 + if (!Scene_isLowDetail) { // L: 1326 + if (var1.isFlat) { // L: 1327 + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1628[0], TileModel.field1628[1], TileModel.field1628[3], TileModel.field1624[0], TileModel.field1624[1], TileModel.field1624[3], TileModel.field1630[0], TileModel.field1630[1], TileModel.field1630[3], var1.triangleTextureId[var9]); } else { - Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1634[var10], TileModel.field1634[var11], TileModel.field1634[var12], TileModel.field1635[var10], TileModel.field1635[var11], TileModel.field1635[var12], TileModel.field1636[var10], TileModel.field1636[var11], TileModel.field1636[var12], var1.triangleTextureId[var9]); + Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1628[var10], TileModel.field1628[var11], TileModel.field1628[var12], TileModel.field1624[var10], TileModel.field1624[var11], TileModel.field1624[var12], TileModel.field1630[var10], TileModel.field1630[var11], TileModel.field1630[var12], var1.triangleTextureId[var9]); // L: 1328 } } else { - int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); - Rasterizer3D.method3122(var16, var17, var18, var13, var14, var15, method3236(var19, var1.triangleColorA[var9]), method3236(var19, var1.triangleColorB[var9]), method3236(var19, var1.triangleColorC[var9])); + int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331 + Rasterizer3D.method3117(var16, var17, var18, var13, var14, var15, method3355(var19, var1.triangleColorA[var9]), method3355(var19, var1.triangleColorB[var9]), method3355(var19, var1.triangleColorC[var9])); // L: 1332 } - } else if (var1.triangleColorA[var9] != 12345678) { - Rasterizer3D.method3122(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); + } else if (var1.triangleColorA[var9] != 12345678) { // L: 1323 + Rasterizer3D.method3117(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); } } } - } + } // L: 1337 - @ObfuscatedName("bk") + @ObfuscatedName("bl") @Export("occlude") void occlude() { - int var1 = Scene_planeOccluderCounts[Scene_plane]; - Occluder[] var2 = Scene_planeOccluders[Scene_plane]; - Scene_currentOccludersCount = 0; + int var1 = Scene_planeOccluderCounts[Scene_plane]; // L: 1364 + Occluder[] var2 = Scene_planeOccluders[Scene_plane]; // L: 1365 + Scene_currentOccludersCount = 0; // L: 1366 - for (int var3 = 0; var3 < var1; ++var3) { - Occluder var4 = var2[var3]; + for (int var3 = 0; var3 < var1; ++var3) { // L: 1367 + Occluder var4 = var2[var3]; // L: 1368 int var5; int var6; int var7; int var9; boolean var13; - if (var4.type == 1) { - var5 = var4.minTileX - Scene_cameraXTile + 25; - if (var5 >= 0 && var5 <= 50) { - var6 = var4.minTileY - Scene_cameraYTile + 25; - if (var6 < 0) { + if (var4.type == 1) { // L: 1369 + var5 = var4.minTileX - Scene_cameraXTile + 25; // L: 1370 + if (var5 >= 0 && var5 <= 50) { // L: 1371 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1372 + if (var6 < 0) { // L: 1373 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; - if (var7 > 50) { + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1374 + if (var7 > 50) { // L: 1375 var7 = 50; } - var13 = false; + var13 = false; // L: 1376 - while (var6 <= var7) { - if (visibleTiles[var5][var6++]) { - var13 = true; + while (var6 <= var7) { // L: 1377 + if (visibleTiles[var5][var6++]) { // L: 1378 + var13 = true; // L: 1379 break; } } - if (var13) { - var9 = Scene_cameraX - var4.minX; - if (var9 > 32) { - var4.field1927 = 1; + if (var13) { // L: 1383 + var9 = Scene_cameraX - var4.minX; // L: 1384 + if (var9 > 32) { // L: 1385 + var4.field1941 = 1; } else { - if (var9 >= -32) { + if (var9 >= -32) { // L: 1386 continue; } - var4.field1927 = 2; - var9 = -var9; + var4.field1941 = 2; // L: 1387 + var9 = -var9; // L: 1388 } - var4.field1926 = (var4.minZ - Scene_cameraZ << 8) / var9; - var4.field1931 = (var4.maxZ - Scene_cameraZ << 8) / var9; - var4.field1932 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1928 = (var4.maxY - Scene_cameraY << 8) / var9; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + var4.field1944 = (var4.minZ - Scene_cameraZ << 8) / var9; // L: 1391 + var4.field1945 = (var4.maxZ - Scene_cameraZ << 8) / var9; // L: 1392 + var4.field1930 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1393 + var4.field1947 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1394 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1395 } } - } else if (var4.type == 2) { - var5 = var4.minTileY - Scene_cameraYTile + 25; - if (var5 >= 0 && var5 <= 50) { - var6 = var4.minTileX - Scene_cameraXTile + 25; - if (var6 < 0) { + } else if (var4.type == 2) { // L: 1398 + var5 = var4.minTileY - Scene_cameraYTile + 25; // L: 1399 + if (var5 >= 0 && var5 <= 50) { // L: 1400 + var6 = var4.minTileX - Scene_cameraXTile + 25; // L: 1401 + if (var6 < 0) { // L: 1402 var6 = 0; } - var7 = var4.maxTileX - Scene_cameraXTile + 25; - if (var7 > 50) { + var7 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1403 + if (var7 > 50) { // L: 1404 var7 = 50; } - var13 = false; + var13 = false; // L: 1405 - while (var6 <= var7) { - if (visibleTiles[var6++][var5]) { - var13 = true; + while (var6 <= var7) { // L: 1406 + if (visibleTiles[var6++][var5]) { // L: 1407 + var13 = true; // L: 1408 break; } } - if (var13) { - var9 = Scene_cameraZ - var4.minZ; - if (var9 > 32) { - var4.field1927 = 3; + if (var13) { // L: 1412 + var9 = Scene_cameraZ - var4.minZ; // L: 1413 + if (var9 > 32) { // L: 1414 + var4.field1941 = 3; } else { - if (var9 >= -32) { + if (var9 >= -32) { // L: 1415 continue; } - var4.field1927 = 4; - var9 = -var9; + var4.field1941 = 4; // L: 1416 + var9 = -var9; // L: 1417 } - var4.field1920 = (var4.minX - Scene_cameraX << 8) / var9; - var4.field1929 = (var4.maxX - Scene_cameraX << 8) / var9; - var4.field1932 = (var4.minY - Scene_cameraY << 8) / var9; - var4.field1928 = (var4.maxY - Scene_cameraY << 8) / var9; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + var4.field1946 = (var4.minX - Scene_cameraX << 8) / var9; // L: 1420 + var4.field1943 = (var4.maxX - Scene_cameraX << 8) / var9; // L: 1421 + var4.field1930 = (var4.minY - Scene_cameraY << 8) / var9; // L: 1422 + var4.field1947 = (var4.maxY - Scene_cameraY << 8) / var9; // L: 1423 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1424 } } - } else if (var4.type == 4) { - var5 = var4.minY - Scene_cameraY; - if (var5 > 128) { - var6 = var4.minTileY - Scene_cameraYTile + 25; - if (var6 < 0) { + } else if (var4.type == 4) { // L: 1427 + var5 = var4.minY - Scene_cameraY; // L: 1428 + if (var5 > 128) { // L: 1429 + var6 = var4.minTileY - Scene_cameraYTile + 25; // L: 1430 + if (var6 < 0) { // L: 1431 var6 = 0; } - var7 = var4.maxTileY - Scene_cameraYTile + 25; - if (var7 > 50) { + var7 = var4.maxTileY - Scene_cameraYTile + 25; // L: 1432 + if (var7 > 50) { // L: 1433 var7 = 50; } - if (var6 <= var7) { - int var8 = var4.minTileX - Scene_cameraXTile + 25; - if (var8 < 0) { + if (var6 <= var7) { // L: 1434 + int var8 = var4.minTileX - Scene_cameraXTile + 25; // L: 1435 + if (var8 < 0) { // L: 1436 var8 = 0; } - var9 = var4.maxTileX - Scene_cameraXTile + 25; - if (var9 > 50) { + var9 = var4.maxTileX - Scene_cameraXTile + 25; // L: 1437 + if (var9 > 50) { // L: 1438 var9 = 50; } - boolean var10 = false; + boolean var10 = false; // L: 1439 - label144: - for (int var11 = var8; var11 <= var9; ++var11) { - for (int var12 = var6; var12 <= var7; ++var12) { - if (visibleTiles[var11][var12]) { - var10 = true; - break label144; + label148: + for (int var11 = var8; var11 <= var9; ++var11) { // L: 1440 + for (int var12 = var6; var12 <= var7; ++var12) { // L: 1441 + if (visibleTiles[var11][var12]) { // L: 1442 + var10 = true; // L: 1443 + break label148; } } } - if (var10) { - var4.field1927 = 5; - var4.field1920 = (var4.minX - Scene_cameraX << 8) / var5; - var4.field1929 = (var4.maxX - Scene_cameraX << 8) / var5; - var4.field1926 = (var4.minZ - Scene_cameraZ << 8) / var5; - var4.field1931 = (var4.maxZ - Scene_cameraZ << 8) / var5; - Scene_currentOccluders[Scene_currentOccludersCount++] = var4; + if (var10) { // L: 1448 + var4.field1941 = 5; // L: 1449 + var4.field1946 = (var4.minX - Scene_cameraX << 8) / var5; // L: 1450 + var4.field1943 = (var4.maxX - Scene_cameraX << 8) / var5; // L: 1451 + var4.field1944 = (var4.minZ - Scene_cameraZ << 8) / var5; // L: 1452 + var4.field1945 = (var4.maxZ - Scene_cameraZ << 8) / var5; // L: 1453 + Scene_currentOccluders[Scene_currentOccludersCount++] = var4; // L: 1454 } } } } } + } // L: 1458 + + @ObfuscatedName("bc") + boolean method3236(int var1, int var2, int var3) { + int var4 = this.field1841[var1][var2][var3]; // L: 1461 + if (var4 == -Scene_drawnCount) { // L: 1462 + return false; + } else if (var4 == Scene_drawnCount) { // L: 1463 + return true; + } else { + int var5 = var2 << 7; // L: 1464 + int var6 = var3 << 7; // L: 1465 + if (this.method3188(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3188(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { // L: 1466 + this.field1841[var1][var2][var3] = Scene_drawnCount; // L: 1467 + return true; // L: 1468 + } else { + this.field1841[var1][var2][var3] = -Scene_drawnCount; // L: 1471 + return false; // L: 1472 + } + } + } + + @ObfuscatedName("bz") + boolean method3208(int var1, int var2, int var3, int var4) { + if (!this.method3236(var1, var2, var3)) { // L: 1477 + return false; + } else { + int var5 = var2 << 7; // L: 1478 + int var6 = var3 << 7; // L: 1479 + int var7 = this.tileHeights[var1][var2][var3] - 1; // L: 1480 + int var8 = var7 - 120; // L: 1481 + int var9 = var7 - 230; // L: 1482 + int var10 = var7 - 238; // L: 1483 + if (var4 < 16) { // L: 1484 + if (var4 == 1) { // L: 1485 + if (var5 > Scene_cameraX) { // L: 1486 + if (!this.method3188(var5, var7, var6)) { // L: 1487 + return false; + } + + if (!this.method3188(var5, var7, var6 + 128)) { // L: 1488 + return false; + } + } + + if (var1 > 0) { // L: 1490 + if (!this.method3188(var5, var8, var6)) { // L: 1491 + return false; + } + + if (!this.method3188(var5, var8, var6 + 128)) { // L: 1492 + return false; + } + } + + if (!this.method3188(var5, var9, var6)) { // L: 1494 + return false; + } + + if (!this.method3188(var5, var9, var6 + 128)) { // L: 1495 + return false; + } + + return true; // L: 1496 + } + + if (var4 == 2) { // L: 1498 + if (var6 < Scene_cameraZ) { // L: 1499 + if (!this.method3188(var5, var7, var6 + 128)) { // L: 1500 + return false; + } + + if (!this.method3188(var5 + 128, var7, var6 + 128)) { // L: 1501 + return false; + } + } + + if (var1 > 0) { // L: 1503 + if (!this.method3188(var5, var8, var6 + 128)) { // L: 1504 + return false; + } + + if (!this.method3188(var5 + 128, var8, var6 + 128)) { // L: 1505 + return false; + } + } + + if (!this.method3188(var5, var9, var6 + 128)) { // L: 1507 + return false; + } + + if (!this.method3188(var5 + 128, var9, var6 + 128)) { // L: 1508 + return false; + } + + return true; // L: 1509 + } + + if (var4 == 4) { // L: 1511 + if (var5 < Scene_cameraX) { // L: 1512 + if (!this.method3188(var5 + 128, var7, var6)) { // L: 1513 + return false; + } + + if (!this.method3188(var5 + 128, var7, var6 + 128)) { // L: 1514 + return false; + } + } + + if (var1 > 0) { // L: 1516 + if (!this.method3188(var5 + 128, var8, var6)) { // L: 1517 + return false; + } + + if (!this.method3188(var5 + 128, var8, var6 + 128)) { // L: 1518 + return false; + } + } + + if (!this.method3188(var5 + 128, var9, var6)) { // L: 1520 + return false; + } + + if (!this.method3188(var5 + 128, var9, var6 + 128)) { // L: 1521 + return false; + } + + return true; // L: 1522 + } + + if (var4 == 8) { // L: 1524 + if (var6 > Scene_cameraZ) { // L: 1525 + if (!this.method3188(var5, var7, var6)) { // L: 1526 + return false; + } + + if (!this.method3188(var5 + 128, var7, var6)) { // L: 1527 + return false; + } + } + + if (var1 > 0) { // L: 1529 + if (!this.method3188(var5, var8, var6)) { // L: 1530 + return false; + } + + if (!this.method3188(var5 + 128, var8, var6)) { // L: 1531 + return false; + } + } + + if (!this.method3188(var5, var9, var6)) { // L: 1533 + return false; + } + + if (!this.method3188(var5 + 128, var9, var6)) { // L: 1534 + return false; + } + + return true; // L: 1535 + } + } + + if (!this.method3188(var5 + 64, var10, var6 + 64)) { // L: 1538 + return false; + } else if (var4 == 16) { // L: 1539 + return this.method3188(var5, var9, var6 + 128); // L: 1540 + } else if (var4 == 32) { // L: 1543 + return this.method3188(var5 + 128, var9, var6 + 128); // L: 1544 + } else if (var4 == 64) { // L: 1547 + return this.method3188(var5 + 128, var9, var6); // L: 1548 + } else if (var4 == 128) { // L: 1551 + return this.method3188(var5, var9, var6); // L: 1552 + } else { + return true; // L: 1555 + } + } + } + + @ObfuscatedName("bj") + boolean method3238(int var1, int var2, int var3, int var4) { + if (!this.method3236(var1, var2, var3)) { // L: 1559 + return false; + } else { + int var5 = var2 << 7; // L: 1560 + int var6 = var3 << 7; // L: 1561 + return this.method3188(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3188(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3188(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); // L: 1562 + } } @ObfuscatedName("bh") - boolean method3196(int var1, int var2, int var3) { - int var4 = this.field1839[var1][var2][var3]; - if (var4 == -Scene_drawnCount) { - return false; - } else if (var4 == Scene_drawnCount) { - return true; - } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - if (this.method3243(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3243(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3243(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3243(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field1839[var1][var2][var3] = Scene_drawnCount; - return true; - } else { - this.field1839[var1][var2][var3] = -Scene_drawnCount; - return false; - } - } - } - - @ObfuscatedName("bg") - boolean method3240(int var1, int var2, int var3, int var4) { - if (!this.method3196(var1, var2, var3)) { - return false; - } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - int var7 = this.tileHeights[var1][var2][var3] - 1; - int var8 = var7 - 120; - int var9 = var7 - 230; - int var10 = var7 - 238; - if (var4 < 16) { - if (var4 == 1) { - if (var5 > Scene_cameraX) { - if (!this.method3243(var5, var7, var6)) { - return false; - } - - if (!this.method3243(var5, var7, var6 + 128)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3243(var5, var8, var6)) { - return false; - } - - if (!this.method3243(var5, var8, var6 + 128)) { - return false; - } - } - - if (!this.method3243(var5, var9, var6)) { - return false; - } - - if (!this.method3243(var5, var9, var6 + 128)) { - return false; - } - - return true; - } - - if (var4 == 2) { - if (var6 < Scene_cameraZ) { - if (!this.method3243(var5, var7, var6 + 128)) { - return false; - } - - if (!this.method3243(var5 + 128, var7, var6 + 128)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3243(var5, var8, var6 + 128)) { - return false; - } - - if (!this.method3243(var5 + 128, var8, var6 + 128)) { - return false; - } - } - - if (!this.method3243(var5, var9, var6 + 128)) { - return false; - } - - if (!this.method3243(var5 + 128, var9, var6 + 128)) { - return false; - } - - return true; - } - - if (var4 == 4) { - if (var5 < Scene_cameraX) { - if (!this.method3243(var5 + 128, var7, var6)) { - return false; - } - - if (!this.method3243(var5 + 128, var7, var6 + 128)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3243(var5 + 128, var8, var6)) { - return false; - } - - if (!this.method3243(var5 + 128, var8, var6 + 128)) { - return false; - } - } - - if (!this.method3243(var5 + 128, var9, var6)) { - return false; - } - - if (!this.method3243(var5 + 128, var9, var6 + 128)) { - return false; - } - - return true; - } - - if (var4 == 8) { - if (var6 > Scene_cameraZ) { - if (!this.method3243(var5, var7, var6)) { - return false; - } - - if (!this.method3243(var5 + 128, var7, var6)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3243(var5, var8, var6)) { - return false; - } - - if (!this.method3243(var5 + 128, var8, var6)) { - return false; - } - } - - if (!this.method3243(var5, var9, var6)) { - return false; - } - - if (!this.method3243(var5 + 128, var9, var6)) { - return false; - } - - return true; - } - } - - if (!this.method3243(var5 + 64, var10, var6 + 64)) { - return false; - } else if (var4 == 16) { - return this.method3243(var5, var9, var6 + 128); - } else if (var4 == 32) { - return this.method3243(var5 + 128, var9, var6 + 128); - } else if (var4 == 64) { - return this.method3243(var5 + 128, var9, var6); - } else if (var4 == 128) { - return this.method3243(var5, var9, var6); - } else { - return true; - } - } - } - - @ObfuscatedName("be") - boolean method3241(int var1, int var2, int var3, int var4) { - if (!this.method3196(var1, var2, var3)) { - return false; - } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - return this.method3243(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3243(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3243(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3243(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); - } - } - - @ObfuscatedName("bf") - boolean method3367(int var1, int var2, int var3, int var4, int var5, int var6) { + boolean method3297(int var1, int var2, int var3, int var4, int var5, int var6) { int var7; int var8; - if (var3 == var2 && var5 == var4) { - if (!this.method3196(var1, var2, var4)) { + if (var3 == var2 && var5 == var4) { // L: 1567 + if (!this.method3236(var1, var2, var4)) { // L: 1568 return false; } else { - var7 = var2 << 7; - var8 = var4 << 7; - return this.method3243(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3243(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3243(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3243(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + var7 = var2 << 7; // L: 1569 + var8 = var4 << 7; // L: 1570 + return this.method3188(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3188(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3188(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3188(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); // L: 1571 } } else { - for (var7 = var2; var7 <= var3; ++var7) { - for (var8 = var4; var8 <= var5; ++var8) { - if (this.field1839[var1][var7][var8] == -Scene_drawnCount) { + for (var7 = var2; var7 <= var3; ++var7) { // L: 1574 + for (var8 = var4; var8 <= var5; ++var8) { // L: 1575 + if (this.field1841[var1][var7][var8] == -Scene_drawnCount) { // L: 1576 return false; } } } - var7 = (var2 << 7) + 1; - var8 = (var4 << 7) + 2; - int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method3243(var7, var9, var8)) { + var7 = (var2 << 7) + 1; // L: 1579 + var8 = (var4 << 7) + 2; // L: 1580 + int var9 = this.tileHeights[var1][var2][var4] - var6; // L: 1581 + if (!this.method3188(var7, var9, var8)) { // L: 1582 return false; } else { - int var10 = (var3 << 7) - 1; - if (!this.method3243(var10, var9, var8)) { + int var10 = (var3 << 7) - 1; // L: 1583 + if (!this.method3188(var10, var9, var8)) { // L: 1584 return false; } else { - int var11 = (var5 << 7) - 1; - if (!this.method3243(var7, var9, var11)) { + int var11 = (var5 << 7) - 1; // L: 1585 + if (!this.method3188(var7, var9, var11)) { // L: 1586 return false; - } else if (!this.method3243(var10, var9, var11)) { + } else if (!this.method3188(var10, var9, var11)) { // L: 1587 return false; } else { - return true; + return true; // L: 1588 } } } } } - @ObfuscatedName("ba") - boolean method3243(int var1, int var2, int var3) { - for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { - Occluder var5 = Scene_currentOccluders[var4]; + @ObfuscatedName("bi") + boolean method3188(int var1, int var2, int var3) { + for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) { // L: 1592 + Occluder var5 = Scene_currentOccluders[var4]; // L: 1593 int var6; int var7; int var8; int var9; int var10; - if (var5.field1927 == 1) { - var6 = var5.minX - var1; - if (var6 > 0) { - var7 = (var6 * var5.field1926 >> 8) + var5.minZ; - var8 = (var6 * var5.field1931 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1932 >> 8) + var5.minY; - var10 = (var6 * var5.field1928 >> 8) + var5.maxY; - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { + if (var5.field1941 == 1) { // L: 1594 + var6 = var5.minX - var1; // L: 1595 + if (var6 > 0) { // L: 1596 + var7 = (var6 * var5.field1944 >> 8) + var5.minZ; // L: 1597 + var8 = (var6 * var5.field1945 >> 8) + var5.maxZ; // L: 1598 + var9 = (var6 * var5.field1930 >> 8) + var5.minY; // L: 1599 + var10 = (var6 * var5.field1947 >> 8) + var5.maxY; // L: 1600 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1601 return true; } } - } else if (var5.field1927 == 2) { - var6 = var1 - var5.minX; - if (var6 > 0) { - var7 = (var6 * var5.field1926 >> 8) + var5.minZ; - var8 = (var6 * var5.field1931 >> 8) + var5.maxZ; - var9 = (var6 * var5.field1932 >> 8) + var5.minY; - var10 = (var6 * var5.field1928 >> 8) + var5.maxY; - if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { + } else if (var5.field1941 == 2) { // L: 1605 + var6 = var1 - var5.minX; // L: 1606 + if (var6 > 0) { // L: 1607 + var7 = (var6 * var5.field1944 >> 8) + var5.minZ; // L: 1608 + var8 = (var6 * var5.field1945 >> 8) + var5.maxZ; // L: 1609 + var9 = (var6 * var5.field1930 >> 8) + var5.minY; // L: 1610 + var10 = (var6 * var5.field1947 >> 8) + var5.maxY; // L: 1611 + if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1612 return true; } } - } else if (var5.field1927 == 3) { - var6 = var5.minZ - var3; - if (var6 > 0) { - var7 = (var6 * var5.field1920 >> 8) + var5.minX; - var8 = (var6 * var5.field1929 >> 8) + var5.maxX; - var9 = (var6 * var5.field1932 >> 8) + var5.minY; - var10 = (var6 * var5.field1928 >> 8) + var5.maxY; - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { + } else if (var5.field1941 == 3) { // L: 1616 + var6 = var5.minZ - var3; // L: 1617 + if (var6 > 0) { // L: 1618 + var7 = (var6 * var5.field1946 >> 8) + var5.minX; // L: 1619 + var8 = (var6 * var5.field1943 >> 8) + var5.maxX; // L: 1620 + var9 = (var6 * var5.field1930 >> 8) + var5.minY; // L: 1621 + var10 = (var6 * var5.field1947 >> 8) + var5.maxY; // L: 1622 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1623 return true; } } - } else if (var5.field1927 == 4) { - var6 = var3 - var5.minZ; - if (var6 > 0) { - var7 = (var6 * var5.field1920 >> 8) + var5.minX; - var8 = (var6 * var5.field1929 >> 8) + var5.maxX; - var9 = (var6 * var5.field1932 >> 8) + var5.minY; - var10 = (var6 * var5.field1928 >> 8) + var5.maxY; - if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { + } else if (var5.field1941 == 4) { // L: 1627 + var6 = var3 - var5.minZ; // L: 1628 + if (var6 > 0) { // L: 1629 + var7 = (var6 * var5.field1946 >> 8) + var5.minX; // L: 1630 + var8 = (var6 * var5.field1943 >> 8) + var5.maxX; // L: 1631 + var9 = (var6 * var5.field1930 >> 8) + var5.minY; // L: 1632 + var10 = (var6 * var5.field1947 >> 8) + var5.maxY; // L: 1633 + if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) { // L: 1634 return true; } } - } else if (var5.field1927 == 5) { - var6 = var2 - var5.minY; - if (var6 > 0) { - var7 = (var6 * var5.field1920 >> 8) + var5.minX; - var8 = (var6 * var5.field1929 >> 8) + var5.maxX; - var9 = (var6 * var5.field1926 >> 8) + var5.minZ; - var10 = (var6 * var5.field1931 >> 8) + var5.maxZ; - if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { + } else if (var5.field1941 == 5) { // L: 1638 + var6 = var2 - var5.minY; // L: 1639 + if (var6 > 0) { // L: 1640 + var7 = (var6 * var5.field1946 >> 8) + var5.minX; // L: 1641 + var8 = (var6 * var5.field1943 >> 8) + var5.maxX; // L: 1642 + var9 = (var6 * var5.field1944 >> 8) + var5.minZ; // L: 1643 + var10 = (var6 * var5.field1945 >> 8) + var5.maxZ; // L: 1644 + if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) { // L: 1645 return true; } } } } - return false; + return false; // L: 1650 } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("Scene_addOccluder") public static void Scene_addOccluder(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - Occluder var8 = new Occluder(); - var8.minTileX = var2 / 128; - var8.maxTileX = var3 / 128; - var8.minTileY = var4 / 128; - var8.maxTileY = var5 / 128; - var8.type = var1; - var8.minX = var2; - var8.maxX = var3; - var8.minZ = var4; - var8.maxZ = var5; - var8.minY = var6; - var8.maxY = var7; - Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; - } + Occluder var8 = new Occluder(); // L: 149 + var8.minTileX = var2 / 128; // L: 150 + var8.maxTileX = var3 / 128; // L: 151 + var8.minTileY = var4 / 128; // L: 152 + var8.maxTileY = var5 / 128; // L: 153 + var8.type = var1; // L: 154 + var8.minX = var2; // L: 155 + var8.maxX = var3; // L: 156 + var8.minZ = var4; // L: 157 + var8.maxZ = var5; // L: 158 + var8.minY = var6; // L: 159 + var8.maxY = var7; // L: 160 + Scene_planeOccluders[var0][Scene_planeOccluderCounts[var0]++] = var8; // L: 161 + } // L: 162 - @ObfuscatedName("an") + @ObfuscatedName("av") @Export("Scene_buildVisiblityMap") public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) { - Scene_viewportXMin = 0; - Scene_viewportYMin = 0; - Scene_viewportXMax = var3; - Scene_viewportYMax = var4; - Scene_viewportXCenter = var3 / 2; - Scene_viewportYCenter = var4 / 2; - boolean[][][][] var5 = new boolean[var0.length][32][53][53]; + Scene_viewportXMin = 0; // L: 638 + Scene_viewportYMin = 0; // L: 639 + Scene_viewportXMax = var3; // L: 640 + Scene_viewportYMax = var4; // L: 641 + Scene_viewportXCenter = var3 / 2; // L: 642 + Scene_viewportYCenter = var4 / 2; // L: 643 + boolean[][][][] var5 = new boolean[var0.length][32][53][53]; // L: 644 int var6; int var7; @@ -2458,136 +2456,135 @@ public class Scene { int var9; int var11; int var12; - for (var6 = 128; var6 <= 383; var6 += 32) { - for (var7 = 0; var7 < 2048; var7 += 64) { - Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; - Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; - Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; - Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; - var8 = (var6 - 128) / 32; - var9 = var7 / 64; + for (var6 = 128; var6 <= 383; var6 += 32) { // L: 645 + for (var7 = 0; var7 < 2048; var7 += 64) { // L: 646 + Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6]; // L: 647 + Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6]; // L: 648 + Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 649 + Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 650 + var8 = (var6 - 128) / 32; // L: 651 + var9 = var7 / 64; // L: 652 - for (int var10 = -26; var10 < 26; ++var10) { - for (var11 = -26; var11 < 26; ++var11) { - var12 = var10 * 128; - int var13 = var11 * 128; - boolean var14 = false; + for (int var10 = -26; var10 < 26; ++var10) { // L: 653 + for (var11 = -26; var11 < 26; ++var11) { // L: 654 + var12 = var10 * 128; // L: 655 + int var13 = var11 * 128; // L: 656 + boolean var14 = false; // L: 657 - for (int var15 = -var1; var15 <= var2; var15 += 128) { - if (method3227(var12, var0[var8] + var15, var13)) { - var14 = true; + for (int var15 = -var1; var15 <= var2; var15 += 128) { // L: 658 + if (method3229(var12, var0[var8] + var15, var13)) { // L: 659 + var14 = true; // L: 660 break; } } - var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; + var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14; // L: 664 } } } } - for (var6 = 0; var6 < 8; ++var6) { - for (var7 = 0; var7 < 32; ++var7) { - for (var8 = -25; var8 < 25; ++var8) { - for (var9 = -25; var9 < 25; ++var9) { - boolean var16 = false; + for (var6 = 0; var6 < 8; ++var6) { // L: 669 + for (var7 = 0; var7 < 32; ++var7) { // L: 670 + for (var8 = -25; var8 < 25; ++var8) { // L: 671 + for (var9 = -25; var9 < 25; ++var9) { // L: 672 + boolean var16 = false; // L: 673 - label76: - for (var11 = -1; var11 <= 1; ++var11) { - for (var12 = -1; var12 <= 1; ++var12) { - if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label76; + label85: + for (var11 = -1; var11 <= 1; ++var11) { // L: 674 + for (var12 = -1; var12 <= 1; ++var12) { // L: 675 + if (var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 676 + var16 = true; // L: 677 + break label85; } - if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label76; + if (var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 680 + var16 = true; // L: 681 + break label85; // L: 682 } - if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label76; + if (var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 684 + var16 = true; // L: 685 + break label85; // L: 686 } - if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { - var16 = true; - break label76; + if (var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) { // L: 688 + var16 = true; // L: 689 + break label85; // L: 690 } } } - visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; + visibilityMap[var6][var7][var8 + 25][var9 + 25] = var16; // L: 694 } } } } - } + } // L: 699 - @ObfuscatedName("ac") - static boolean method3227(int var0, int var1, int var2) { - int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; - int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; - int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; - int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; - if (var5 >= 50 && var5 <= 3500) { - int var7 = var3 * 128 / var5 + Scene_viewportXCenter; - int var8 = var6 * 128 / var5 + Scene_viewportYCenter; - return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; + @ObfuscatedName("ax") + static boolean method3229(int var0, int var1, int var2) { + int var3 = var0 * Scene_cameraYawCosine + var2 * Scene_cameraYawSine >> 16; // L: 702 + int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16; // L: 703 + int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16; // L: 704 + int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16; // L: 705 + if (var5 >= 50 && var5 <= 3500) { // L: 706 + int var7 = var3 * 128 / var5 + Scene_viewportXCenter; // L: 707 + int var8 = var6 * 128 / var5 + Scene_viewportYCenter; // L: 708 + return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; // L: 709 } else { - return false; + return false; // L: 710 } } - @ObfuscatedName("at") + @ObfuscatedName("ad") @Export("shouldSendWalk") public static boolean shouldSendWalk() { - return viewportWalking && Scene_selectedX != -1; + return viewportWalking && Scene_selectedX != -1; // L: 729 } - @ObfuscatedName("aa") - @Export("resetWalking") - public static void resetWalking() { - Scene_selectedX = -1; - viewportWalking = false; - } + @ObfuscatedName("ai") + public static void method3360() { + Scene_selectedX = -1; // L: 733 + viewportWalking = false; // L: 734 + } // L: 735 - @ObfuscatedName("au") - static final int method3236(int var0, int var1) { - var1 = (var0 & 127) * var1 >> 7; - if (var1 < 2) { + @ObfuscatedName("ak") + static final int method3355(int var0, int var1) { + var1 = (var0 & 127) * var1 >> 7; // L: 1340 + if (var1 < 2) { // L: 1341 var1 = 2; - } else if (var1 > 126) { + } else if (var1 > 126) { // L: 1342 var1 = 126; } - return (var0 & 65408) + var1; + return (var0 & 65408) + var1; // L: 1343 } - @ObfuscatedName("aj") + @ObfuscatedName("ac") @Export("containsBounds") static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - if (var1 < var2 && var1 < var3 && var1 < var4) { + if (var1 < var2 && var1 < var3 && var1 < var4) { // L: 1347 return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { + } else if (var1 > var2 && var1 > var3 && var1 > var4) { // L: 1348 return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { + } else if (var0 < var5 && var0 < var6 && var0 < var7) { // L: 1349 return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { + } else if (var0 > var5 && var0 > var6 && var0 > var7) { // L: 1350 return false; } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); - if (var8 == 0) { - if (var9 != 0) { - return var9 < 0 ? var10 <= 0 : var10 >= 0; + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); // L: 1351 + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); // L: 1352 + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); // L: 1353 + if (var8 == 0) { // L: 1354 + if (var9 != 0) { // L: 1357 + return var9 < 0 ? var10 <= 0 : var10 >= 0; // L: 1358 } else { - return true; + return true; // L: 1360 } } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; // L: 1355 } } } diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java index bdcee4aee0..43f19223f3 100644 --- a/runescape-client/src/main/java/Script.java +++ b/runescape-client/src/main/java/Script.java @@ -4,69 +4,198 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cs") +@ObfuscatedName("cy") @Implements("Script") public class Script extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("Script_cached") static EvictingDualNodeHashTable Script_cached; - @ObfuscatedName("o") + @ObfuscatedName("iz") + @ObfuscatedGetter( + intValue = 1391677451 + ) + @Export("selectedItemId") + static int selectedItemId; + @ObfuscatedName("k") @Export("opcodes") int[] opcodes; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("intOperands") int[] intOperands; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("stringOperands") String[] stringOperands; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 701670427 + intValue = 1204485325 ) @Export("localIntCount") int localIntCount; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 12358867 + intValue = 1685131019 ) @Export("localStringCount") int localStringCount; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 2127952993 + intValue = 1488258005 ) @Export("intArgumentCount") int intArgumentCount; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -983920549 + intValue = 395196509 ) @Export("stringArgumentCount") int stringArgumentCount; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "[Llf;" + descriptor = "[Llq;" ) @Export("switches") IterableNodeHashTable[] switches; static { - Script_cached = new EvictingDualNodeHashTable(128); + Script_cached = new EvictingDualNodeHashTable(128); // L: 12 } Script() { } - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)[Llf;", - garbageValue = "-978861309" + descriptor = "(II)[Llq;", + garbageValue = "-502401324" ) @Export("newIterableNodeHashTable") IterableNodeHashTable[] newIterableNodeHashTable(int var1) { - return new IterableNodeHashTable[var1]; + return new IterableNodeHashTable[var1]; // L: 153 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lby;B)V", + garbageValue = "-76" + ) + @Export("runScriptEvent") + public static void runScriptEvent(ScriptEvent var0) { + class280.runScript(var0, 500000); // L: 97 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IB)Lib;", + garbageValue = "-77" + ) + public static VarcInt method2324(int var0) { + VarcInt var1 = (VarcInt)VarcInt.VarcInt_cached.get((long)var0); // L: 17 + if (var1 != null) { // L: 18 + return var1; + } else { + byte[] var2 = VarcInt.VarcInt_archive.takeFile(19, var0); + var1 = new VarcInt(); + if (var2 != null) { // L: 21 + var1.method4488(new Buffer(var2)); + } + + VarcInt.VarcInt_cached.put(var1, (long)var0); // L: 22 + return var1; // L: 23 + } + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lic;I)V", + garbageValue = "-1494987066" + ) + public static void method2325(AbstractArchive var0) { + StructDefinition.StructDefinition_archive = var0; // L: 19 + } // L: 20 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;ZB)[B", + garbageValue = "15" + ) + public static byte[] method2323(Object var0, boolean var1) { + if (var0 == null) { // L: 30 + return null; + } else if (var0 instanceof byte[]) { // L: 31 + byte[] var6 = (byte[])((byte[])var0); // L: 32 + if (var1) { // L: 33 + int var4 = var6.length; + byte[] var5 = new byte[var4]; + System.arraycopy(var6, 0, var5, 0, var4); + return var5; + } else { + return var6; // L: 43 + } + } else if (var0 instanceof AbstractByteArrayCopier) { // L: 45 + AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; // L: 46 + return var2.get(); // L: 47 + } else { + throw new IllegalArgumentException(); // L: 49 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lic;IIIZI)V", + garbageValue = "1897584620" + ) + public static void method2322(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { + class206.musicPlayerStatus = 1; // L: 34 + class204.musicTrackArchive = var0; // L: 35 + BuddyRankComparator.musicTrackGroupId = var1; // L: 36 + class206.musicTrackFileId = var2; // L: 37 + Tiles.musicTrackVolume = var3; // L: 38 + class206.musicTrackBoolean = var4; // L: 39 + FaceNormal.pcmSampleLength = 10000; // L: 40 + } // L: 41 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "934802837" + ) + public static boolean method2326() { + try { + if (class206.musicPlayerStatus == 2) { // L: 93 + if (class206.musicTrack == null) { // L: 94 + class206.musicTrack = MusicTrack.readTrack(class204.musicTrackArchive, BuddyRankComparator.musicTrackGroupId, class206.musicTrackFileId); // L: 95 + if (class206.musicTrack == null) { // L: 96 + return false; + } + } + + if (class39.soundCache == null) { // L: 98 + class39.soundCache = new SoundCache(ModelData0.soundEffectsArchive, class206.musicSamplesArchive); + } + + if (class206.midiPcmStream.loadMusicTrack(class206.musicTrack, class206.musicPatchesArchive, class39.soundCache, 22050)) { // L: 99 + class206.midiPcmStream.clearAll(); // L: 100 + class206.midiPcmStream.setPcmStreamVolume(Tiles.musicTrackVolume); // L: 101 + class206.midiPcmStream.setMusicTrack(class206.musicTrack, class206.musicTrackBoolean); // L: 102 + class206.musicPlayerStatus = 0; // L: 103 + class206.musicTrack = null; // L: 104 + class39.soundCache = null; // L: 105 + class204.musicTrackArchive = null; // L: 106 + return true; // L: 107 + } + } + } catch (Exception var1) { // L: 111 + var1.printStackTrace(); // L: 112 + class206.midiPcmStream.clear(); // L: 113 + class206.musicPlayerStatus = 0; // L: 114 + class206.musicTrack = null; // L: 115 + class39.soundCache = null; // L: 116 + class204.musicTrackArchive = null; // L: 117 + } + + return false; // L: 119 } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 70ffe00968..4d5040c79e 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -4,210 +4,158 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bu") +@ObfuscatedName("by") @Implements("ScriptEvent") public class ScriptEvent extends Node { - @ObfuscatedName("ri") + @ObfuscatedName("sz") @ObfuscatedGetter( - intValue = 1137606481 + intValue = 1903848297 ) - static int field604; + @Export("foundItemIndex") + static int foundItemIndex; @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "Lkr;" ) - static IndexedSprite field597; - @ObfuscatedName("az") + @Export("ItemDefinition_fontPlain11") + static Font ItemDefinition_fontPlain11; + @ObfuscatedName("dq") + @Export("mouseCam") + static boolean mouseCam; + @ObfuscatedName("gb") + @ObfuscatedSignature( + descriptor = "Lec;" + ) + @Export("scene") + static Scene scene; + @ObfuscatedName("gy") @ObfuscatedGetter( - intValue = -2018552551 + intValue = -1883417759 ) - static int field606; - @ObfuscatedName("m") + static int field597; + @ObfuscatedName("z") @Export("args") Object[] args; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("isMouseInputEvent") boolean isMouseInputEvent; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhq;" ) @Export("widget") Widget widget; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -1176492869 + intValue = -2100516553 ) @Export("mouseX") int mouseX; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1543053859 + intValue = 1832434813 ) @Export("mouseY") int mouseY; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1384344567 + intValue = -720675073 ) @Export("opIndex") int opIndex; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhq;" ) @Export("dragTarget") Widget dragTarget; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 710326963 + intValue = 1621651451 ) @Export("keyTyped") int keyTyped; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -649367947 + intValue = -582654831 ) @Export("keyPressed") int keyPressed; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("targetName") String targetName; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -1551673037 + intValue = -735061669 ) - int field600; - @ObfuscatedName("y") + int field593; + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1226589713 + intValue = 926169729 ) @Export("type") int type; public ScriptEvent() { - this.type = 76; + this.type = 76; // L: 19 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([Ljava/lang/Object;I)V", - garbageValue = "-2050703759" + garbageValue = "-1399912972" ) @Export("setArgs") public void setArgs(Object[] var1) { - this.args = var1; - } + this.args = var1; // L: 22 + } // L: 23 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "20" + descriptor = "(II)V", + garbageValue = "-802645814" ) @Export("setType") public void setType(int var1) { this.type = var1; } - @ObfuscatedName("m") - public static final int method1235(double var0, double var2, double var4) { - double var6 = var4; - double var8 = var4; - double var10 = var4; - if (0.0D != var2) { - double var12; - if (var4 < 0.5D) { - var12 = var4 * (1.0D + var2); - } else { - var12 = var2 + var4 - var2 * var4; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lkf;B)Ljava/lang/String;", + garbageValue = "-64" + ) + public static String method1235(Buffer var0) { + String var1; + try { + int var2 = var0.readUShortSmart(); // L: 25 + if (var2 > 32767) { // L: 26 + var2 = 32767; } - double var14 = 2.0D * var4 - var12; - double var16 = var0 + 0.3333333333333333D; - if (var16 > 1.0D) { - --var16; - } - - double var20 = var0 - 0.3333333333333333D; - if (var20 < 0.0D) { - ++var20; - } - - if (6.0D * var16 < 1.0D) { - var6 = var16 * (var12 - var14) * 6.0D + var14; - } else if (2.0D * var16 < 1.0D) { - var6 = var12; - } else if (3.0D * var16 < 2.0D) { - var6 = (0.6666666666666666D - var16) * (var12 - var14) * 6.0D + var14; - } else { - var6 = var14; - } - - if (var0 * 6.0D < 1.0D) { - var8 = var14 + var0 * 6.0D * (var12 - var14); - } else if (2.0D * var0 < 1.0D) { - var8 = var12; - } else if (var0 * 3.0D < 2.0D) { - var8 = (var12 - var14) * (0.6666666666666666D - var0) * 6.0D + var14; - } else { - var8 = var14; - } - - if (6.0D * var20 < 1.0D) { - var10 = var14 + var20 * 6.0D * (var12 - var14); - } else if (2.0D * var20 < 1.0D) { - var10 = var12; - } else if (3.0D * var20 < 2.0D) { - var10 = (0.6666666666666666D - var20) * (var12 - var14) * 6.0D + var14; - } else { - var10 = var14; - } + byte[] var3 = new byte[var2]; // L: 27 + var0.offset += class219.huffman.decompress(var0.array, var0.offset, var3, 0, var2); // L: 28 + String var4 = SpotAnimationDefinition.decodeStringCp1252(var3, 0, var2); // L: 29 + var1 = var4; // L: 30 + } catch (Exception var6) { // L: 32 + var1 = "Cabbage"; // L: 33 } - int var22 = (int)(256.0D * var6); - int var13 = (int)(var8 * 256.0D); - int var23 = (int)(var10 * 256.0D); - int var15 = var23 + (var13 << 8) + (var22 << 16); - return var15; + return var1; // L: 36 } - @ObfuscatedName("fv") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "303339948" + descriptor = "(CII)Ljava/lang/String;", + garbageValue = "-1474859384" ) - @Export("setWindowedMode") - static void setWindowedMode(int var0) { - Client.field886 = 0L; - if (var0 >= 2) { - Client.isResizable = true; - } else { - Client.isResizable = false; + static String method1236(char var0, int var1) { + char[] var2 = new char[var1]; // L: 173 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 174 + var2[var3] = var0; } - if (class58.getWindowedMode() == 1) { - WorldMapSectionType.client.setMaxCanvasSize(765, 503); - } else { - WorldMapSectionType.client.setMaxCanvasSize(7680, 2160); - } - - if (Client.gameState >= 25) { - PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(class58.getWindowedMode()); - var1.packetBuffer.writeShort(Varcs.canvasWidth); - var1.packetBuffer.writeShort(class52.canvasHeight); - Client.packetWriter.addNode(var1); - } - - } - - @ObfuscatedName("hs") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", - garbageValue = "-1977726761" - ) - @Export("insertMenuItemNoShift") - public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { - ApproximateRouteStrategy.insertMenuItem(var0, var1, var2, var3, var4, var5, false); + return new String(var2); // L: 175 } } diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 2f936f929c..e9a4c94a6f 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -1,49 +1,90 @@ +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bp") +@ObfuscatedName("ba") @Implements("ScriptFrame") public class ScriptFrame { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lcs;" + descriptor = "Lcy;" ) @Export("script") Script script; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1954310333 + intValue = 394588123 ) @Export("pc") int pc; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("intLocals") int[] intLocals; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("stringLocals") String[] stringLocals; ScriptFrame() { - this.pc = -1; - } + this.pc = -1; // L: 5 + } // L: 9 - @ObfuscatedName("gb") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-32" + descriptor = "(I)Z", + garbageValue = "-1817871528" ) - static void method1201() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; + @Export("loadWorlds") + static boolean loadWorlds() { + try { + if (WorldMapScaleHandler.World_request == null) { // L: 31 + WorldMapScaleHandler.World_request = UserComparator4.urlRequester.request(new URL(BZip2State.worldListURL)); + } else if (WorldMapScaleHandler.World_request.isDone()) { // L: 33 + byte[] var0 = WorldMapScaleHandler.World_request.getResponse(); // L: 34 + Buffer var1 = new Buffer(var0); // L: 35 + var1.readInt(); // L: 36 + World.World_count = var1.readUnsignedShort(); // L: 37 + AbstractByteArrayCopier.World_worlds = new World[World.World_count]; // L: 38 - for (int var2 = 0; var2 < var0; ++var2) { - if (var1[var2] != Client.combatTargetPlayerIndex && var1[var2] != Client.localPlayerIndex) { - class9.addPlayerToScene(Client.players[var1[var2]], true); + World var3; + for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47 + var3 = AbstractByteArrayCopier.World_worlds[var2] = new World(); // L: 40 + var3.id = var1.readUnsignedShort(); // L: 41 + var3.properties = var1.readInt(); // L: 42 + var3.host = var1.readStringCp1252NullTerminated(); // L: 43 + var3.activity = var1.readStringCp1252NullTerminated(); // L: 44 + var3.location = var1.readUnsignedByte(); // L: 45 + var3.population = var1.readShort(); // L: 46 + } + + FloorDecoration.sortWorlds(AbstractByteArrayCopier.World_worlds, 0, AbstractByteArrayCopier.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49 + WorldMapScaleHandler.World_request = null; // L: 50 + return true; // L: 51 } + } catch (Exception var4) { // L: 55 + var4.printStackTrace(); // L: 56 + WorldMapScaleHandler.World_request = null; // L: 57 } + return false; // L: 59 } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "75" + ) + static void method1192() { + if (Login.Login_username == null || Login.Login_username.length() <= 0) { // L: 217 + if (Tile.clientPreferences.rememberedUsername != null) { // L: 218 + Login.Login_username = Tile.clientPreferences.rememberedUsername; // L: 219 + Client.Login_isUsernameRemembered = true; // L: 220 + } else { + Client.Login_isUsernameRemembered = false; // L: 222 + } + + } + } // L: 223 } diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java index 1afc63eb00..7dd8e455ea 100644 --- a/runescape-client/src/main/java/SecureRandomCallable.java +++ b/runescape-client/src/main/java/SecureRandomCallable.java @@ -1,7 +1,6 @@ import java.util.concurrent.Callable; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; @@ -9,215 +8,959 @@ import net.runelite.rs.ScriptOpcodes; @ObfuscatedName("bm") @Implements("SecureRandomCallable") public class SecureRandomCallable implements Callable { - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - @Export("Widget_modelsArchive") - static AbstractArchive Widget_modelsArchive; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lhd;" - ) - static Widget field544; - @ObfuscatedName("cp") - @ObfuscatedGetter( - intValue = -1382936715 - ) - public static int field546; - @ObfuscatedName("ll") - @ObfuscatedSignature( - descriptor = "Lhd;" - ) - static Widget field542; - SecureRandomCallable() { - } + } // L: 36 public Object call() { - return WorldMapIcon_1.method348(); + return BoundaryObject.method3387(); // L: 45 } - @ObfuscatedName("ab") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1445802198" + descriptor = "(IIB)Lhq;", + garbageValue = "105" ) - static int method1203(int var0, Script var1, boolean var2) { - int var3; - int var4; - if (var0 == ScriptOpcodes.ADD) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var4 + var3; - return 1; - } else if (var0 == ScriptOpcodes.SUB) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 - var4; - return 1; - } else if (var0 == ScriptOpcodes.MULTIPLY) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 * var4; - return 1; - } else if (var0 == ScriptOpcodes.DIV) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 / var4; - return 1; - } else if (var0 == ScriptOpcodes.RANDOM) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); - return 1; - } else if (var0 == ScriptOpcodes.RANDOMINC) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); - return 1; - } else if (var0 == ScriptOpcodes.INTERPOLATE) { - UrlRequester.Interpreter_intStackSize -= 5; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - int var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; - int var7 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 4]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); - return 1; - } else if (var0 == ScriptOpcodes.ADDPERCENT) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100; - return 1; - } else if (var0 == ScriptOpcodes.SETBIT) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 | 1 << var4; - return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); - return 1; - } else if (var0 == ScriptOpcodes.TESTBIT) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.MOD) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 % var4; - return 1; - } else if (var0 == ScriptOpcodes.POW) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4); - } - - return 1; - } else if (var0 == ScriptOpcodes.INVPOW) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - if (var3 == 0) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - switch(var4) { - case 0: - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; - break; - case 1: - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; - break; - case 2: - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var3); - break; - case 3: - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var3); - break; - case 4: - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var3)); - break; - default: - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); - } - - return 1; - } - } else if (var0 == ScriptOpcodes.AND) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 & var4; - return 1; - } else if (var0 == ScriptOpcodes.OR) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3 | var4; - return 1; - } else if (var0 == ScriptOpcodes.SCALE) { - UrlRequester.Interpreter_intStackSize -= 3; - long var9 = (long)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - long var11 = (long)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - long var13 = (long)Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); - return 1; + @Export("getWidgetChild") + public static Widget getWidgetChild(int var0, int var1) { + Widget var2 = TileItem.getWidget(var0); // L: 196 + if (var1 == -1) { // L: 197 + return var2; } else { - return 2; + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; // L: 198 199 } } - @ObfuscatedName("fm") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lby;IIB)V", - garbageValue = "72" + descriptor = "(III)V", + garbageValue = "2101058473" ) - @Export("performPlayerAnimation") - static void performPlayerAnimation(Player var0, int var1, int var2) { - if (var0.sequence == var1 && var1 != -1) { - int var3 = NetSocket.SequenceDefinition_get(var1).field3561; - if (var3 == 1) { - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1000 = 0; - } + static void method1204(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 306 + NetFileRequest var4 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var2); // L: 307 + if (var4 != null) { // L: 308 + NetCache.NetCache_pendingWritesQueue.addLast(var4); // L: 309 + } + } // L: 310 - if (var3 == 2) { - var0.field1000 = 0; - } - } else if (var1 == -1 || var0.sequence == -1 || NetSocket.SequenceDefinition_get(var1).field3543 >= NetSocket.SequenceDefinition_get(var0.sequence).field3543) { - var0.sequence = var1; - var0.sequenceFrame = 0; - var0.sequenceFrameCycle = 0; - var0.sequenceDelay = var2; - var0.field1000 = 0; - var0.field1023 = var0.pathLength; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "207665946" + ) + static int method1200(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 945 + var0 -= 1000; // L: 946 + var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 947 + } else { + var3 = var2 ? Canvas.field438 : class3.field12; // L: 949 } + String var4 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 950 + int[] var5 = null; // L: 951 + if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { // L: 952 + int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 953 + if (var6 > 0) { // L: 954 + for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) { // L: 955 956 + } + } + + var4 = var4.substring(0, var4.length() - 1); // L: 958 + } + + Object[] var8 = new Object[var4.length() + 1]; // L: 960 + + int var7; + for (var7 = var8.length - 1; var7 >= 1; --var7) { // L: 961 + if (var4.charAt(var7 - 1) == 's') { // L: 962 + var8[var7] = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; + } else { + var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 963 + } + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 965 + if (var7 != -1) { // L: 966 + var8[0] = new Integer(var7); + } else { + var8 = null; // L: 967 + } + + if (var0 == ScriptOpcodes.CC_SETONCLICK) { + var3.onClick = var8; // L: 968 + } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { // L: 969 + var3.onHold = var8; + } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { // L: 970 + var3.onRelease = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { // L: 971 + var3.onMouseOver = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { // L: 972 + var3.onMouseLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { // L: 973 + var3.onDrag = var8; + } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { // L: 974 + var3.onTargetLeave = var8; + } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { // L: 975 + var3.onVarTransmit = var8; // L: 976 + var3.varTransmitTriggers = var5; // L: 977 + } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { // L: 979 + var3.onTimer = var8; + } else if (var0 == ScriptOpcodes.CC_SETONOP) { // L: 980 + var3.onOp = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { // L: 981 + var3.onDragComplete = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { // L: 982 + var3.onClickRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { // L: 983 + var3.onMouseRepeat = var8; + } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { // L: 984 + var3.onInvTransmit = var8; // L: 985 + var3.invTransmitTriggers = var5; // L: 986 + } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { // L: 988 + var3.onStatTransmit = var8; // L: 989 + var3.statTransmitTriggers = var5; // L: 990 + } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { + var3.onTargetEnter = var8; // L: 992 + } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { // L: 993 + var3.onScroll = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { // L: 994 + var3.onChatTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONKEY) { // L: 995 + var3.onKey = var8; + } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { // L: 996 + var3.onFriendTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { // L: 997 + var3.onClanTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { // L: 998 + var3.onMiscTransmit = var8; + } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { // L: 999 + var3.onDialogAbort = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { // L: 1000 + var3.onSubChange = var8; + } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { // L: 1001 + var3.onStockTransmit = var8; + } else if (var0 == 1426) { // L: 1002 + var3.field2722 = var8; + } else { + if (var0 != ScriptOpcodes.CC_SETONRESIZE) { // L: 1003 + return 2; // L: 1004 + } + + var3.onResize = var8; + } + + var3.hasListener = true; // L: 1005 + return 1; // L: 1006 } - @ObfuscatedName("hw") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lcu;III)V", - garbageValue = "9999999" + descriptor = "(I)V", + garbageValue = "19136770" ) - static final void method1205(MenuAction var0, int var1, int var2) { - WorldMapSection0.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); + public static void method1203() { + Widget.Widget_cachedSprites.clear(); // L: 688 + Widget.Widget_cachedModels.clear(); // L: 689 + Widget.Widget_cachedFonts.clear(); // L: 690 + Widget.Widget_cachedSpriteMasks.clear(); // L: 691 + } // L: 692 + + @ObfuscatedName("ha") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;Ljava/lang/String;III)V", + garbageValue = "-990196444" + ) + @Export("menuAction") + static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { + if (var2 >= 2000) { // L: 7255 + var2 -= 2000; + } + + PacketBufferNode var8; + if (var2 == 1) { // L: 7256 + Client.mouseCrossX = var6; // L: 7676 + Client.mouseCrossY = var7; // L: 7677 + Client.mouseCrossColor = 2; // L: 7678 + Client.mouseCrossState = 0; // L: 7679 + Client.destinationX = var0; // L: 7680 + Client.destinationY = var1; // L: 7681 + var8 = Client.getPacketBufferNode(ClientPacket.field2292, Client.packetWriter.isaacCipher); // L: 7683 + var8.packetBuffer.writeShort(var3); // L: 7684 + var8.packetBuffer.method5665(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7685 + var8.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7686 + var8.packetBuffer.writeShort(WorldMapLabel.baseY + var1); // L: 7687 + var8.packetBuffer.method5663(class105.selectedItemWidget); // L: 7688 + var8.packetBuffer.method5665(var0 + WorldMapManager.baseX); // L: 7689 + var8.packetBuffer.method5665(Script.selectedItemId); // L: 7690 + Client.packetWriter.addNode(var8); // L: 7691 + } else if (var2 == 2) { + Client.mouseCrossX = var6; // L: 7311 + Client.mouseCrossY = var7; // L: 7312 + Client.mouseCrossColor = 2; // L: 7313 + Client.mouseCrossState = 0; // L: 7314 + Client.destinationX = var0; // L: 7315 + Client.destinationY = var1; // L: 7316 + var8 = Client.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); // L: 7318 + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7319 + var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7320 + var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 7321 + var8.packetBuffer.method5654(var3); // L: 7322 + var8.packetBuffer.method5663(class232.selectedSpellWidget); // L: 7323 + var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 7324 + Client.packetWriter.addNode(var8); // L: 7325 + } else if (var2 == 3) { + Client.mouseCrossX = var6; // L: 7650 + Client.mouseCrossY = var7; // L: 7651 + Client.mouseCrossColor = 2; // L: 7652 + Client.mouseCrossState = 0; // L: 7653 + Client.destinationX = var0; // L: 7654 + Client.destinationY = var1; // L: 7655 + var8 = Client.getPacketBufferNode(ClientPacket.field2328, Client.packetWriter.isaacCipher); // L: 7657 + var8.packetBuffer.writeShort(WorldMapLabel.baseY + var1); // L: 7658 + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7659 + var8.packetBuffer.method5665(var0 + WorldMapManager.baseX); // L: 7660 + var8.packetBuffer.method5653(var3); // L: 7661 + Client.packetWriter.addNode(var8); // L: 7662 + } else if (var2 == 4) { + Client.mouseCrossX = var6; // L: 7388 + Client.mouseCrossY = var7; // L: 7389 + Client.mouseCrossColor = 2; // L: 7390 + Client.mouseCrossState = 0; // L: 7391 + Client.destinationX = var0; // L: 7392 + Client.destinationY = var1; // L: 7393 + var8 = Client.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); // L: 7395 + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7396 + var8.packetBuffer.method5654(var3); // L: 7397 + var8.packetBuffer.method5654(var0 + WorldMapManager.baseX); // L: 7398 + var8.packetBuffer.method5665(WorldMapLabel.baseY + var1); // L: 7399 + Client.packetWriter.addNode(var8); // L: 7400 + } else if (var2 == 5) { + Client.mouseCrossX = var6; // L: 7744 + Client.mouseCrossY = var7; // L: 7745 + Client.mouseCrossColor = 2; // L: 7746 + Client.mouseCrossState = 0; // L: 7747 + Client.destinationX = var0; // L: 7748 + Client.destinationY = var1; // L: 7749 + var8 = Client.getPacketBufferNode(ClientPacket.field2323, Client.packetWriter.isaacCipher); // L: 7751 + var8.packetBuffer.method5665(WorldMapLabel.baseY + var1); // L: 7752 + var8.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7753 + var8.packetBuffer.method5653(var3); // L: 7754 + var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 7755 + Client.packetWriter.addNode(var8); // L: 7756 + } else if (var2 == 6) { + Client.mouseCrossX = var6; // L: 8007 + Client.mouseCrossY = var7; // L: 8008 + Client.mouseCrossColor = 2; // L: 8009 + Client.mouseCrossState = 0; // L: 8010 + Client.destinationX = var0; // L: 8011 + Client.destinationY = var1; // L: 8012 + var8 = Client.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); // L: 8014 + var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 8015 + var8.packetBuffer.method5665(var3); // L: 8016 + var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 8017 + var8.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8018 + Client.packetWriter.addNode(var8); // L: 8019 + } else { + PacketBufferNode var9; + NPC var13; + if (var2 == 7) { + var13 = Client.npcs[var3]; // L: 7537 + if (var13 != null) { // L: 7538 + Client.mouseCrossX = var6; // L: 7539 + Client.mouseCrossY = var7; // L: 7540 + Client.mouseCrossColor = 2; // L: 7541 + Client.mouseCrossState = 0; // L: 7542 + Client.destinationX = var0; // L: 7543 + Client.destinationY = var1; // L: 7544 + var9 = Client.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); // L: 7546 + var9.packetBuffer.writeShort(var3); // L: 7547 + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7548 + var9.packetBuffer.writeInt(class105.selectedItemWidget); // L: 7549 + var9.packetBuffer.writeShort(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7550 + var9.packetBuffer.writeShort(Script.selectedItemId); // L: 7551 + Client.packetWriter.addNode(var9); // L: 7552 + } + } else if (var2 == 8) { + var13 = Client.npcs[var3]; // L: 7778 + if (var13 != null) { // L: 7779 + Client.mouseCrossX = var6; // L: 7780 + Client.mouseCrossY = var7; // L: 7781 + Client.mouseCrossColor = 2; // L: 7782 + Client.mouseCrossState = 0; // L: 7783 + Client.destinationX = var0; // L: 7784 + Client.destinationY = var1; // L: 7785 + var9 = Client.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); // L: 7787 + var9.packetBuffer.writeShortLE(class232.selectedSpellWidget); // L: 7788 + var9.packetBuffer.writeShort(var3); // L: 7789 + var9.packetBuffer.method5653(Client.selectedSpellChildIndex); // L: 7790 + var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7791 + Client.packetWriter.addNode(var9); // L: 7792 + } + } else if (var2 == 9) { + var13 = Client.npcs[var3]; // L: 7372 + if (var13 != null) { // L: 7373 + Client.mouseCrossX = var6; // L: 7374 + Client.mouseCrossY = var7; // L: 7375 + Client.mouseCrossColor = 2; // L: 7376 + Client.mouseCrossState = 0; // L: 7377 + Client.destinationX = var0; // L: 7378 + Client.destinationY = var1; // L: 7379 + var9 = Client.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher); // L: 7381 + var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7382 + var9.packetBuffer.method5653(var3); // L: 7383 + Client.packetWriter.addNode(var9); // L: 7384 + } + } else if (var2 == 10) { + var13 = Client.npcs[var3]; // L: 7981 + if (var13 != null) { // L: 7982 + Client.mouseCrossX = var6; // L: 7983 + Client.mouseCrossY = var7; // L: 7984 + Client.mouseCrossColor = 2; // L: 7985 + Client.mouseCrossState = 0; // L: 7986 + Client.destinationX = var0; // L: 7987 + Client.destinationY = var1; // L: 7988 + var9 = Client.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); // L: 7990 + var9.packetBuffer.writeShort(var3); // L: 7991 + var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7992 + Client.packetWriter.addNode(var9); // L: 7993 + } + } else if (var2 == 11) { + var13 = Client.npcs[var3]; // L: 7728 + if (var13 != null) { // L: 7729 + Client.mouseCrossX = var6; // L: 7730 + Client.mouseCrossY = var7; // L: 7731 + Client.mouseCrossColor = 2; // L: 7732 + Client.mouseCrossState = 0; // L: 7733 + Client.destinationX = var0; // L: 7734 + Client.destinationY = var1; // L: 7735 + var9 = Client.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); // L: 7737 + var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7738 + var9.packetBuffer.method5654(var3); // L: 7739 + Client.packetWriter.addNode(var9); // L: 7740 + } + } else if (var2 == 12) { + var13 = Client.npcs[var3]; // L: 7419 + if (var13 != null) { // L: 7420 + Client.mouseCrossX = var6; // L: 7421 + Client.mouseCrossY = var7; // L: 7422 + Client.mouseCrossColor = 2; // L: 7423 + Client.mouseCrossState = 0; // L: 7424 + Client.destinationX = var0; // L: 7425 + Client.destinationY = var1; // L: 7426 + var9 = Client.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); // L: 7428 + var9.packetBuffer.method5665(var3); // L: 7429 + var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7430 + Client.packetWriter.addNode(var9); // L: 7431 + } + } else if (var2 == 13) { + var13 = Client.npcs[var3]; // L: 7712 + if (var13 != null) { // L: 7713 + Client.mouseCrossX = var6; // L: 7714 + Client.mouseCrossY = var7; // L: 7715 + Client.mouseCrossColor = 2; // L: 7716 + Client.mouseCrossState = 0; // L: 7717 + Client.destinationX = var0; // L: 7718 + Client.destinationY = var1; // L: 7719 + var9 = Client.getPacketBufferNode(ClientPacket.field2347, Client.packetWriter.isaacCipher); // L: 7721 + var9.packetBuffer.method5665(var3); // L: 7722 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7723 + Client.packetWriter.addNode(var9); // L: 7724 + } + } else { + Player var15; + if (var2 == 14) { + var15 = Client.players[var3]; // L: 7759 + if (var15 != null) { // L: 7760 + Client.mouseCrossX = var6; // L: 7761 + Client.mouseCrossY = var7; // L: 7762 + Client.mouseCrossColor = 2; // L: 7763 + Client.mouseCrossState = 0; // L: 7764 + Client.destinationX = var0; // L: 7765 + Client.destinationY = var1; // L: 7766 + var9 = Client.getPacketBufferNode(ClientPacket.field2302, Client.packetWriter.isaacCipher); // L: 7768 + var9.packetBuffer.method5653(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7769 + var9.packetBuffer.writeShort(Script.selectedItemId); // L: 7770 + var9.packetBuffer.method5654(var3); // L: 7771 + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7772 + var9.packetBuffer.writeInt(class105.selectedItemWidget); // L: 7773 + Client.packetWriter.addNode(var9); // L: 7774 + } + } else if (var2 == 15) { + var15 = Client.players[var3]; // L: 7694 + if (var15 != null) { // L: 7695 + Client.mouseCrossX = var6; // L: 7696 + Client.mouseCrossY = var7; // L: 7697 + Client.mouseCrossColor = 2; // L: 7698 + Client.mouseCrossState = 0; // L: 7699 + Client.destinationX = var0; // L: 7700 + Client.destinationY = var1; // L: 7701 + var9 = Client.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); // L: 7703 + var9.packetBuffer.method5663(class232.selectedSpellWidget); // L: 7704 + var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7705 + var9.packetBuffer.method5654(var3); // L: 7706 + var9.packetBuffer.method5654(Client.selectedSpellChildIndex); // L: 7707 + Client.packetWriter.addNode(var9); // L: 7708 + } + } else if (var2 == 16) { + Client.mouseCrossX = var6; // L: 7838 + Client.mouseCrossY = var7; // L: 7839 + Client.mouseCrossColor = 2; // L: 7840 + Client.mouseCrossState = 0; // L: 7841 + Client.destinationX = var0; // L: 7842 + Client.destinationY = var1; // L: 7843 + var8 = Client.getPacketBufferNode(ClientPacket.field2348, Client.packetWriter.isaacCipher); // L: 7845 + var8.packetBuffer.writeShort(WorldMapLabel.baseY + var1); // L: 7846 + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7847 + var8.packetBuffer.method5653(Script.selectedItemId); // L: 7848 + var8.packetBuffer.writeShort(var3); // L: 7849 + var8.packetBuffer.method5654(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7850 + var8.packetBuffer.writeInt(class105.selectedItemWidget); // L: 7851 + var8.packetBuffer.writeShort(var0 + WorldMapManager.baseX); // L: 7852 + Client.packetWriter.addNode(var8); // L: 7853 + } else if (var2 == 17) { + Client.mouseCrossX = var6; // L: 7593 + Client.mouseCrossY = var7; // L: 7594 + Client.mouseCrossColor = 2; // L: 7595 + Client.mouseCrossState = 0; // L: 7596 + Client.destinationX = var0; // L: 7597 + Client.destinationY = var1; // L: 7598 + var8 = Client.getPacketBufferNode(ClientPacket.field2325, Client.packetWriter.isaacCipher); // L: 7600 + var8.packetBuffer.writeShortLE(class232.selectedSpellWidget); // L: 7601 + var8.packetBuffer.method5653(WorldMapLabel.baseY + var1); // L: 7602 + var8.packetBuffer.method5665(Client.selectedSpellChildIndex); // L: 7603 + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7604 + var8.packetBuffer.writeShort(var3); // L: 7605 + var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 7606 + Client.packetWriter.addNode(var8); // L: 7607 + } else if (var2 == 18) { + Client.mouseCrossX = var6; // L: 7918 + Client.mouseCrossY = var7; // L: 7919 + Client.mouseCrossColor = 2; // L: 7920 + Client.mouseCrossState = 0; // L: 7921 + Client.destinationX = var0; // L: 7922 + Client.destinationY = var1; // L: 7923 + var8 = Client.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); // L: 7925 + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7926 + var8.packetBuffer.method5653(var3); // L: 7927 + var8.packetBuffer.method5665(WorldMapLabel.baseY + var1); // L: 7928 + var8.packetBuffer.method5654(var0 + WorldMapManager.baseX); // L: 7929 + Client.packetWriter.addNode(var8); // L: 7930 + } else if (var2 == 19) { + Client.mouseCrossX = var6; // L: 7903 + Client.mouseCrossY = var7; // L: 7904 + Client.mouseCrossColor = 2; // L: 7905 + Client.mouseCrossState = 0; // L: 7906 + Client.destinationX = var0; // L: 7907 + Client.destinationY = var1; // L: 7908 + var8 = Client.getPacketBufferNode(ClientPacket.field2346, Client.packetWriter.isaacCipher); // L: 7910 + var8.packetBuffer.writeShort(var3); // L: 7911 + var8.packetBuffer.method5654(var0 + WorldMapManager.baseX); // L: 7912 + var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7913 + var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7914 + Client.packetWriter.addNode(var8); // L: 7915 + } else if (var2 == 20) { + Client.mouseCrossX = var6; // L: 7328 + Client.mouseCrossY = var7; // L: 7329 + Client.mouseCrossColor = 2; // L: 7330 + Client.mouseCrossState = 0; // L: 7331 + Client.destinationX = var0; // L: 7332 + Client.destinationY = var1; // L: 7333 + var8 = Client.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); // L: 7335 + var8.packetBuffer.method5654(var3); // L: 7336 + var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7337 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7338 + var8.packetBuffer.method5665(var0 + WorldMapManager.baseX); // L: 7339 + Client.packetWriter.addNode(var8); // L: 7340 + } else if (var2 == 21) { + Client.mouseCrossX = var6; // L: 7888 + Client.mouseCrossY = var7; // L: 7889 + Client.mouseCrossColor = 2; // L: 7890 + Client.mouseCrossState = 0; // L: 7891 + Client.destinationX = var0; // L: 7892 + Client.destinationY = var1; // L: 7893 + var8 = Client.getPacketBufferNode(ClientPacket.field2310, Client.packetWriter.isaacCipher); // L: 7895 + var8.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7896 + var8.packetBuffer.method5654(var3); // L: 7897 + var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7898 + var8.packetBuffer.method5653(var0 + WorldMapManager.baseX); // L: 7899 + Client.packetWriter.addNode(var8); // L: 7900 + } else if (var2 == 22) { + Client.mouseCrossX = var6; // L: 7268 + Client.mouseCrossY = var7; // L: 7269 + Client.mouseCrossColor = 2; // L: 7270 + Client.mouseCrossState = 0; // L: 7271 + Client.destinationX = var0; // L: 7272 + Client.destinationY = var1; // L: 7273 + var8 = Client.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); // L: 7275 + var8.packetBuffer.method5653(var3); // L: 7276 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7277 + var8.packetBuffer.method5665(WorldMapLabel.baseY + var1); // L: 7278 + var8.packetBuffer.method5665(var0 + WorldMapManager.baseX); // L: 7279 + Client.packetWriter.addNode(var8); // L: 7280 + } else if (var2 == 23) { + if (Client.isMenuOpen) { // L: 7486 + ScriptEvent.scene.setViewportWalking(); // L: 7487 + } else { + ScriptEvent.scene.menuOpen(Huffman.Client_plane, var0, var1, true); // L: 7490 + } + } else { + PacketBufferNode var11; + Widget var16; + if (var2 == 24) { + var16 = TileItem.getWidget(var1); // L: 7665 + boolean var12 = true; // L: 7666 + if (var16.contentType > 0) { // L: 7667 + var12 = class4.method60(var16); + } + + if (var12) { // L: 7668 + var11 = Client.getPacketBufferNode(ClientPacket.field2334, Client.packetWriter.isaacCipher); // L: 7670 + var11.packetBuffer.writeInt(var1); // L: 7671 + Client.packetWriter.addNode(var11); // L: 7672 + } + } else { + if (var2 == 25) { + var16 = getWidgetChild(var1, var0); // L: 7570 + if (var16 != null) { // L: 7571 + class22.Widget_runOnTargetLeave(); // L: 7572 + User.selectSpell(var1, var0, GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var16)), var16.itemId); // L: 7573 + Client.isItemSelected = 0; // L: 7574 + Client.selectedSpellActionName = SpriteMask.Widget_getSpellActionName(var16); // L: 7575 + if (Client.selectedSpellActionName == null) { // L: 7576 + Client.selectedSpellActionName = "null"; + } + + if (var16.isIf3) { // L: 7577 + Client.selectedSpellName = var16.dataText + WorldMapAreaData.colorStartTag(16777215); + } else { + Client.selectedSpellName = WorldMapAreaData.colorStartTag(65280) + var16.spellName + WorldMapAreaData.colorStartTag(16777215); // L: 7578 + } + } + + return; // L: 7580 + } + + if (var2 == 26) { + ItemContainer.method1213(); // L: 7308 + } else { + int var10; + Widget var14; + if (var2 == 28) { + var8 = Client.getPacketBufferNode(ClientPacket.field2334, Client.packetWriter.isaacCipher); // L: 7447 + var8.packetBuffer.writeInt(var1); // L: 7448 + Client.packetWriter.addNode(var8); // L: 7449 + var14 = TileItem.getWidget(var1); // L: 7450 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 7451 + var10 = var14.cs1Instructions[0][1]; // L: 7452 + Varps.Varps_main[var10] = 1 - Varps.Varps_main[var10]; // L: 7453 + Clock.changeGameOptions(var10); // L: 7454 + } + } else if (var2 == 29) { + var8 = Client.getPacketBufferNode(ClientPacket.field2334, Client.packetWriter.isaacCipher); // L: 7825 + var8.packetBuffer.writeInt(var1); // L: 7826 + Client.packetWriter.addNode(var8); // L: 7827 + var14 = TileItem.getWidget(var1); // L: 7828 + if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { // L: 7829 + var10 = var14.cs1Instructions[0][1]; // L: 7830 + if (Varps.Varps_main[var10] != var14.cs1ComparisonValues[0]) { // L: 7831 + Varps.Varps_main[var10] = var14.cs1ComparisonValues[0]; // L: 7832 + Clock.changeGameOptions(var10); // L: 7833 + } + } + } else if (var2 == 30) { + if (Client.meslayerContinueWidget == null) { // L: 7610 + AbstractSocket.resumePauseWidget(var1, var0); // L: 7611 + Client.meslayerContinueWidget = getWidgetChild(var1, var0); // L: 7612 + class52.invalidateWidget(Client.meslayerContinueWidget); // L: 7613 + } + } else if (var2 == 31) { + var8 = Client.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); // L: 7295 + var8.packetBuffer.method5654(var3); // L: 7296 + var8.packetBuffer.writeShortLE(class105.selectedItemWidget); // L: 7297 + var8.packetBuffer.method5665(var0); // L: 7298 + var8.packetBuffer.method5665(Script.selectedItemId); // L: 7299 + var8.packetBuffer.writeShortLE(var1); // L: 7300 + var8.packetBuffer.writeShort(GrandExchangeOfferUnitPriceComparator.selectedItemSlot); // L: 7301 + Client.packetWriter.addNode(var8); // L: 7302 + Client.field782 = 0; // L: 7303 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7304 + Client.field944 = var0; // L: 7305 + } else if (var2 == 32) { + var8 = Client.getPacketBufferNode(ClientPacket.field2335, Client.packetWriter.isaacCipher); // L: 7934 + var8.packetBuffer.method5653(var3); // L: 7935 + var8.packetBuffer.writeShortLE(class232.selectedSpellWidget); // L: 7936 + var8.packetBuffer.method5653(Client.selectedSpellChildIndex); // L: 7937 + var8.packetBuffer.writeInt(var1); // L: 7938 + var8.packetBuffer.writeShort(var0); // L: 7939 + Client.packetWriter.addNode(var8); // L: 7940 + Client.field782 = 0; // L: 7941 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7942 + Client.field944 = var0; // L: 7943 + } else if (var2 == 33) { + var8 = Client.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); // L: 7857 + var8.packetBuffer.method5665(var0); // L: 7858 + var8.packetBuffer.method5653(var3); // L: 7859 + var8.packetBuffer.writeShortLE(var1); // L: 7860 + Client.packetWriter.addNode(var8); // L: 7861 + Client.field782 = 0; // L: 7862 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7863 + Client.field944 = var0; // L: 7864 + } else if (var2 == 34) { + var8 = Client.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); // L: 7258 + var8.packetBuffer.method5662(var1); // L: 7259 + var8.packetBuffer.method5653(var0); // L: 7260 + var8.packetBuffer.method5654(var3); // L: 7261 + Client.packetWriter.addNode(var8); // L: 7262 + Client.field782 = 0; // L: 7263 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7264 + Client.field944 = var0; // L: 7265 + } else if (var2 == 35) { + var8 = Client.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); // L: 7476 + var8.packetBuffer.method5654(var3); // L: 7477 + var8.packetBuffer.writeShortLE(var1); // L: 7478 + var8.packetBuffer.method5653(var0); // L: 7479 + Client.packetWriter.addNode(var8); // L: 7480 + Client.field782 = 0; // L: 7481 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7482 + Client.field944 = var0; // L: 7483 + } else if (var2 == 36) { + var8 = Client.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); // L: 8023 + var8.packetBuffer.writeShort(var0); // L: 8024 + var8.packetBuffer.writeShort(var3); // L: 8025 + var8.packetBuffer.method5663(var1); // L: 8026 + Client.packetWriter.addNode(var8); // L: 8027 + Client.field782 = 0; // L: 8028 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 8029 + Client.field944 = var0; // L: 8030 + } else if (var2 == 37) { + var8 = Client.getPacketBufferNode(ClientPacket.field2331, Client.packetWriter.isaacCipher); // L: 7436 + var8.packetBuffer.method5653(var3); // L: 7437 + var8.packetBuffer.writeShort(var0); // L: 7438 + var8.packetBuffer.writeShortLE(var1); // L: 7439 + Client.packetWriter.addNode(var8); // L: 7440 + Client.field782 = 0; // L: 7441 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7442 + Client.field944 = var0; // L: 7443 + } else { + if (var2 == 38) { + class22.Widget_runOnTargetLeave(); // L: 7812 + var16 = TileItem.getWidget(var1); // L: 7813 + Client.isItemSelected = 1; // L: 7814 + GrandExchangeOfferUnitPriceComparator.selectedItemSlot = var0; // L: 7815 + class105.selectedItemWidget = var1; // L: 7816 + Script.selectedItemId = var3; // L: 7817 + class52.invalidateWidget(var16); // L: 7818 + Client.selectedItemName = WorldMapAreaData.colorStartTag(16748608) + GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3).name + WorldMapAreaData.colorStartTag(16777215); // L: 7819 + if (Client.selectedItemName == null) { // L: 7820 + Client.selectedItemName = "null"; + } + + return; // L: 7821 + } + + if (var2 == 39) { + var8 = Client.getPacketBufferNode(ClientPacket.field2277, Client.packetWriter.isaacCipher); // L: 7284 + var8.packetBuffer.writeInt(var1); // L: 7285 + var8.packetBuffer.method5654(var0); // L: 7286 + var8.packetBuffer.method5654(var3); // L: 7287 + Client.packetWriter.addNode(var8); // L: 7288 + Client.field782 = 0; // L: 7289 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7290 + Client.field944 = var0; // L: 7291 + } else if (var2 == 40) { + var8 = Client.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); // L: 7618 + var8.packetBuffer.method5653(var0); // L: 7619 + var8.packetBuffer.method5653(var3); // L: 7620 + var8.packetBuffer.method5663(var1); // L: 7621 + Client.packetWriter.addNode(var8); // L: 7622 + Client.field782 = 0; // L: 7623 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7624 + Client.field944 = var0; // L: 7625 + } else if (var2 == 41) { + var8 = Client.getPacketBufferNode(ClientPacket.field2340, Client.packetWriter.isaacCipher); // L: 7640 + var8.packetBuffer.writeShortLE(var1); // L: 7641 + var8.packetBuffer.writeShort(var3); // L: 7642 + var8.packetBuffer.writeShort(var0); // L: 7643 + Client.packetWriter.addNode(var8); // L: 7644 + Client.field782 = 0; // L: 7645 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7646 + Client.field944 = var0; // L: 7647 + } else if (var2 == 42) { + var8 = Client.getPacketBufferNode(ClientPacket.field2337, Client.packetWriter.isaacCipher); // L: 7629 + var8.packetBuffer.method5665(var3); // L: 7630 + var8.packetBuffer.writeShort(var0); // L: 7631 + var8.packetBuffer.method5662(var1); // L: 7632 + Client.packetWriter.addNode(var8); // L: 7633 + Client.field782 = 0; // L: 7634 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7635 + Client.field944 = var0; // L: 7636 + } else if (var2 == 43) { + var8 = Client.getPacketBufferNode(ClientPacket.field2314, Client.packetWriter.isaacCipher); // L: 7527 + var8.packetBuffer.method5653(var0); // L: 7528 + var8.packetBuffer.method5654(var3); // L: 7529 + var8.packetBuffer.method5663(var1); // L: 7530 + Client.packetWriter.addNode(var8); // L: 7531 + Client.field782 = 0; // L: 7532 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7533 + Client.field944 = var0; // L: 7534 + } else if (var2 == 44) { + var15 = Client.players[var3]; // L: 7965 + if (var15 != null) { // L: 7966 + Client.mouseCrossX = var6; // L: 7967 + Client.mouseCrossY = var7; // L: 7968 + Client.mouseCrossColor = 2; // L: 7969 + Client.mouseCrossState = 0; // L: 7970 + Client.destinationX = var0; // L: 7971 + Client.destinationY = var1; // L: 7972 + var9 = Client.getPacketBufferNode(ClientPacket.field2320, Client.packetWriter.isaacCipher); // L: 7974 + var9.packetBuffer.method5665(var3); // L: 7975 + var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7976 + Client.packetWriter.addNode(var9); // L: 7977 + } + } else if (var2 == 45) { + var15 = Client.players[var3]; // L: 7796 + if (var15 != null) { // L: 7797 + Client.mouseCrossX = var6; // L: 7798 + Client.mouseCrossY = var7; // L: 7799 + Client.mouseCrossColor = 2; // L: 7800 + Client.mouseCrossState = 0; // L: 7801 + Client.destinationX = var0; // L: 7802 + Client.destinationY = var1; // L: 7803 + var9 = Client.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); // L: 7805 + var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7806 + var9.packetBuffer.method5665(var3); // L: 7807 + Client.packetWriter.addNode(var9); // L: 7808 + } + } else if (var2 == 46) { + var15 = Client.players[var3]; // L: 7510 + if (var15 != null) { // L: 7511 + Client.mouseCrossX = var6; // L: 7512 + Client.mouseCrossY = var7; // L: 7513 + Client.mouseCrossColor = 2; // L: 7514 + Client.mouseCrossState = 0; // L: 7515 + Client.destinationX = var0; // L: 7516 + Client.destinationY = var1; // L: 7517 + var9 = Client.getPacketBufferNode(ClientPacket.field2333, Client.packetWriter.isaacCipher); // L: 7519 + var9.packetBuffer.method5654(var3); // L: 7520 + var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7521 + Client.packetWriter.addNode(var9); // L: 7522 + } + } else if (var2 == 47) { + var15 = Client.players[var3]; // L: 8033 + if (var15 != null) { // L: 8034 + Client.mouseCrossX = var6; // L: 8035 + Client.mouseCrossY = var7; // L: 8036 + Client.mouseCrossColor = 2; // L: 8037 + Client.mouseCrossState = 0; // L: 8038 + Client.destinationX = var0; // L: 8039 + Client.destinationY = var1; // L: 8040 + var9 = Client.getPacketBufferNode(ClientPacket.field2246, Client.packetWriter.isaacCipher); // L: 8042 + var9.packetBuffer.method5653(var3); // L: 8043 + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8044 + Client.packetWriter.addNode(var9); // L: 8045 + } + } else if (var2 == 48) { + var15 = Client.players[var3]; // L: 7946 + if (var15 != null) { // L: 7947 + Client.mouseCrossX = var6; // L: 7948 + Client.mouseCrossY = var7; // L: 7949 + Client.mouseCrossColor = 2; // L: 7950 + Client.mouseCrossState = 0; // L: 7951 + Client.destinationX = var0; // L: 7952 + Client.destinationY = var1; // L: 7953 + var9 = Client.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); // L: 7955 + var9.packetBuffer.method5645(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7956 + var9.packetBuffer.method5665(var3); // L: 7957 + Client.packetWriter.addNode(var9); // L: 7958 + } + } else if (var2 == 49) { + var15 = Client.players[var3]; // L: 7343 + if (var15 != null) { // L: 7344 + Client.mouseCrossX = var6; // L: 7345 + Client.mouseCrossY = var7; // L: 7346 + Client.mouseCrossColor = 2; // L: 7347 + Client.mouseCrossState = 0; // L: 7348 + Client.destinationX = var0; // L: 7349 + Client.destinationY = var1; // L: 7350 + var9 = Client.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); // L: 7352 + var9.packetBuffer.method5665(var3); // L: 7353 + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7354 + Client.packetWriter.addNode(var9); // L: 7355 + } + } else if (var2 == 50) { + var15 = Client.players[var3]; // L: 7494 + if (var15 != null) { // L: 7495 + Client.mouseCrossX = var6; // L: 7496 + Client.mouseCrossY = var7; // L: 7497 + Client.mouseCrossColor = 2; // L: 7498 + Client.mouseCrossState = 0; // L: 7499 + Client.destinationX = var0; // L: 7500 + Client.destinationY = var1; // L: 7501 + var9 = Client.getPacketBufferNode(ClientPacket.field2343, Client.packetWriter.isaacCipher); // L: 7503 + var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7504 + var9.packetBuffer.method5654(var3); // L: 7505 + Client.packetWriter.addNode(var9); // L: 7506 + } + } else if (var2 == 51) { + var15 = Client.players[var3]; // L: 7403 + if (var15 != null) { // L: 7404 + Client.mouseCrossX = var6; // L: 7405 + Client.mouseCrossY = var7; // L: 7406 + Client.mouseCrossColor = 2; // L: 7407 + Client.mouseCrossState = 0; // L: 7408 + Client.destinationX = var0; // L: 7409 + Client.destinationY = var1; // L: 7410 + var9 = Client.getPacketBufferNode(ClientPacket.field2321, Client.packetWriter.isaacCipher); // L: 7412 + var9.packetBuffer.method5644(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7413 + var9.packetBuffer.writeShort(var3); // L: 7414 + Client.packetWriter.addNode(var9); // L: 7415 + } + } else { + label642: { + if (var2 != 57) { + if (var2 == 58) { + var16 = getWidgetChild(var1, var0); // L: 7556 + if (var16 != null) { // L: 7557 + var9 = Client.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); // L: 7559 + var9.packetBuffer.method5662(class232.selectedSpellWidget); // L: 7560 + var9.packetBuffer.method5665(Client.selectedSpellChildIndex); // L: 7561 + var9.packetBuffer.method5654(var16.itemId); // L: 7562 + var9.packetBuffer.writeShortLE(var1); // L: 7563 + var9.packetBuffer.method5665(Client.field834); // L: 7564 + var9.packetBuffer.method5653(var0); // L: 7565 + Client.packetWriter.addNode(var9); // L: 7566 + } + break label642; + } + + if (var2 == 1001) { + Client.mouseCrossX = var6; // L: 7867 + Client.mouseCrossY = var7; // L: 7868 + Client.mouseCrossColor = 2; // L: 7869 + Client.mouseCrossState = 0; // L: 7870 + Client.destinationX = var0; // L: 7871 + Client.destinationY = var1; // L: 7872 + var8 = Client.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); // L: 7874 + var8.packetBuffer.method5654(WorldMapLabel.baseY + var1); // L: 7875 + var8.packetBuffer.method5654(var0 + WorldMapManager.baseX); // L: 7876 + var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 7877 + var8.packetBuffer.method5665(var3); // L: 7878 + Client.packetWriter.addNode(var8); // L: 7879 + break label642; + } + + if (var2 == 1002) { + Client.mouseCrossX = var6; // L: 7997 + Client.mouseCrossY = var7; // L: 7998 + Client.mouseCrossColor = 2; // L: 7999 + Client.mouseCrossState = 0; // L: 8000 + var8 = Client.getPacketBufferNode(ClientPacket.field2293, Client.packetWriter.isaacCipher); // L: 8002 + var8.packetBuffer.method5653(var3); // L: 8003 + Client.packetWriter.addNode(var8); // L: 8004 + break label642; + } + + if (var2 == 1003) { + Client.mouseCrossX = var6; // L: 7458 + Client.mouseCrossY = var7; // L: 7459 + Client.mouseCrossColor = 2; // L: 7460 + Client.mouseCrossState = 0; // L: 7461 + var13 = Client.npcs[var3]; // L: 7462 + if (var13 != null) { // L: 7463 + NPCDefinition var17 = var13.definition; // L: 7464 + if (var17.transforms != null) { // L: 7465 + var17 = var17.transform(); + } + + if (var17 != null) { // L: 7466 + var11 = Client.getPacketBufferNode(ClientPacket.field2311, Client.packetWriter.isaacCipher); // L: 7468 + var11.packetBuffer.method5654(var17.id); // L: 7469 + Client.packetWriter.addNode(var11); // L: 7470 + } + } + break label642; + } + + if (var2 == 1004) { + Client.mouseCrossX = var6; // L: 7583 + Client.mouseCrossY = var7; // L: 7584 + Client.mouseCrossColor = 2; // L: 7585 + Client.mouseCrossState = 0; // L: 7586 + var8 = Client.getPacketBufferNode(ClientPacket.field2326, Client.packetWriter.isaacCipher); // L: 7588 + var8.packetBuffer.method5654(var3); // L: 7589 + Client.packetWriter.addNode(var8); // L: 7590 + break label642; + } + + if (var2 == 1005) { + var16 = TileItem.getWidget(var1); // L: 7359 + if (var16 != null && var16.itemQuantities[var0] >= 100000) { // L: 7360 + WorldMapRectangle.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var3).name); + } else { + var9 = Client.getPacketBufferNode(ClientPacket.field2326, Client.packetWriter.isaacCipher); // L: 7363 + var9.packetBuffer.method5654(var3); // L: 7364 + Client.packetWriter.addNode(var9); // L: 7365 + } + + Client.field782 = 0; // L: 7367 + GrandExchangeEvent.field79 = TileItem.getWidget(var1); // L: 7368 + Client.field944 = var0; // L: 7369 + break label642; + } + + if (var2 != 1007) { + if (var2 == 1011 || var2 == 1010 || var2 == 1009 || var2 == 1008 || var2 == 1012) { + Message.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); // L: 7962 + } + break label642; + } + } + + var16 = getWidgetChild(var1, var0); // L: 7882 + if (var16 != null) { // L: 7883 + UserComparator8.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); // L: 7884 + } + } + } + } + } + } + } + } + } + + if (Client.isItemSelected != 0) { // L: 8048 + Client.isItemSelected = 0; // L: 8049 + class52.invalidateWidget(TileItem.getWidget(class105.selectedItemWidget)); // L: 8050 + } + + if (Client.isSpellSelected) { // L: 8052 + class22.Widget_runOnTargetLeave(); + } + + if (GrandExchangeEvent.field79 != null && Client.field782 == 0) { // L: 8053 + class52.invalidateWidget(GrandExchangeEvent.field79); + } + + } // L: 8054 + + @ObfuscatedName("kv") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/String;", + garbageValue = "460315375" + ) + static String method1202(String var0) { + PlayerType[] var1 = ApproximateRouteStrategy.PlayerType_values(); // L: 10887 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 10888 + PlayerType var3 = var1[var2]; // L: 10889 + if (var3.modIcon != -1 && var0.startsWith(WorldMapScaleHandler.method824(var3.modIcon))) { // L: 10891 10892 + var0 = var0.substring(6 + Integer.toString(var3.modIcon).length()); // L: 10893 + break; + } + } + + return var0; // L: 10900 } } diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java index 6dd7becf51..6ad2a13001 100644 --- a/runescape-client/src/main/java/SecureRandomFuture.java +++ b/runescape-client/src/main/java/SecureRandomFuture.java @@ -4,370 +4,109 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ct") +@ObfuscatedName("cs") @Implements("SecureRandomFuture") public class SecureRandomFuture { - @ObfuscatedName("gv") - @ObfuscatedGetter( - intValue = 1807406559 - ) - @Export("baseY") - static int baseY; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("executor") ExecutorService executor; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("future") Future future; SecureRandomFuture() { - this.executor = Executors.newSingleThreadExecutor(); - this.future = this.executor.submit(new SecureRandomCallable()); - } + this.executor = Executors.newSingleThreadExecutor(); // L: 10 + this.future = this.executor.submit(new SecureRandomCallable()); // L: 14 + } // L: 15 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1768039353" + garbageValue = "-1936171902" ) @Export("shutdown") void shutdown() { - this.executor.shutdown(); - this.executor = null; - } + this.executor.shutdown(); // L: 18 + this.executor = null; // L: 19 + } // L: 20 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-657646100" + descriptor = "(B)Z", + garbageValue = "11" ) @Export("isDone") boolean isDone() { - return this.future.isDone(); + return this.future.isDone(); // L: 23 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)Ljava/security/SecureRandom;", - garbageValue = "0" + descriptor = "(S)Ljava/security/SecureRandom;", + garbageValue = "2000" ) @Export("get") SecureRandom get() { try { - return (SecureRandom)this.future.get(); - } catch (Exception var2) { - return WorldMapIcon_1.method348(); + return (SecureRandom)this.future.get(); // L: 28 + } catch (Exception var2) { // L: 30 + return BoundaryObject.method3387(); // L: 31 } } - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I[BLlp;B)V", - garbageValue = "0" + descriptor = "(II)V", + garbageValue = "-531384694" ) - static void method2270(int var0, byte[] var1, ArchiveDisk var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 0; - var3.key = (long)var0; - var3.data = var1; - var3.archiveDisk = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } + public static void method2225(int var0) { + if (var0 != -1) { // L: 227 + if (Bounds.Widget_loadedInterfaces[var0]) { // L: 228 + Widget.Widget_archive.clearFilesGroup(var0); // L: 229 + if (Widget.Widget_interfaceComponents[var0] != null) { // L: 230 + boolean var1 = true; // L: 231 - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3181 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3181 = 600; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;IZB)I", - garbageValue = "45" - ) - @Export("parseIntCustomRadix") - static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { - if (var1 >= 2 && var1 <= 36) { - boolean var3 = false; - boolean var4 = false; - int var5 = 0; - int var6 = var0.length(); - - for (int var7 = 0; var7 < var6; ++var7) { - char var8 = var0.charAt(var7); - if (var7 == 0) { - if (var8 == '-') { - var3 = true; - continue; - } - - if (var8 == '+') { - continue; - } - } - - int var10; - if (var8 >= '0' && var8 <= '9') { - var10 = var8 - '0'; - } else if (var8 >= 'A' && var8 <= 'Z') { - var10 = var8 - '7'; - } else { - if (var8 < 'a' || var8 > 'z') { - throw new NumberFormatException(); - } - - var10 = var8 - 'W'; - } - - if (var10 >= var1) { - throw new NumberFormatException(); - } - - if (var3) { - var10 = -var10; - } - - int var9 = var5 * var1 + var10; - if (var9 / var1 != var5) { - throw new NumberFormatException(); - } - - var5 = var9; - var4 = true; - } - - if (!var4) { - throw new NumberFormatException(); - } else { - return var5; - } - } else { - throw new IllegalArgumentException("" + var1); - } - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIIIIZI)Llz;", - garbageValue = "-650607476" - ) - @Export("getItemSprite") - public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) { - if (var1 == -1) { - var4 = 0; - } else if (var4 == 2 && var1 != 1) { - var4 = 1; - } - - long var6 = ((long)var3 << 42) + ((long)var4 << 40) + ((long)var1 << 16) + (long)var0 + ((long)var2 << 38); - Sprite var8; - if (!var5) { - var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6); - if (var8 != null) { - return var8; - } - } - - ItemDefinition var9 = KitDefinition.ItemDefinition_get(var0); - if (var1 > 1 && var9.countobj != null) { - int var10 = -1; - - for (int var11 = 0; var11 < 10; ++var11) { - if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) { - var10 = var9.countobj[var11]; - } - } - - if (var10 != -1) { - var9 = KitDefinition.ItemDefinition_get(var10); - } - } - - Model var21 = var9.getModel(1); - if (var21 == null) { - return null; - } else { - Sprite var22 = null; - if (var9.noteTemplate != -1) { - var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var22 == null) { - return null; - } - } else if (var9.notedId != -1) { - var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var22 == null) { - return null; - } - } else if (var9.placeholderTemplate != -1) { - var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var22 == null) { - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; - int var13 = Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_height; - int[] var15 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var15); - var8 = new Sprite(36, 32); - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.method3147(16, 16); - Rasterizer3D.field1789 = false; - if (var9.placeholderTemplate != -1) { - var22.drawTransBgAt(0, 0); - } - - int var16 = var9.zoom2d; - if (var5) { - var16 = (int)(1.5D * (double)var16); - } else if (var2 == 2) { - var16 = (int)((double)var16 * 1.04D); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var21.calculateBoundsCylinder(); - var21.method3010(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); - if (var9.notedId != -1) { - var22.drawTransBgAt(0, 0); - } - - if (var2 >= 1) { - var8.outline(1); - } - - if (var2 >= 2) { - var8.outline(16777215); - } - - if (var3 != 0) { - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - if (var9.noteTemplate != -1) { - var22.drawTransBgAt(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - Font var19 = class234.ItemDefinition_fontPlain11; - String var20; - if (var1 < 100000) { - var20 = "" + var1 + ""; - } else if (var1 < 10000000) { - var20 = "" + var1 / 1000 + "K" + ""; - } else { - var20 = "" + var1 / 1000000 + "M" + ""; - } - - var19.draw(var20, 0, 9, 16776960, 1); - } - - if (!var5) { - ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field1789 = true; - return var8; - } - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(ILcs;ZB)I", - garbageValue = "75" - ) - static int method2272(int var0, Script var1, boolean var2) { - int var3; - int var4; - int var6; - if (var0 == ScriptOpcodes.ENUM_STRING) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - EnumDefinition var5 = ItemContainer.getEnum(var3); - if (var5.outputType != 's') { - } - - for (var6 = 0; var6 < var5.outputCount; ++var6) { - if (var4 == var5.keys[var6]) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var5.strVals[var6]; - var5 = null; - break; - } - } - - if (var5 != null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var5.defaultStr; - } - - return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - EnumDefinition var10 = ItemContainer.getEnum(var3); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var10.size(); - return 1; - } else { - return 2; - } - } else { - UrlRequester.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - var6 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 3]; - EnumDefinition var7 = ItemContainer.getEnum(var9); - if (var3 == var7.inputType && var4 == var7.outputType) { - for (int var8 = 0; var8 < var7.outputCount; ++var8) { - if (var6 == var7.keys[var8]) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var7.strVals[var8]; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var7.intVals[var8]; + for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { // L: 232 + if (Widget.Widget_interfaceComponents[var0][var2] != null) { // L: 233 + if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { // L: 234 + Widget.Widget_interfaceComponents[var0][var2] = null; + } else { + var1 = false; // L: 235 + } } - - var7 = null; - break; } - } - if (var7 != null) { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var7.defaultStr; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var7.defaultInt; + if (var1) { + Widget.Widget_interfaceComponents[var0] = null; // L: 238 } - } - return 1; - } else { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; + Bounds.Widget_loadedInterfaces[var0] = false; // L: 239 } - - return 1; } } + } // L: 240 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "116037374" + ) + @Export("Messages_getHistorySize") + static int Messages_getHistorySize(int var0) { + ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44 + return var1 == null ? 0 : var1.size(); // L: 45 46 } + + @ObfuscatedName("jt") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1418698978" + ) + static void method2211(int var0, int var1) { + class2.method39(TaskHandler.tempMenuAction, var0, var1); // L: 10254 + TaskHandler.tempMenuAction = null; // L: 10255 + } // L: 10256 } diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 67d910e8e3..1271e73983 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -7,379 +7,376 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("jm") @Implements("SequenceDefinition") public class SequenceDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("SequenceDefinition_archive") public static AbstractArchive SequenceDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("SequenceDefinition_animationsArchive") public static AbstractArchive SequenceDefinition_animationsArchive; - @ObfuscatedName("q") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lic;" - ) - @Export("SequenceDefinition_skeletonsArchive") - public static AbstractArchive SequenceDefinition_skeletonsArchive; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("SequenceDefinition_cached") - static EvictingDualNodeHashTable SequenceDefinition_cached; - @ObfuscatedName("p") + public static EvictingDualNodeHashTable SequenceDefinition_cached; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("SequenceDefinition_cachedFrames") - static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; - @ObfuscatedName("g") + public static EvictingDualNodeHashTable SequenceDefinition_cachedFrames; + @ObfuscatedName("o") @Export("frameIds") public int[] frameIds; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("chatFrameIds") int[] chatFrameIds; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("frameLengths") public int[] frameLengths; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("soundEffects") public int[] soundEffects; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1532360493 + intValue = 742845073 ) @Export("frameCount") public int frameCount; - @ObfuscatedName("w") - int[] field3553; - @ObfuscatedName("y") - public boolean field3558; - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -900038677 - ) - public int field3543; + @ObfuscatedName("n") + int[] field3550; + @ObfuscatedName("d") + public boolean field3544; @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 202902523 + intValue = -1230100641 + ) + public int field3537; + @ObfuscatedName("a") + @ObfuscatedGetter( + intValue = 1046570775 ) @Export("shield") public int shield; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 1507949653 + intValue = 435585977 ) @Export("weapon") public int weapon; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -294683655 + intValue = 391767143 ) - public int field3562; - @ObfuscatedName("s") + public int field3548; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 61735455 + intValue = 1813190021 ) - public int field3559; + public int field3549; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1744120745 + ) + public int field3541; @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1582527651 + intValue = -1460748063 ) - public int field3560; - @ObfuscatedName("d") - @ObfuscatedGetter( - intValue = 1066038459 - ) - public int field3561; + public int field3535; static { - SequenceDefinition_cached = new EvictingDualNodeHashTable(64); - SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); + SequenceDefinition_cached = new EvictingDualNodeHashTable(64); // L: 15 + SequenceDefinition_cachedFrames = new EvictingDualNodeHashTable(100); // L: 16 } SequenceDefinition() { - this.frameCount = -1; - this.field3558 = false; - this.field3543 = 5; - this.shield = -1; - this.weapon = -1; - this.field3562 = 99; - this.field3559 = -1; - this.field3560 = -1; - this.field3561 = 2; - } + this.frameCount = -1; // L: 21 + this.field3544 = false; // L: 23 + this.field3537 = 5; // L: 24 + this.shield = -1; // L: 25 + this.weapon = -1; // L: 26 + this.field3548 = 99; // L: 27 + this.field3549 = -1; // L: 28 + this.field3541 = -1; // L: 29 + this.field3535 = 2; // L: 30 + } // L: 32 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1837396411" + descriptor = "(Lkf;I)V", + garbageValue = "892270610" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 47 + if (var2 == 0) { // L: 48 + return; // L: 51 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 49 } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "-1375281235" + descriptor = "(Lkf;II)V", + garbageValue = "322225834" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { int var3; int var4; - if (var2 == 1) { - var3 = var1.readUnsignedShort(); - this.frameLengths = new int[var3]; + if (var2 == 1) { // L: 54 + var3 = var1.readUnsignedShort(); // L: 55 + this.frameLengths = new int[var3]; // L: 56 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 57 this.frameLengths[var4] = var1.readUnsignedShort(); } - this.frameIds = new int[var3]; + this.frameIds = new int[var3]; // L: 58 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 59 this.frameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 60 this.frameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 62 this.frameCount = var1.readUnsignedShort(); } else if (var2 == 3) { var3 = var1.readUnsignedByte(); - this.field3553 = new int[var3 + 1]; + this.field3550 = new int[var3 + 1]; for (var4 = 0; var4 < var3; ++var4) { - this.field3553[var4] = var1.readUnsignedByte(); + this.field3550[var4] = var1.readUnsignedByte(); } - this.field3553[var3] = 9999999; + this.field3550[var3] = 9999999; } else if (var2 == 4) { - this.field3558 = true; - } else if (var2 == 5) { - this.field3543 = var1.readUnsignedByte(); - } else if (var2 == 6) { + this.field3544 = true; + } else if (var2 == 5) { // L: 70 + this.field3537 = var1.readUnsignedByte(); + } else if (var2 == 6) { // L: 71 this.shield = var1.readUnsignedShort(); - } else if (var2 == 7) { + } else if (var2 == 7) { // L: 72 this.weapon = var1.readUnsignedShort(); - } else if (var2 == 8) { - this.field3562 = var1.readUnsignedByte(); - } else if (var2 == 9) { - this.field3559 = var1.readUnsignedByte(); - } else if (var2 == 10) { - this.field3560 = var1.readUnsignedByte(); - } else if (var2 == 11) { - this.field3561 = var1.readUnsignedByte(); - } else if (var2 == 12) { - var3 = var1.readUnsignedByte(); - this.chatFrameIds = new int[var3]; + } else if (var2 == 8) { // L: 73 + this.field3548 = var1.readUnsignedByte(); + } else if (var2 == 9) { // L: 74 + this.field3549 = var1.readUnsignedByte(); + } else if (var2 == 10) { // L: 75 + this.field3541 = var1.readUnsignedByte(); + } else if (var2 == 11) { // L: 76 + this.field3535 = var1.readUnsignedByte(); + } else if (var2 == 12) { // L: 77 + var3 = var1.readUnsignedByte(); // L: 78 + this.chatFrameIds = new int[var3]; // L: 79 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 80 this.chatFrameIds[var4] = var1.readUnsignedShort(); } - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 81 this.chatFrameIds[var4] += var1.readUnsignedShort() << 16; } - } else if (var2 == 13) { - var3 = var1.readUnsignedByte(); - this.soundEffects = new int[var3]; + } else if (var2 == 13) { // L: 83 + var3 = var1.readUnsignedByte(); // L: 84 + this.soundEffects = new int[var3]; // L: 85 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 86 this.soundEffects[var4] = var1.readMedium(); } } - } + } // L: 89 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1490793911" + descriptor = "(B)V", + garbageValue = "-125" ) @Export("postDecode") void postDecode() { - if (this.field3559 == -1) { - if (this.field3553 != null) { - this.field3559 = 2; + if (this.field3549 == -1) { // L: 92 + if (this.field3550 != null) { // L: 93 + this.field3549 = 2; } else { - this.field3559 = 0; + this.field3549 = 0; // L: 94 } } - if (this.field3560 == -1) { - if (this.field3553 != null) { - this.field3560 = 2; + if (this.field3541 == -1) { // L: 96 + if (this.field3550 != null) { // L: 97 + this.field3541 = 2; } else { - this.field3560 = 0; + this.field3541 = 0; // L: 98 } } - } + } // L: 100 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lef;II)Lef;", - garbageValue = "-1881625962" + descriptor = "(Ler;II)Ler;", + garbageValue = "-1365991470" ) @Export("transformActorModel") public Model transformActorModel(Model var1, int var2) { - var2 = this.frameIds[var2]; - Frames var3 = NetSocket.getFrames(var2 >> 16); - var2 &= 65535; + var2 = this.frameIds[var2]; // L: 103 + Frames var3 = UrlRequester.getFrames(var2 >> 16); // L: 104 + var2 &= 65535; // L: 105 if (var3 == null) { + return var1.toSharedSequenceModel(true); // L: 106 + } else { + Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); // L: 107 + var4.animate(var3, var2); // L: 108 + return var4; // L: 109 + } + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(Ler;III)Ler;", + garbageValue = "2144819244" + ) + @Export("transformObjectModel") + Model transformObjectModel(Model var1, int var2, int var3) { + var2 = this.frameIds[var2]; // L: 113 + Frames var4 = UrlRequester.getFrames(var2 >> 16); // L: 114 + var2 &= 65535; // L: 115 + if (var4 == null) { // L: 116 return var1.toSharedSequenceModel(true); } else { - Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); - return var4; + Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); // L: 117 + var3 &= 3; // L: 118 + if (var3 == 1) { // L: 119 + var5.rotateY270Ccw(); + } else if (var3 == 2) { // L: 120 + var5.rotateY180(); + } else if (var3 == 3) { // L: 121 + var5.rotateY90Ccw(); + } + + var5.animate(var4, var2); // L: 122 + if (var3 == 1) { // L: 123 + var5.rotateY90Ccw(); + } else if (var3 == 2) { // L: 124 + var5.rotateY180(); + } else if (var3 == 3) { // L: 125 + var5.rotateY270Ccw(); + } + + return var5; // L: 126 + } + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(Ler;II)Ler;", + garbageValue = "2009150039" + ) + @Export("transformSpotAnimationModel") + Model transformSpotAnimationModel(Model var1, int var2) { + var2 = this.frameIds[var2]; // L: 130 + Frames var3 = UrlRequester.getFrames(var2 >> 16); // L: 131 + var2 &= 65535; // L: 132 + if (var3 == null) { + return var1.toSharedSpotAnimationModel(true); // L: 133 + } else { + Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); // L: 134 + var4.animate(var3, var2); // L: 135 + return var4; // L: 136 + } + } + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(Ler;ILjm;IB)Ler;", + garbageValue = "-2" + ) + @Export("applyTransformations") + public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { + var2 = this.frameIds[var2]; // L: 140 + Frames var5 = UrlRequester.getFrames(var2 >> 16); // L: 141 + var2 &= 65535; // L: 142 + if (var5 == null) { // L: 143 + return var3.transformActorModel(var1, var4); + } else { + var4 = var3.frameIds[var4]; // L: 144 + Frames var6 = UrlRequester.getFrames(var4 >> 16); // L: 145 + var4 &= 65535; // L: 146 + Model var7; + if (var6 == null) { // L: 147 + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); // L: 148 + var7.animate(var5, var2); // L: 149 + return var7; // L: 150 + } else { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); // L: 152 + var7.animate2(var5, var2, var6, var4, this.field3550); // L: 153 + return var7; // L: 154 + } } } @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lef;III)Lef;", - garbageValue = "-1040736484" - ) - @Export("transformObjectModel") - Model transformObjectModel(Model var1, int var2, int var3) { - var2 = this.frameIds[var2]; - Frames var4 = NetSocket.getFrames(var2 >> 16); - var2 &= 65535; - if (var4 == null) { - return var1.toSharedSequenceModel(true); - } else { - Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); - var3 &= 3; - if (var3 == 1) { - var5.rotateY270Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); - } else if (var3 == 3) { - var5.rotateY90Ccw(); - } - - var5.animate(var4, var2); - if (var3 == 1) { - var5.rotateY90Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); - } else if (var3 == 3) { - var5.rotateY270Ccw(); - } - - return var5; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lef;II)Lef;", - garbageValue = "-277583954" - ) - @Export("transformSpotAnimationModel") - Model transformSpotAnimationModel(Model var1, int var2) { - var2 = this.frameIds[var2]; - Frames var3 = NetSocket.getFrames(var2 >> 16); - var2 &= 65535; - if (var3 == null) { - return var1.toSharedSpotAnimationModel(true); - } else { - Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); - return var4; - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Lef;ILjm;II)Lef;", - garbageValue = "-864862384" - ) - @Export("applyTransformations") - public Model applyTransformations(Model var1, int var2, SequenceDefinition var3, int var4) { - var2 = this.frameIds[var2]; - Frames var5 = NetSocket.getFrames(var2 >> 16); - var2 &= 65535; - if (var5 == null) { - return var3.transformActorModel(var1, var4); - } else { - var4 = var3.frameIds[var4]; - Frames var6 = NetSocket.getFrames(var4 >> 16); - var4 &= 65535; - Model var7; - if (var6 == null) { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); - var7.animate(var5, var2); - return var7; - } else { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field3553); - return var7; - } - } - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Lef;IB)Lef;", - garbageValue = "32" + descriptor = "(Ler;II)Ler;", + garbageValue = "1789593927" ) @Export("transformWidgetModel") public Model transformWidgetModel(Model var1, int var2) { - int var3 = this.frameIds[var2]; - Frames var4 = NetSocket.getFrames(var3 >> 16); - var3 &= 65535; - if (var4 == null) { + int var3 = this.frameIds[var2]; // L: 158 + Frames var4 = UrlRequester.getFrames(var3 >> 16); // L: 159 + var3 &= 65535; // L: 160 + if (var4 == null) { // L: 161 return var1.toSharedSequenceModel(true); } else { - Frames var5 = null; - int var6 = 0; - if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { - var6 = this.chatFrameIds[var2]; - var5 = NetSocket.getFrames(var6 >> 16); - var6 &= 65535; + Frames var5 = null; // L: 162 + int var6 = 0; // L: 163 + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { // L: 164 + var6 = this.chatFrameIds[var2]; // L: 165 + var5 = UrlRequester.getFrames(var6 >> 16); // L: 166 + var6 &= 65535; // L: 167 } Model var7; - if (var5 != null && var6 != 65535) { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); - var7.animate(var4, var3); - var7.animate(var5, var6); - return var7; + if (var5 != null && var6 != 65535) { // L: 169 + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); // L: 174 + var7.animate(var4, var3); // L: 175 + var7.animate(var5, var6); // L: 176 + return var7; // L: 177 } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); - var7.animate(var4, var3); - return var7; + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); // L: 170 + var7.animate(var4, var3); // L: 171 + return var7; // L: 172 } } } - @ObfuscatedName("fc") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "1779036927" + descriptor = "(II)V", + garbageValue = "-2006270151" ) - static final void method4973(boolean var0) { - if (var0) { - Client.field708 = Login.field1223 ? class169.field2023 : class169.field2025; - } else { - Client.field708 = NetSocket.clientPreferences.parameters.containsKey(WorldMapAreaData.method759(Login.Login_username)) ? class169.field2028 : class169.field2024; - } + @Export("clearItemContainer") + static void clearItemContainer(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 63 + if (var1 != null) { // L: 64 + for (int var2 = 0; var2 < var1.ids.length; ++var2) { // L: 65 + var1.ids[var2] = -1; // L: 66 + var1.quantities[var2] = 0; // L: 67 + } - } + } + } // L: 69 } diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java index 3d52ca7fda..19094bb26c 100644 --- a/runescape-client/src/main/java/ServerPacket.java +++ b/runescape-client/src/main/java/ServerPacket.java @@ -4,543 +4,549 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gu") +@ObfuscatedName("ga") @Implements("ServerPacket") public class ServerPacket { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2191; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2177; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2200; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2156; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2211; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2158; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2219; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2228; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2161; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2169; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2224; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2164; - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2155; - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2166; @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2167; - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2168; - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2181; - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2170; - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2232; - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2172; - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2173; - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2189; - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2171; - @ObfuscatedName("b") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2176; - @ObfuscatedName("i") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2165; - @ObfuscatedName("f") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2178; - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2175; - @ObfuscatedName("ai") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2180; - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2240; - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2182; - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2183; - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2184; - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2185; - @ObfuscatedName("am") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2186; - @ObfuscatedName("ak") + public static final ServerPacket field2200; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2187; - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2188; - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2160; - @ObfuscatedName("ar") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2220; - @ObfuscatedName("ap") + public static final ServerPacket field2161; + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2162; - @ObfuscatedName("al") + public static final ServerPacket field2243; + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2159; - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2199; - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2194; - @ObfuscatedName("av") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2157; - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2193; - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2197; - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2190; - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2223; - @ObfuscatedName("az") - @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2163; - @ObfuscatedName("aq") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2201; - @ObfuscatedName("ay") + public static final ServerPacket field2178; + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2202; + public static final ServerPacket field2189; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2244; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2167; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2168; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2169; + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2170; + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2171; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2242; + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2173; + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2215; + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2175; + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2176; + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2177; + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2159; + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2179; + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2180; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2219; + @ObfuscatedName("e") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2182; + @ObfuscatedName("ab") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2197; + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2190; + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2166; + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2186; + @ObfuscatedName("an") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2187; + @ObfuscatedName("am") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2217; + @ObfuscatedName("ap") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2195; @ObfuscatedName("au") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" + ) + public static final ServerPacket field2158; + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2191; + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2196; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2193; + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2194; + @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2214; + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2165; + @ObfuscatedName("av") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2204; + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2213; + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2199; + @ObfuscatedName("az") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2224; + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2201; + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2202; + @ObfuscatedName("ay") + @ObfuscatedSignature( + descriptor = "Lga;" ) public static final ServerPacket field2203; @ObfuscatedName("aj") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2204; - @ObfuscatedName("bk") + public static final ServerPacket field2239; + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2205; - @ObfuscatedName("bh") + @ObfuscatedName("af") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2206; - @ObfuscatedName("bg") + @ObfuscatedName("ak") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2207; - @ObfuscatedName("be") + @ObfuscatedName("ac") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2208; - @ObfuscatedName("bf") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2209; - @ObfuscatedName("ba") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2210; - @ObfuscatedName("bd") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2230; - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2212; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2213; - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2226; - @ObfuscatedName("bn") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2215; - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2216; - @ObfuscatedName("bo") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2217; - @ObfuscatedName("bp") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2218; - @ObfuscatedName("bm") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2196; @ObfuscatedName("bl") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2174; - @ObfuscatedName("bv") + public static final ServerPacket field2209; + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2221; - @ObfuscatedName("bi") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2222; + public static final ServerPacket field2210; @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2235; - @ObfuscatedName("bu") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2153; - @ObfuscatedName("bx") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2225; - @ObfuscatedName("br") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2195; - @ObfuscatedName("bs") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2227; - @ObfuscatedName("by") - @ObfuscatedSignature( - descriptor = "Lgu;" - ) - public static final ServerPacket field2233; + public static final ServerPacket field2211; @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" + ) + public static final ServerPacket field2212; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lga;" ) public static final ServerPacket field2229; - @ObfuscatedName("bt") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2179; - @ObfuscatedName("cc") + public static final ServerPacket field2174; + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2231; - @ObfuscatedName("cb") + public static final ServerPacket field2222; + @ObfuscatedName("br") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2214; - @ObfuscatedName("ch") + public static final ServerPacket field2162; + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2154; - @ObfuscatedName("cw") + public static final ServerPacket field2172; + @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" + ) + public static final ServerPacket field2218; + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2227; + @ObfuscatedName("be") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2220; + @ObfuscatedName("bu") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2221; + @ObfuscatedName("ba") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2181; + @ObfuscatedName("bm") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2223; + @ObfuscatedName("bd") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2232; + @ObfuscatedName("bb") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2225; + @ObfuscatedName("bx") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2183; + @ObfuscatedName("bq") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2184; + @ObfuscatedName("by") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2228; + @ObfuscatedName("bo") + @ObfuscatedSignature( + descriptor = "Lga;" ) public static final ServerPacket field2234; - @ObfuscatedName("cz") + @ObfuscatedName("bk") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) - public static final ServerPacket field2198; + public static final ServerPacket field2230; + @ObfuscatedName("bv") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2231; + @ObfuscatedName("bf") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2226; + @ObfuscatedName("bt") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2233; + @ObfuscatedName("bs") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2216; @ObfuscatedName("cg") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" + ) + public static final ServerPacket field2235; + @ObfuscatedName("ca") + @ObfuscatedSignature( + descriptor = "Lga;" ) public static final ServerPacket field2236; - @ObfuscatedName("cn") + @ObfuscatedName("ct") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2237; - @ObfuscatedName("ce") + @ObfuscatedName("cv") @ObfuscatedSignature( - descriptor = "Lgu;" + descriptor = "Lga;" ) public static final ServerPacket field2238; - @ObfuscatedName("cj") + @ObfuscatedName("ce") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2188; + @ObfuscatedName("cr") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2240; + @ObfuscatedName("cn") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2241; + @ObfuscatedName("ci") + @ObfuscatedSignature( + descriptor = "Lga;" + ) + public static final ServerPacket field2192; + @ObfuscatedName("hq") @ObfuscatedGetter( - intValue = -1993969829 + intValue = 281094069 + ) + @Export("cameraYaw") + static int cameraYaw; + @ObfuscatedName("cm") + @ObfuscatedGetter( + intValue = -317415457 ) @Export("id") public final int id; - @ObfuscatedName("ck") + @ObfuscatedName("cu") @ObfuscatedGetter( - intValue = 731369397 + intValue = -811501627 ) @Export("length") public final int length; static { - field2191 = new ServerPacket(0, 2); - field2177 = new ServerPacket(1, -2); - field2200 = new ServerPacket(2, -2); - field2156 = new ServerPacket(3, 4); - field2211 = new ServerPacket(4, 4); - field2158 = new ServerPacket(5, 8); - field2219 = new ServerPacket(6, 2); - field2228 = new ServerPacket(7, 6); - field2161 = new ServerPacket(8, 20); - field2169 = new ServerPacket(9, -2); - field2224 = new ServerPacket(10, 6); - field2164 = new ServerPacket(11, 15); - field2155 = new ServerPacket(12, 6); - field2166 = new ServerPacket(13, 2); - field2167 = new ServerPacket(14, 7); - field2168 = new ServerPacket(15, 4); - field2181 = new ServerPacket(16, -2); - field2170 = new ServerPacket(17, 2); - field2232 = new ServerPacket(18, 12); - field2172 = new ServerPacket(19, 2); - field2173 = new ServerPacket(20, -2); - field2189 = new ServerPacket(21, -2); - field2171 = new ServerPacket(22, 5); - field2176 = new ServerPacket(23, 2); - field2165 = new ServerPacket(24, 2); - field2178 = new ServerPacket(25, 0); - field2175 = new ServerPacket(26, 1); - field2180 = new ServerPacket(27, 2); - field2240 = new ServerPacket(28, 6); - field2182 = new ServerPacket(29, -2); - field2183 = new ServerPacket(30, 28); - field2184 = new ServerPacket(31, 6); - field2185 = new ServerPacket(32, 3); - field2186 = new ServerPacket(33, 4); - field2187 = new ServerPacket(34, -2); - field2188 = new ServerPacket(35, 1); - field2160 = new ServerPacket(36, -2); - field2220 = new ServerPacket(37, 0); - field2162 = new ServerPacket(38, 14); - field2159 = new ServerPacket(39, 1); - field2199 = new ServerPacket(40, -1); - field2194 = new ServerPacket(41, 1); - field2157 = new ServerPacket(42, -2); - field2193 = new ServerPacket(43, 6); - field2197 = new ServerPacket(44, 4); - field2190 = new ServerPacket(45, 4); - field2223 = new ServerPacket(46, -2); - field2163 = new ServerPacket(47, 0); - field2201 = new ServerPacket(48, 6); - field2202 = new ServerPacket(49, 6); - field2203 = new ServerPacket(50, 8); - field2204 = new ServerPacket(51, 2); - field2205 = new ServerPacket(52, 5); - field2206 = new ServerPacket(53, 0); - field2207 = new ServerPacket(54, 10); - field2208 = new ServerPacket(55, -2); - field2209 = new ServerPacket(56, 0); - field2210 = new ServerPacket(57, 5); - field2230 = new ServerPacket(58, 6); - field2212 = new ServerPacket(59, -2); - field2213 = new ServerPacket(60, 5); - field2226 = new ServerPacket(61, 6); - field2215 = new ServerPacket(62, 8); - field2216 = new ServerPacket(63, 7); - field2217 = new ServerPacket(64, -1); - field2218 = new ServerPacket(65, 10); - field2196 = new ServerPacket(66, 6); - field2174 = new ServerPacket(67, 1); - field2221 = new ServerPacket(68, 2); - field2222 = new ServerPacket(69, 8); - field2235 = new ServerPacket(70, -2); - field2153 = new ServerPacket(71, 1); - field2225 = new ServerPacket(72, 0); - field2195 = new ServerPacket(73, -2); - field2227 = new ServerPacket(74, 0); - field2233 = new ServerPacket(75, -2); - field2229 = new ServerPacket(76, -2); - field2179 = new ServerPacket(77, -1); - field2231 = new ServerPacket(78, 3); - field2214 = new ServerPacket(79, -2); - field2154 = new ServerPacket(80, 5); - field2234 = new ServerPacket(81, 4); - field2198 = new ServerPacket(82, -1); - field2236 = new ServerPacket(83, -2); - field2237 = new ServerPacket(84, -1); - field2238 = new ServerPacket(85, -1); + field2164 = new ServerPacket(0, 4); // L: 5 + field2185 = new ServerPacket(1, 4); // L: 6 + field2200 = new ServerPacket(2, -2); // L: 7 + field2160 = new ServerPacket(3, 3); // L: 8 + field2161 = new ServerPacket(4, 0); // L: 9 + field2243 = new ServerPacket(5, -2); // L: 10 + field2163 = new ServerPacket(6, 0); // L: 11 + field2178 = new ServerPacket(7, -1); // L: 12 + field2189 = new ServerPacket(8, 6); // L: 13 + field2244 = new ServerPacket(9, 6); // L: 14 + field2167 = new ServerPacket(10, 0); // L: 15 + field2168 = new ServerPacket(11, -2); // L: 16 + field2169 = new ServerPacket(12, -2); // L: 17 + field2170 = new ServerPacket(13, 1); // L: 18 + field2171 = new ServerPacket(14, -1); // L: 19 + field2242 = new ServerPacket(15, 2); // L: 20 + field2173 = new ServerPacket(16, 7); // L: 21 + field2215 = new ServerPacket(17, 5); // L: 22 + field2175 = new ServerPacket(18, 4); // L: 23 + field2176 = new ServerPacket(19, -2); // L: 24 + field2177 = new ServerPacket(20, -2); // L: 25 + field2159 = new ServerPacket(21, 14); // L: 26 + field2179 = new ServerPacket(22, -2); // L: 27 + field2180 = new ServerPacket(23, -2); // L: 28 + field2219 = new ServerPacket(24, 3); // L: 29 + field2182 = new ServerPacket(25, 4); // L: 30 + field2197 = new ServerPacket(26, -2); // L: 31 + field2190 = new ServerPacket(27, -2); // L: 32 + field2166 = new ServerPacket(28, 7); // L: 33 + field2186 = new ServerPacket(29, -1); // L: 34 + field2187 = new ServerPacket(30, 1); // L: 35 + field2217 = new ServerPacket(31, 20); // L: 36 + field2195 = new ServerPacket(32, 0); // L: 37 + field2158 = new ServerPacket(33, 6); // L: 38 + field2191 = new ServerPacket(34, -2); // L: 39 + field2196 = new ServerPacket(35, 4); // L: 40 + field2193 = new ServerPacket(36, 2); // L: 41 + field2194 = new ServerPacket(37, 10); // L: 42 + field2214 = new ServerPacket(38, -2); // L: 43 + field2165 = new ServerPacket(39, -2); // L: 44 + field2204 = new ServerPacket(40, 6); // L: 45 + field2213 = new ServerPacket(41, 6); // L: 46 + field2199 = new ServerPacket(42, 28); // L: 47 + field2224 = new ServerPacket(43, -2); // L: 48 + field2201 = new ServerPacket(44, 8); // L: 49 + field2202 = new ServerPacket(45, 5); // L: 50 + field2203 = new ServerPacket(46, 2); // L: 51 + field2239 = new ServerPacket(47, -2); // L: 52 + field2205 = new ServerPacket(48, 2); // L: 53 + field2206 = new ServerPacket(49, 2); // L: 54 + field2207 = new ServerPacket(50, 8); // L: 55 + field2208 = new ServerPacket(51, 2); // L: 56 + field2209 = new ServerPacket(52, 8); // L: 57 + field2210 = new ServerPacket(53, 8); // L: 58 + field2211 = new ServerPacket(54, 6); // L: 59 + field2212 = new ServerPacket(55, 10); // L: 60 + field2229 = new ServerPacket(56, 0); // L: 61 + field2174 = new ServerPacket(57, 6); // L: 62 + field2222 = new ServerPacket(58, -1); // L: 63 + field2162 = new ServerPacket(59, 1); // L: 64 + field2172 = new ServerPacket(60, -2); // L: 65 + field2218 = new ServerPacket(61, -2); // L: 66 + field2227 = new ServerPacket(62, 5); // L: 67 + field2220 = new ServerPacket(63, 1); // L: 68 + field2221 = new ServerPacket(64, 1); // L: 69 + field2181 = new ServerPacket(65, 2); // L: 70 + field2223 = new ServerPacket(66, 12); // L: 71 + field2232 = new ServerPacket(67, 1); // L: 72 + field2225 = new ServerPacket(68, 2); // L: 73 + field2183 = new ServerPacket(69, 2); // L: 74 + field2184 = new ServerPacket(70, -2); // L: 75 + field2228 = new ServerPacket(71, 15); // L: 76 + field2234 = new ServerPacket(72, 0); // L: 77 + field2230 = new ServerPacket(73, 0); // L: 78 + field2231 = new ServerPacket(74, 6); // L: 79 + field2226 = new ServerPacket(75, -1); // L: 80 + field2233 = new ServerPacket(76, 4); // L: 81 + field2216 = new ServerPacket(77, 2); // L: 82 + field2235 = new ServerPacket(78, 6); // L: 83 + field2236 = new ServerPacket(79, -1); // L: 84 + field2237 = new ServerPacket(80, 5); // L: 85 + field2238 = new ServerPacket(81, 5); // L: 86 + field2188 = new ServerPacket(82, -2); // L: 87 + field2240 = new ServerPacket(83, 4); // L: 88 + field2241 = new ServerPacket(84, 6); // L: 89 + field2192 = new ServerPacket(85, 6); // L: 90 } ServerPacket(int var1, int var2) { - this.id = var1; - this.length = var2; - } + this.id = var1; // L: 99 + this.length = var2; // L: 100 + } // L: 101 } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index 6e2e0109f8..46e44c736c 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -4,111 +4,82 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("er") +@ObfuscatedName("eh") @Implements("Skeleton") public class Skeleton extends Node { - @ObfuscatedName("aq") - @ObfuscatedGetter( - intValue = -47286483 + @ObfuscatedName("sw") + @ObfuscatedSignature( + descriptor = "Llz;" ) - static int field1826; - @ObfuscatedName("m") + @Export("masterDisk") + static ArchiveDisk masterDisk; + @ObfuscatedName("gf") + @Export("regionLandArchiveIds") + static int[] regionLandArchiveIds; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -747457743 + intValue = -891561701 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 386205487 + intValue = 178139825 ) @Export("count") int count; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("transformTypes") int[] transformTypes; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("labels") int[][] labels; Skeleton(int var1, byte[] var2) { - this.id = var1; - Buffer var3 = new Buffer(var2); - this.count = var3.readUnsignedByte(); - this.transformTypes = new int[this.count]; - this.labels = new int[this.count][]; + this.id = var1; // L: 13 + Buffer var3 = new Buffer(var2); // L: 14 + this.count = var3.readUnsignedByte(); // L: 15 + this.transformTypes = new int[this.count]; // L: 16 + this.labels = new int[this.count][]; // L: 17 int var4; - for (var4 = 0; var4 < this.count; ++var4) { + for (var4 = 0; var4 < this.count; ++var4) { // L: 18 this.transformTypes[var4] = var3.readUnsignedByte(); } - for (var4 = 0; var4 < this.count; ++var4) { + for (var4 = 0; var4 < this.count; ++var4) { // L: 19 this.labels[var4] = new int[var3.readUnsignedByte()]; } - for (var4 = 0; var4 < this.count; ++var4) { - for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { + for (var4 = 0; var4 < this.count; ++var4) { // L: 20 + for (int var5 = 0; var5 < this.labels[var4].length; ++var5) { // L: 21 this.labels[var4][var5] = var3.readUnsignedByte(); } } - } + } // L: 23 - @ObfuscatedName("iz") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(ZB)V", - garbageValue = "38" + descriptor = "(IB)Ljx;", + garbageValue = "29" ) - @Export("setTapToDrop") - static void setTapToDrop(boolean var0) { - Client.tapToDrop = var0; - } - - @ObfuscatedName("jo") - @ObfuscatedSignature( - descriptor = "([Lhd;IB)V", - garbageValue = "34" - ) - @Export("runComponentCloseListeners") - static final void runComponentCloseListeners(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null) { - if (var3.type == 0) { - if (var3.children != null) { - runComponentCloseListeners(var3.children, var1); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - Language.runIntfCloseListeners(var4.group, var1); - } - } - - ScriptEvent var5; - if (var1 == 0 && var3.onDialogAbort != null) { - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onDialogAbort; - InterfaceParent.runScriptEvent(var5); - } - - if (var1 == 1 && var3.onSubChange != null) { - if (var3.childIndex >= 0) { - Widget var6 = WorldMapSprite.getWidget(var3.id); - if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { - continue; - } - } - - var5 = new ScriptEvent(); - var5.widget = var3; - var5.args = var3.onSubChange; - InterfaceParent.runScriptEvent(var5); - } + @Export("getNpcDefinition") + public static NPCDefinition getNpcDefinition(int var0) { + NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); // L: 57 + if (var1 != null) { // L: 58 + return var1; + } else { + byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); // L: 59 + var1 = new NPCDefinition(); // L: 60 + var1.id = var0; // L: 61 + if (var2 != null) { // L: 62 + var1.decode(new Buffer(var2)); } - } + var1.postDecode(); // L: 63 + NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); // L: 64 + return var1; // L: 65 + } } } diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 2f8acf1dd7..a0485a5c3f 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -1,47 +1,28 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hf") +@ObfuscatedName("hd") @Implements("Skills") public class Skills { - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("Skills_enabled") public static final boolean[] Skills_enabled; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Skills_experienceTable") public static int[] Skills_experienceTable; static { - Skills_enabled = 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, false, false}; - Skills_experienceTable = new int[99]; - int var0 = 0; + Skills_enabled = 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, false, false}; // L: 5 + Skills_experienceTable = new int[99]; // L: 6 + int var0 = 0; // L: 9 - for (int var1 = 0; var1 < 99; ++var1) { - int var2 = var1 + 1; - int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D)); - var0 += var3; - Skills_experienceTable[var1] = var0 / 4; + for (int var1 = 0; var1 < 99; ++var1) { // L: 10 + int var2 = var1 + 1; // L: 11 + int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D)); // L: 12 + var0 += var3; // L: 13 + Skills_experienceTable[var1] = var0 / 4; // L: 14 } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)[Lib;", - garbageValue = "0" - ) - public static StudioGame[] method4272() { - return new StudioGame[]{StudioGame.stellardawn, StudioGame.game5, StudioGame.game3, StudioGame.runescape, StudioGame.game4, StudioGame.oldscape}; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-891910442" - ) - public static int method4271() { - return ++MouseHandler.MouseHandler_idleCycles - 1; - } + } // L: 16 } diff --git a/runescape-client/src/main/java/SoftWrapper.java b/runescape-client/src/main/java/SoftWrapper.java index 8e02bbc531..f21ff1f1eb 100644 --- a/runescape-client/src/main/java/SoftWrapper.java +++ b/runescape-client/src/main/java/SoftWrapper.java @@ -3,27 +3,27 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fd") +@ObfuscatedName("fj") @Implements("SoftWrapper") public class SoftWrapper extends Wrapper { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("ref") SoftReference ref; SoftWrapper(Object var1, int var2) { - super(var2); - this.ref = new SoftReference(var1); - } + super(var2); // L: 10 + this.ref = new SoftReference(var1); // L: 11 + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("get") Object get() { - return this.ref.get(); + return this.ref.get(); // L: 15 } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("isSoft") boolean isSoft() { - return true; + return true; // L: 19 } } diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index d8a0e6bbd5..2d345305dd 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -1,35 +1,39 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("do") +@ObfuscatedName("ds") @Implements("SoundCache") public class SoundCache { - @ObfuscatedName("u") - @Export("ItemDefinition_inMembersWorld") - static boolean ItemDefinition_inMembersWorld; - @ObfuscatedName("m") + @ObfuscatedName("rp") + @ObfuscatedGetter( + intValue = 1426340781 + ) + static int field1472; + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("soundEffectIndex") AbstractArchive soundEffectIndex; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("musicSampleIndex") AbstractArchive musicSampleIndex; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("musicSamples") NodeHashTable musicSamples; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lle;" + descriptor = "Llc;" ) @Export("rawSounds") NodeHashTable rawSounds; @@ -38,174 +42,148 @@ public class SoundCache { descriptor = "(Lic;Lic;)V" ) public SoundCache(AbstractArchive var1, AbstractArchive var2) { - this.musicSamples = new NodeHashTable(256); - this.rawSounds = new NodeHashTable(256); - this.soundEffectIndex = var1; - this.musicSampleIndex = var2; - } + this.musicSamples = new NodeHashTable(256); // L: 9 + this.rawSounds = new NodeHashTable(256); // L: 10 + this.soundEffectIndex = var1; // L: 13 + this.musicSampleIndex = var2; // L: 14 + } // L: 15 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II[II)Ldp;", - garbageValue = "-1808254786" + descriptor = "(II[II)Lde;", + garbageValue = "-484042119" ) @Export("getSoundEffect0") RawSound getSoundEffect0(int var1, int var2, int[] var3) { - int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); - var4 |= var1 << 16; - long var5 = (long)var4; - RawSound var7 = (RawSound)this.rawSounds.get(var5); - if (var7 != null) { + int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 18 + var4 |= var1 << 16; // L: 19 + long var5 = (long)var4; // L: 20 + RawSound var7 = (RawSound)this.rawSounds.get(var5); // L: 21 + if (var7 != null) { // L: 22 return var7; - } else if (var3 != null && var3[0] <= 0) { + } else if (var3 != null && var3[0] <= 0) { // L: 23 return null; } else { - SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); - if (var8 == null) { + SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); // L: 24 + if (var8 == null) { // L: 25 return null; } else { - var7 = var8.toRawSound(); - this.rawSounds.put(var7, var5); + var7 = var8.toRawSound(); // L: 26 + this.rawSounds.put(var7, var5); // L: 27 if (var3 != null) { - var3[0] -= var7.samples.length; + var3[0] -= var7.samples.length; // L: 28 } - return var7; + return var7; // L: 29 } } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II[II)Ldp;", - garbageValue = "1029980223" + descriptor = "(II[IS)Lde;", + garbageValue = "-29447" ) @Export("getMusicSample0") RawSound getMusicSample0(int var1, int var2, int[] var3) { - int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); - var4 |= var1 << 16; - long var5 = (long)var4 ^ 4294967296L; - RawSound var7 = (RawSound)this.rawSounds.get(var5); - if (var7 != null) { + int var4 = var2 ^ (var1 << 4 & 65535 | var1 >>> 12); // L: 33 + var4 |= var1 << 16; // L: 34 + long var5 = (long)var4 ^ 4294967296L; // L: 35 + RawSound var7 = (RawSound)this.rawSounds.get(var5); // L: 36 + if (var7 != null) { // L: 37 return var7; - } else if (var3 != null && var3[0] <= 0) { + } else if (var3 != null && var3[0] <= 0) { // L: 38 return null; } else { - VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); - if (var8 == null) { - var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); - if (var8 == null) { + VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); // L: 39 + if (var8 == null) { // L: 40 + var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); // L: 41 + if (var8 == null) { // L: 42 return null; } - this.musicSamples.put(var8, var5); + this.musicSamples.put(var8, var5); // L: 43 } - var7 = var8.toRawSound(var3); - if (var7 == null) { + var7 = var8.toRawSound(var3); // L: 45 + if (var7 == null) { // L: 46 return null; } else { - var8.remove(); - this.rawSounds.put(var7, var5); - return var7; + var8.remove(); // L: 47 + this.rawSounds.put(var7, var5); // L: 48 + return var7; // L: 49 } } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I[IB)Ldp;", - garbageValue = "-87" + descriptor = "(I[IB)Lde;", + garbageValue = "-94" ) @Export("getSoundEffect") public RawSound getSoundEffect(int var1, int[] var2) { - if (this.soundEffectIndex.getGroupCount() == 1) { + if (this.soundEffectIndex.getGroupCount() == 1) { // L: 53 return this.getSoundEffect0(0, var1, var2); } else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) { - return this.getSoundEffect0(var1, 0, var2); + return this.getSoundEffect0(var1, 0, var2); // L: 54 } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 55 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I[II)Ldp;", - garbageValue = "2095732620" + descriptor = "(I[II)Lde;", + garbageValue = "-1455606991" ) @Export("getMusicSample") public RawSound getMusicSample(int var1, int[] var2) { - if (this.musicSampleIndex.getGroupCount() == 1) { + if (this.musicSampleIndex.getGroupCount() == 1) { // L: 59 return this.getMusicSample0(0, var1, var2); } else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) { - return this.getMusicSample0(var1, 0, var2); + return this.getMusicSample0(var1, 0, var2); // L: 60 } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 61 } } - @ObfuscatedName("p") + @ObfuscatedName("aq") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "104" + descriptor = "(ILcy;ZB)I", + garbageValue = "115" ) - @Export("clearItemContainer") - static void clearItemContainer(int var0) { - ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var1 != null) { - for (int var2 = 0; var2 < var1.ids.length; ++var2) { - var1.ids[var2] = -1; - var1.quantities[var2] = 0; + static int method2607(int var0, Script var1, boolean var2) { + int var3; + if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { // L: 3153 + Interpreter.Interpreter_intStackSize -= 2; // L: 3154 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3155 + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3156 + if (!Client.isCameraLocked) { // L: 3157 + Client.camAngleX = var3; // L: 3158 + Client.camAngleY = var4; // L: 3159 } - } - } - - @ObfuscatedName("hu") - @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)V", - garbageValue = "-717528882" - ) - static void method2647(int var0, String var1) { - int var2 = Players.Players_count; - int[] var3 = Players.Players_indices; - boolean var4 = false; - Username var5 = new Username(var1, class195.loginType); - - for (int var6 = 0; var6 < var2; ++var6) { - Player var7 = Client.players[var3[var6]]; - if (var7 != null && var7 != class60.localPlayer && var7.username != null && var7.username.equals(var5)) { - PacketBufferNode var8; - if (var0 == 1) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - var8.packetBuffer.writeShort(var3[var6]); - Client.packetWriter.addNode(var8); - } else if (var0 == 4) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3[var6]); - var8.packetBuffer.method5744(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 6) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5752(var3[var6]); - var8.packetBuffer.method5744(0); - Client.packetWriter.addNode(var8); - } else if (var0 == 7) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2337, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeIntME(0); - var8.packetBuffer.method5753(var3[var6]); - Client.packetWriter.addNode(var8); - } - - var4 = true; - break; + return 1; // L: 3161 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { // L: 3163 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX; // L: 3164 + return 1; // L: 3165 + } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { // L: 3167 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY; // L: 3168 + return 1; // L: 3169 + } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { // L: 3171 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3172 + if (var3 < 0) { // L: 3173 + var3 = 0; } - } - if (!var4) { - ObjectSound.addGameMessage(4, "", "Unable to find " + var1); + Client.camFollowHeight = var3; // L: 3174 + return 1; // L: 3175 + } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { // L: 3177 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight; // L: 3178 + return 1; // L: 3179 + } else { + return 2; // L: 3181 } - } } diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index a8c68d309e..3d5de7707e 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -3,132 +3,132 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dr") +@ObfuscatedName("dj") @Implements("SoundEffect") public class SoundEffect { - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "[Ldq;" + descriptor = "[Ldz;" ) @Export("instruments") Instrument[] instruments; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("start") int start; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("end") int end; @ObfuscatedSignature( - descriptor = "(Lkn;)V" + descriptor = "(Lkf;)V" ) SoundEffect(Buffer var1) { - this.instruments = new Instrument[10]; + this.instruments = new Instrument[10]; // L: 10 - for (int var2 = 0; var2 < 10; ++var2) { - int var3 = var1.readUnsignedByte(); - if (var3 != 0) { - --var1.offset; - this.instruments[var2] = new Instrument(); - this.instruments[var2].decode(var1); + for (int var2 = 0; var2 < 10; ++var2) { // L: 21 + int var3 = var1.readUnsignedByte(); // L: 22 + if (var3 != 0) { // L: 23 + --var1.offset; // L: 24 + this.instruments[var2] = new Instrument(); // L: 25 + this.instruments[var2].decode(var1); // L: 26 } } - this.start = var1.readUnsignedShort(); - this.end = var1.readUnsignedShort(); - } + this.start = var1.readUnsignedShort(); // L: 28 + this.end = var1.readUnsignedShort(); // L: 29 + } // L: 30 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Ldp;" + descriptor = "()Lde;" ) @Export("toRawSound") public RawSound toRawSound() { - byte[] var1 = this.mix(); - return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); + byte[] var1 = this.mix(); // L: 33 + return new RawSound(22050, var1, this.start * 22050 / 1000, this.end * 22050 / 1000); // L: 34 } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("calculateDelay") public final int calculateDelay() { - int var1 = 9999999; + int var1 = 9999999; // L: 38 int var2; - for (var2 = 0; var2 < 10; ++var2) { - if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { + for (var2 = 0; var2 < 10; ++var2) { // L: 39 + if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) { // L: 40 41 var1 = this.instruments[var2].offset / 20; } } - if (this.start < this.end && this.start / 20 < var1) { + if (this.start < this.end && this.start / 20 < var1) { // L: 44 var1 = this.start / 20; } - if (var1 != 9999999 && var1 != 0) { - for (var2 = 0; var2 < 10; ++var2) { + if (var1 != 9999999 && var1 != 0) { // L: 45 + for (var2 = 0; var2 < 10; ++var2) { // L: 46 if (this.instruments[var2] != null) { Instrument var10000 = this.instruments[var2]; - var10000.offset -= var1 * 20; + var10000.offset -= var1 * 20; // L: 47 } } - if (this.start < this.end) { - this.start -= var1 * 20; - this.end -= var1 * 20; + if (this.start < this.end) { // L: 49 + this.start -= var1 * 20; // L: 50 + this.end -= var1 * 20; // L: 51 } - return var1; + return var1; // L: 53 } else { return 0; } } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("mix") final byte[] mix() { - int var1 = 0; + int var1 = 0; // L: 57 int var2; - for (var2 = 0; var2 < 10; ++var2) { - if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { + for (var2 = 0; var2 < 10; ++var2) { // L: 58 + if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) { // L: 59 60 var1 = this.instruments[var2].duration + this.instruments[var2].offset; } } - if (var1 == 0) { + if (var1 == 0) { // L: 63 return new byte[0]; } else { - var2 = var1 * 22050 / 1000; - byte[] var3 = new byte[var2]; + var2 = var1 * 22050 / 1000; // L: 64 + byte[] var3 = new byte[var2]; // L: 65 - for (int var4 = 0; var4 < 10; ++var4) { - if (this.instruments[var4] != null) { - int var5 = this.instruments[var4].duration * 22050 / 1000; - int var6 = this.instruments[var4].offset * 22050 / 1000; - int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); + for (int var4 = 0; var4 < 10; ++var4) { // L: 66 + if (this.instruments[var4] != null) { // L: 67 + int var5 = this.instruments[var4].duration * 22050 / 1000; // L: 68 + int var6 = this.instruments[var4].offset * 22050 / 1000; // L: 69 + int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); // L: 70 - for (int var8 = 0; var8 < var5; ++var8) { - int var9 = (var7[var8] >> 8) + var3[var8 + var6]; - if ((var9 + 128 & -256) != 0) { + for (int var8 = 0; var8 < var5; ++var8) { // L: 71 + int var9 = (var7[var8] >> 8) + var3[var8 + var6]; // L: 72 + if ((var9 + 128 & -256) != 0) { // L: 73 var9 = var9 >> 31 ^ 127; } - var3[var8 + var6] = (byte)var9; + var3[var8 + var6] = (byte)var9; // L: 74 } } } - return var3; + return var3; // L: 78 } } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lic;II)Ldr;" + descriptor = "(Lic;II)Ldj;" ) @Export("readSoundEffect") public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) { - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new SoundEffect(new Buffer(var3)); + byte[] var3 = var0.takeFile(var1, var2); // L: 15 + return var3 == null ? null : new SoundEffect(new Buffer(var3)); // L: 16 } } diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java index 92af9335fe..fa6021e5d6 100644 --- a/runescape-client/src/main/java/SoundEnvelope.java +++ b/runescape-client/src/main/java/SoundEnvelope.java @@ -3,109 +3,109 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ds") +@ObfuscatedName("dw") @Implements("SoundEnvelope") public class SoundEnvelope { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("segments") int segments; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("durations") int[] durations; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("phases") int[] phases; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("start") int start; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("end") int end; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("form") int form; - @ObfuscatedName("n") + @ObfuscatedName("w") @Export("ticks") int ticks; - @ObfuscatedName("u") + @ObfuscatedName("g") @Export("phaseIndex") int phaseIndex; - @ObfuscatedName("a") + @ObfuscatedName("m") @Export("step") int step; - @ObfuscatedName("z") + @ObfuscatedName("n") @Export("amplitude") int amplitude; - @ObfuscatedName("w") + @ObfuscatedName("d") @Export("max") int max; SoundEnvelope() { - this.segments = 2; - this.durations = new int[2]; - this.phases = new int[2]; - this.durations[0] = 0; - this.durations[1] = 65535; - this.phases[0] = 0; - this.phases[1] = 65535; - } + this.segments = 2; // L: 21 + this.durations = new int[2]; // L: 22 + this.phases = new int[2]; // L: 23 + this.durations[0] = 0; // L: 24 + this.durations[1] = 65535; // L: 25 + this.phases[0] = 0; // L: 26 + this.phases[1] = 65535; // L: 27 + } // L: 28 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;)V" + descriptor = "(Lkf;)V" ) @Export("decode") final void decode(Buffer var1) { - this.form = var1.readUnsignedByte(); - this.start = var1.readInt(); - this.end = var1.readInt(); - this.decodeSegments(var1); - } + this.form = var1.readUnsignedByte(); // L: 31 + this.start = var1.readInt(); // L: 32 + this.end = var1.readInt(); // L: 33 + this.decodeSegments(var1); // L: 34 + } // L: 35 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;)V" + descriptor = "(Lkf;)V" ) @Export("decodeSegments") final void decodeSegments(Buffer var1) { - this.segments = var1.readUnsignedByte(); - this.durations = new int[this.segments]; - this.phases = new int[this.segments]; + this.segments = var1.readUnsignedByte(); // L: 38 + this.durations = new int[this.segments]; // L: 39 + this.phases = new int[this.segments]; // L: 40 - for (int var2 = 0; var2 < this.segments; ++var2) { - this.durations[var2] = var1.readUnsignedShort(); - this.phases[var2] = var1.readUnsignedShort(); + for (int var2 = 0; var2 < this.segments; ++var2) { // L: 41 + this.durations[var2] = var1.readUnsignedShort(); // L: 42 + this.phases[var2] = var1.readUnsignedShort(); // L: 43 } - } + } // L: 45 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("reset") final void reset() { - this.ticks = 0; - this.phaseIndex = 0; - this.step = 0; - this.amplitude = 0; - this.max = 0; - } + this.ticks = 0; // L: 48 + this.phaseIndex = 0; // L: 49 + this.step = 0; // L: 50 + this.amplitude = 0; // L: 51 + this.max = 0; // L: 52 + } // L: 53 - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("doStep") final int doStep(int var1) { - if (this.max >= this.ticks) { - this.amplitude = this.phases[this.phaseIndex++] << 15; - if (this.phaseIndex >= this.segments) { + if (this.max >= this.ticks) { // L: 56 + this.amplitude = this.phases[this.phaseIndex++] << 15; // L: 57 + if (this.phaseIndex >= this.segments) { // L: 58 this.phaseIndex = this.segments - 1; } - this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1); - if (this.ticks > this.max) { + this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1); // L: 59 + if (this.ticks > this.max) { // L: 60 this.step = ((this.phases[this.phaseIndex] << 15) - this.amplitude) / (this.ticks - this.max); } } - this.amplitude += this.step; - ++this.max; - return this.amplitude - this.step >> 15; + this.amplitude += this.step; // L: 62 + ++this.max; // L: 63 + return this.amplitude - this.step >> 15; // L: 64 } } diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java index 068433b03b..a0f6654ca4 100644 --- a/runescape-client/src/main/java/SoundSystem.java +++ b/runescape-client/src/main/java/SoundSystem.java @@ -3,106 +3,170 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dg") +@ObfuscatedName("dy") @Implements("SoundSystem") public class SoundSystem implements Runnable { - @ObfuscatedName("n") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = 140612879 + intValue = -2042157485 ) - static int field1466; - @ObfuscatedName("hm") + @Export("cacheGamebuild") + static int cacheGamebuild; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[Llz;" - ) - @Export("headIconHintSprites") - static Sprite[] headIconHintSprites; - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "[Ldt;" + descriptor = "[Ldr;" ) @Export("players") volatile PcmPlayer[] players; SoundSystem() { - this.players = new PcmPlayer[2]; - } + this.players = new PcmPlayer[2]; // L: 6 + } // L: 8 public void run() { try { - for (int var1 = 0; var1 < 2; ++var1) { - PcmPlayer var2 = this.players[var1]; - if (var2 != null) { + for (int var1 = 0; var1 < 2; ++var1) { // L: 12 + PcmPlayer var2 = this.players[var1]; // L: 13 + if (var2 != null) { // L: 14 var2.run(); } } - } catch (Exception var4) { - class197.RunException_sendStackTrace((String)null, var4); + } catch (Exception var4) { // L: 17 + Decimator.RunException_sendStackTrace((String)null, var4); // L: 18 } - } + } // L: 20 - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "101" + descriptor = "(II)Ljt;", + garbageValue = "-649379031" ) - @Export("getSceneXForObjectUnderMouse") - public static int getSceneXForObjectUnderMouse(int var0) { - return class279.Entity_unpackSceneX(ViewportMouse.ViewportMouse_entityTags[var0]); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-123" - ) - public static void method2629() { - try { - JagexCache.JagexCache_dat2File.close(); - - for (int var0 = 0; var0 < WorldMapDecoration.idxCount; ++var0) { - JagexCache.JagexCache_idxFiles[var0].close(); + public static FloorOverlayDefinition method2594(int var0) { + FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0); // L: 26 + if (var1 != null) { // L: 27 + return var1; + } else { + byte[] var2 = class1.FloorOverlayDefinition_archive.takeFile(4, var0); // L: 28 + var1 = new FloorOverlayDefinition(); // L: 29 + if (var2 != null) { // L: 30 + var1.decode(new Buffer(var2), var0); } - JagexCache.JagexCache_idx255File.close(); - JagexCache.JagexCache_randomDat.close(); - } catch (Exception var2) { + var1.postDecode(); // L: 31 + FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0); // L: 32 + return var1; // L: 33 } - } - @ObfuscatedName("d") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1398391910" + descriptor = "(Ljava/lang/CharSequence;II[BII)I", + garbageValue = "-2072659501" ) - static int method2630(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - } else { - var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - } + @Export("encodeStringCp1252") + public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { + int var5 = var2 - var1; // L: 122 - if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { - if (Interpreter.field1132 >= 10) { - throw new RuntimeException(); - } else if (var3.onResize == null) { - return 0; + for (int var6 = 0; var6 < var5; ++var6) { // L: 123 + char var7 = var0.charAt(var6 + var1); // L: 124 + if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { // L: 125 + var3[var6 + var4] = (byte)var7; + } else if (var7 == 8364) { // L: 126 + var3[var6 + var4] = -128; + } else if (var7 == 8218) { // L: 127 + var3[var6 + var4] = -126; + } else if (var7 == 402) { // L: 128 + var3[var6 + var4] = -125; + } else if (var7 == 8222) { // L: 129 + var3[var6 + var4] = -124; + } else if (var7 == 8230) { // L: 130 + var3[var6 + var4] = -123; + } else if (var7 == 8224) { // L: 131 + var3[var6 + var4] = -122; + } else if (var7 == 8225) { // L: 132 + var3[var6 + var4] = -121; + } else if (var7 == 710) { + var3[var6 + var4] = -120; // L: 133 + } else if (var7 == 8240) { // L: 134 + var3[var6 + var4] = -119; + } else if (var7 == 352) { // L: 135 + var3[var6 + var4] = -118; + } else if (var7 == 8249) { // L: 136 + var3[var6 + var4] = -117; + } else if (var7 == 338) { // L: 137 + var3[var6 + var4] = -116; + } else if (var7 == 381) { // L: 138 + var3[var6 + var4] = -114; + } else if (var7 == 8216) { // L: 139 + var3[var6 + var4] = -111; + } else if (var7 == 8217) { // L: 140 + var3[var6 + var4] = -110; + } else if (var7 == 8220) { // L: 141 + var3[var6 + var4] = -109; + } else if (var7 == 8221) { // L: 142 + var3[var6 + var4] = -108; + } else if (var7 == 8226) { // L: 143 + var3[var6 + var4] = -107; + } else if (var7 == 8211) { // L: 144 + var3[var6 + var4] = -106; + } else if (var7 == 8212) { // L: 145 + var3[var6 + var4] = -105; + } else if (var7 == 732) { // L: 146 + var3[var6 + var4] = -104; + } else if (var7 == 8482) { // L: 147 + var3[var6 + var4] = -103; + } else if (var7 == 353) { // L: 148 + var3[var6 + var4] = -102; + } else if (var7 == 8250) { // L: 149 + var3[var6 + var4] = -101; + } else if (var7 == 339) { // L: 150 + var3[var6 + var4] = -100; + } else if (var7 == 382) { // L: 151 + var3[var6 + var4] = -98; + } else if (var7 == 376) { // L: 152 + var3[var6 + var4] = -97; } else { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onResize; - var4.field600 = Interpreter.field1132 + 1; - Client.scriptEvents.addFirst(var4); - return 1; + var3[var6 + var4] = 63; // L: 153 } - } else { - return 2; } + + return var5; // L: 155 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)Z", + garbageValue = "-1863289029" + ) + static final boolean method2592(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + int var7 = ViewportMouse.ViewportMouse_y + var6; // L: 176 + if (var7 < var0 && var7 < var1 && var7 < var2) { // L: 177 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_y - var6; // L: 178 + if (var7 > var0 && var7 > var1 && var7 > var2) { + return false; // L: 179 + } else { + var7 = ViewportMouse.ViewportMouse_x + var6; // L: 180 + if (var7 < var3 && var7 < var4 && var7 < var5) { // L: 181 + return false; + } else { + var7 = ViewportMouse.ViewportMouse_x - var6; // L: 182 + return var7 <= var3 || var7 <= var4 || var7 <= var5; // L: 183 + } + } + } + } + + @ObfuscatedName("iy") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "69" + ) + @Export("shouldPrioritizeDrop") + static boolean shouldPrioritizeDrop() { + return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81]; // L: 9639 } } diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java index 6bc7efbd71..a2d01078ae 100644 --- a/runescape-client/src/main/java/SpotAnimationDefinition.java +++ b/runescape-client/src/main/java/SpotAnimationDefinition.java @@ -4,231 +4,274 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ie") +@ObfuscatedName("ih") @Implements("SpotAnimationDefinition") public class SpotAnimationDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("SpotAnimationDefinition_archive") - static AbstractArchive SpotAnimationDefinition_archive; - @ObfuscatedName("q") + public static AbstractArchive SpotAnimationDefinition_archive; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lic;" + ) + @Export("SpotAnimationDefinition_modelArchive") + public static AbstractArchive SpotAnimationDefinition_modelArchive; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lel;" ) @Export("SpotAnimationDefinition_cached") - static EvictingDualNodeHashTable SpotAnimationDefinition_cached; - @ObfuscatedName("j") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cached; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("SpotAnimationDefinition_cachedModels") - static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "[Llh;" - ) - @Export("worldSelectFlagSprites") - static IndexedSprite[] worldSelectFlagSprites; - @ObfuscatedName("p") + public static EvictingDualNodeHashTable SpotAnimationDefinition_cachedModels; + @ObfuscatedName("gs") @ObfuscatedGetter( - intValue = -504794549 + intValue = 668491151 + ) + static int field3261; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -478410851 ) @Export("id") int id; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1613969499 + intValue = -19861827 ) @Export("archive") int archive; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1776408189 + intValue = 393054485 ) @Export("sequence") public int sequence; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("recolorFrom") short[] recolorFrom; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("recolorTo") short[] recolorTo; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("retextureFrom") short[] retextureFrom; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("retextureTo") short[] retextureTo; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1855013499 + intValue = -1945923571 ) @Export("widthScale") int widthScale; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 147674657 + intValue = -1138122677 ) @Export("heightScale") int heightScale; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2103491725 + intValue = 702880483 ) @Export("orientation") int orientation; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 528387753 + intValue = 1865720119 ) @Export("ambient") int ambient; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -324487403 + intValue = -1594131491 ) @Export("contrast") int contrast; static { - SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); - SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); + SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64); // L: 14 + SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30); // L: 15 } SpotAnimationDefinition() { - this.sequence = -1; - this.widthScale = 128; - this.heightScale = 128; - this.orientation = 0; - this.ambient = 0; - this.contrast = 0; - } + this.sequence = -1; // L: 18 + this.widthScale = 128; // L: 23 + this.heightScale = 128; // L: 24 + this.orientation = 0; // L: 25 + this.ambient = 0; // L: 26 + this.contrast = 0; // L: 27 + } // L: 29 - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1363953407" + descriptor = "(Lkf;B)V", + garbageValue = "106" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 44 + if (var2 == 0) { // L: 45 + return; // L: 48 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 46 } } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "-809461171" + descriptor = "(Lkf;II)V", + garbageValue = "1008523619" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { + if (var2 == 1) { // L: 51 this.archive = var1.readUnsignedShort(); - } else if (var2 == 2) { + } else if (var2 == 2) { // L: 52 this.sequence = var1.readUnsignedShort(); - } else if (var2 == 4) { + } else if (var2 == 4) { // L: 53 this.widthScale = var1.readUnsignedShort(); - } else if (var2 == 5) { + } else if (var2 == 5) { // L: 54 this.heightScale = var1.readUnsignedShort(); - } else if (var2 == 6) { + } else if (var2 == 6) { // L: 55 this.orientation = var1.readUnsignedShort(); - } else if (var2 == 7) { + } else if (var2 == 7) { // L: 56 this.ambient = var1.readUnsignedByte(); - } else if (var2 == 8) { + } else if (var2 == 8) { // L: 57 this.contrast = var1.readUnsignedByte(); } else { int var3; int var4; - if (var2 == 40) { - var3 = var1.readUnsignedByte(); - this.recolorFrom = new short[var3]; - this.recolorTo = new short[var3]; + if (var2 == 40) { // L: 58 + var3 = var1.readUnsignedByte(); // L: 59 + this.recolorFrom = new short[var3]; // L: 60 + this.recolorTo = new short[var3]; // L: 61 - for (var4 = 0; var4 < var3; ++var4) { - this.recolorFrom[var4] = (short)var1.readUnsignedShort(); - this.recolorTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 62 + this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 63 + this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 64 } - } else if (var2 == 41) { - var3 = var1.readUnsignedByte(); - this.retextureFrom = new short[var3]; - this.retextureTo = new short[var3]; + } else if (var2 == 41) { // L: 67 + var3 = var1.readUnsignedByte(); // L: 68 + this.retextureFrom = new short[var3]; // L: 69 + this.retextureTo = new short[var3]; // L: 70 - for (var4 = 0; var4 < var3; ++var4) { - this.retextureFrom[var4] = (short)var1.readUnsignedShort(); - this.retextureTo[var4] = (short)var1.readUnsignedShort(); + for (var4 = 0; var4 < var3; ++var4) { // L: 71 + this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 72 + this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 73 } } } - } + } // L: 77 - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IB)Lef;", - garbageValue = "-31" + descriptor = "(II)Ler;", + garbageValue = "-820492992" ) @Export("getModel") public final Model getModel(int var1) { - Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); - if (var2 == null) { - ModelData var3 = ModelData.ModelData_get(NPC.SpotAnimationDefinition_modelArchive, this.archive, 0); - if (var3 == null) { + Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id); // L: 80 + if (var2 == null) { // L: 81 + ModelData var3 = ModelData.ModelData_get(SpotAnimationDefinition_modelArchive, this.archive, 0); // L: 82 + if (var3 == null) { // L: 83 return null; } int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + if (this.recolorFrom != null) { // L: 84 + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 85 + var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 86 } } - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + if (this.retextureFrom != null) { // L: 89 + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 90 + var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 91 } } - var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); - SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); + var2 = var3.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 94 + SpotAnimationDefinition_cachedModels.put(var2, (long)this.id); // L: 95 } Model var5; - if (this.sequence != -1 && var1 != -1) { - var5 = NetSocket.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); + if (this.sequence != -1 && var1 != -1) { // L: 98 + var5 = WorldMapRegion.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1); } else { - var5 = var2.toSharedSpotAnimationModel(true); + var5 = var2.toSharedSpotAnimationModel(true); // L: 99 } - if (this.widthScale != 128 || this.heightScale != 128) { + if (this.widthScale != 128 || this.heightScale != 128) { // L: 100 var5.scale(this.widthScale, this.heightScale, this.widthScale); } - if (this.orientation != 0) { - if (this.orientation == 90) { + if (this.orientation != 0) { // L: 101 + if (this.orientation == 90) { // L: 102 var5.rotateY90Ccw(); } - if (this.orientation == 180) { - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); + if (this.orientation == 180) { // L: 103 + var5.rotateY90Ccw(); // L: 104 + var5.rotateY90Ccw(); // L: 105 } - if (this.orientation == 270) { - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); - var5.rotateY90Ccw(); + if (this.orientation == 270) { // L: 107 + var5.rotateY90Ccw(); // L: 108 + var5.rotateY90Ccw(); // L: 109 + var5.rotateY90Ccw(); // L: 110 } } - return var5; + return var5; // L: 113 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(B)[Lld;", + garbageValue = "-17" + ) + static PrivateChatMode[] method4518() { + return new PrivateChatMode[]{PrivateChatMode.field3823, PrivateChatMode.field3822, PrivateChatMode.field3821}; // L: 11 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "([BIII)Ljava/lang/String;", + garbageValue = "-2117209732" + ) + @Export("decodeStringCp1252") + public static String decodeStringCp1252(byte[] var0, int var1, int var2) { + char[] var3 = new char[var2]; // L: 159 + int var4 = 0; // L: 160 + + for (int var5 = 0; var5 < var2; ++var5) { // L: 161 + int var6 = var0[var5 + var1] & 255; // L: 162 + if (var6 != 0) { // L: 163 + if (var6 >= 128 && var6 < 160) { // L: 164 + char var7 = class297.cp1252AsciiExtension[var6 - 128]; // L: 165 + if (var7 == 0) { // L: 166 + var7 = '?'; + } + + var6 = var7; // L: 167 + } + + var3[var4++] = (char)var6; // L: 169 + } + } + + return new String(var3, 0, var4); // L: 171 } } diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java index c466a1e886..07ed8b2467 100644 --- a/runescape-client/src/main/java/Sprite.java +++ b/runescape-client/src/main/java/Sprite.java @@ -3,899 +3,899 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lz") +@ObfuscatedName("lp") @Implements("Sprite") public final class Sprite extends Rasterizer2D { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("pixels") public int[] pixels; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("subWidth") public int subWidth; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("subHeight") public int subHeight; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("xOffset") public int xOffset; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("yOffset") int yOffset; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("width") public int width; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("height") public int height; public Sprite(int[] var1, int var2, int var3) { - this.pixels = var1; - this.subWidth = this.width = var2; - this.subHeight = this.height = var3; - this.yOffset = 0; - this.xOffset = 0; - } + this.pixels = var1; // L: 26 + this.subWidth = this.width = var2; // L: 27 + this.subHeight = this.height = var3; // L: 28 + this.yOffset = 0; // L: 29 + this.xOffset = 0; // L: 30 + } // L: 31 public Sprite(int var1, int var2) { - this(new int[var2 * var1], var1, var2); - } + this(new int[var2 * var1], var1, var2); // L: 22 + } // L: 23 Sprite() { - } + } // L: 19 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "()Llz;" + descriptor = "()Llp;" ) @Export("mirrorHorizontally") public Sprite mirrorHorizontally() { - Sprite var1 = new Sprite(this.subWidth, this.subHeight); - var1.width = this.width; - var1.height = this.height; - var1.xOffset = this.width - this.subWidth - this.xOffset; - var1.yOffset = this.yOffset; + Sprite var1 = new Sprite(this.subWidth, this.subHeight); // L: 34 + var1.width = this.width; // L: 35 + var1.height = this.height; // L: 36 + var1.xOffset = this.width - this.subWidth - this.xOffset; // L: 37 + var1.yOffset = this.yOffset; // L: 38 - for (int var2 = 0; var2 < this.subHeight; ++var2) { - for (int var3 = 0; var3 < this.subWidth; ++var3) { - var1.pixels[var3 + var2 * this.subWidth] = this.pixels[var2 * this.subWidth + this.subWidth - 1 - var3]; + for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 39 + for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 40 + var1.pixels[var3 + var2 * this.subWidth] = this.pixels[var2 * this.subWidth + this.subWidth - 1 - var3]; // L: 41 } } - return var1; + return var1; // L: 44 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "()Llz;" + descriptor = "()Llp;" ) @Export("copyNormalized") public Sprite copyNormalized() { - Sprite var1 = new Sprite(this.width, this.height); + Sprite var1 = new Sprite(this.width, this.height); // L: 48 - for (int var2 = 0; var2 < this.subHeight; ++var2) { - for (int var3 = 0; var3 < this.subWidth; ++var3) { - var1.pixels[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; + for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 49 + for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 50 + var1.pixels[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; // L: 51 } } - return var1; + return var1; // L: 54 } - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("setRaster") public void setRaster() { - Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); - } + Rasterizer2D.Rasterizer2D_replace(this.pixels, this.subWidth, this.subHeight); // L: 58 + } // L: 59 - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("normalize") public void normalize() { - if (this.subWidth != this.width || this.subHeight != this.height) { - int[] var1 = new int[this.width * this.height]; + if (this.subWidth != this.width || this.subHeight != this.height) { // L: 62 + int[] var1 = new int[this.width * this.height]; // L: 63 - for (int var2 = 0; var2 < this.subHeight; ++var2) { - for (int var3 = 0; var3 < this.subWidth; ++var3) { - var1[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; + for (int var2 = 0; var2 < this.subHeight; ++var2) { // L: 64 + for (int var3 = 0; var3 < this.subWidth; ++var3) { // L: 65 + var1[var3 + (var2 + this.yOffset) * this.width + this.xOffset] = this.pixels[var3 + var2 * this.subWidth]; // L: 66 } } - this.pixels = var1; - this.subWidth = this.width; - this.subHeight = this.height; - this.xOffset = 0; - this.yOffset = 0; + this.pixels = var1; // L: 69 + this.subWidth = this.width; // L: 70 + this.subHeight = this.height; // L: 71 + this.xOffset = 0; // L: 72 + this.yOffset = 0; // L: 73 } - } + } // L: 74 - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("pad") public void pad(int var1) { - if (this.subWidth != this.width || this.subHeight != this.height) { - int var2 = var1; - if (var1 > this.xOffset) { + if (this.subWidth != this.width || this.subHeight != this.height) { // L: 77 + int var2 = var1; // L: 78 + if (var1 > this.xOffset) { // L: 79 var2 = this.xOffset; } - int var3 = var1; - if (var1 + this.xOffset + this.subWidth > this.width) { + int var3 = var1; // L: 80 + if (var1 + this.xOffset + this.subWidth > this.width) { // L: 81 var3 = this.width - this.xOffset - this.subWidth; } - int var4 = var1; - if (var1 > this.yOffset) { + int var4 = var1; // L: 82 + if (var1 > this.yOffset) { // L: 83 var4 = this.yOffset; } - int var5 = var1; - if (var1 + this.yOffset + this.subHeight > this.height) { + int var5 = var1; // L: 84 + if (var1 + this.yOffset + this.subHeight > this.height) { // L: 85 var5 = this.height - this.yOffset - this.subHeight; } - int var6 = var2 + var3 + this.subWidth; - int var7 = var4 + var5 + this.subHeight; - int[] var8 = new int[var6 * var7]; + int var6 = var2 + var3 + this.subWidth; // L: 86 + int var7 = var4 + var5 + this.subHeight; // L: 87 + int[] var8 = new int[var6 * var7]; // L: 88 - for (int var9 = 0; var9 < this.subHeight; ++var9) { - for (int var10 = 0; var10 < this.subWidth; ++var10) { - var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth]; + for (int var9 = 0; var9 < this.subHeight; ++var9) { // L: 89 + for (int var10 = 0; var10 < this.subWidth; ++var10) { // L: 90 + var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth]; // L: 91 } } - this.pixels = var8; - this.subWidth = var6; - this.subHeight = var7; - this.xOffset -= var2; - this.yOffset -= var4; + this.pixels = var8; // L: 94 + this.subWidth = var6; // L: 95 + this.subHeight = var7; // L: 96 + this.xOffset -= var2; // L: 97 + this.yOffset -= var4; // L: 98 } - } + } // L: 99 - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("flipHorizontally") public void flipHorizontally() { - int[] var1 = new int[this.subWidth * this.subHeight]; - int var2 = 0; + int[] var1 = new int[this.subWidth * this.subHeight]; // L: 102 + int var2 = 0; // L: 103 - for (int var3 = 0; var3 < this.subHeight; ++var3) { + for (int var3 = 0; var3 < this.subHeight; ++var3) { // L: 104 for (int var4 = this.subWidth - 1; var4 >= 0; --var4) { - var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; + var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; // L: 105 } } - this.pixels = var1; - this.xOffset = this.width - this.subWidth - this.xOffset; - } + this.pixels = var1; // L: 107 + this.xOffset = this.width - this.subWidth - this.xOffset; // L: 108 + } // L: 109 - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("flipVertically") public void flipVertically() { - int[] var1 = new int[this.subWidth * this.subHeight]; - int var2 = 0; + int[] var1 = new int[this.subWidth * this.subHeight]; // L: 112 + int var2 = 0; // L: 113 - for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { - for (int var4 = 0; var4 < this.subWidth; ++var4) { + for (int var3 = this.subHeight - 1; var3 >= 0; --var3) { // L: 114 + for (int var4 = 0; var4 < this.subWidth; ++var4) { // L: 115 var1[var2++] = this.pixels[var4 + var3 * this.subWidth]; } } - this.pixels = var1; - this.yOffset = this.height - this.subHeight - this.yOffset; - } + this.pixels = var1; // L: 117 + this.yOffset = this.height - this.subHeight - this.yOffset; // L: 118 + } // L: 119 - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("outline") public void outline(int var1) { - int[] var2 = new int[this.subWidth * this.subHeight]; - int var3 = 0; + int[] var2 = new int[this.subWidth * this.subHeight]; // L: 122 + int var3 = 0; // L: 123 - for (int var4 = 0; var4 < this.subHeight; ++var4) { - for (int var5 = 0; var5 < this.subWidth; ++var5) { - int var6 = this.pixels[var3]; - if (var6 == 0) { - if (var5 > 0 && this.pixels[var3 - 1] != 0) { + for (int var4 = 0; var4 < this.subHeight; ++var4) { // L: 124 + for (int var5 = 0; var5 < this.subWidth; ++var5) { // L: 125 + int var6 = this.pixels[var3]; // L: 126 + if (var6 == 0) { // L: 127 + if (var5 > 0 && this.pixels[var3 - 1] != 0) { // L: 128 var6 = var1; - } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { + } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) { // L: 129 var6 = var1; } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) { - var6 = var1; - } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { + var6 = var1; // L: 130 + } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) { // L: 131 var6 = var1; } } - var2[var3++] = var6; + var2[var3++] = var6; // L: 133 } } - this.pixels = var2; - } + this.pixels = var2; // L: 136 + } // L: 137 - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("shadow") public void shadow(int var1) { - for (int var2 = this.subHeight - 1; var2 > 0; --var2) { - int var3 = var2 * this.subWidth; + for (int var2 = this.subHeight - 1; var2 > 0; --var2) { // L: 140 + int var3 = var2 * this.subWidth; // L: 141 - for (int var4 = this.subWidth - 1; var4 > 0; --var4) { + for (int var4 = this.subWidth - 1; var4 > 0; --var4) { // L: 142 if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) { - this.pixels[var4 + var3] = var1; + this.pixels[var4 + var3] = var1; // L: 143 } } } - } + } // L: 146 - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("drawAt") public void drawAt(int var1, int var2) { - var1 += this.xOffset; - var2 += this.yOffset; - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var4 = 0; - int var5 = this.subHeight; - int var6 = this.subWidth; - int var7 = Rasterizer2D.Rasterizer2D_width - var6; - int var8 = 0; + var1 += this.xOffset; // L: 149 + var2 += this.yOffset; // L: 150 + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 151 + int var4 = 0; // L: 152 + int var5 = this.subHeight; // L: 153 + int var6 = this.subWidth; // L: 154 + int var7 = Rasterizer2D.Rasterizer2D_width - var6; // L: 155 + int var8 = 0; // L: 156 int var9; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var5 -= var9; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var4 += var9 * var6; - var3 += var9 * Rasterizer2D.Rasterizer2D_width; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 157 + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 158 + var5 -= var9; // L: 159 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 160 + var4 += var9 * var6; // L: 161 + var3 += var9 * Rasterizer2D.Rasterizer2D_width; // L: 162 } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 164 var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var6 -= var9; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; - var4 += var9; - var3 += var9; - var8 += var9; - var7 += var9; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 165 + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 166 + var6 -= var9; // L: 167 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 168 + var4 += var9; // L: 169 + var3 += var9; // L: 170 + var8 += var9; // L: 171 + var7 += var9; // L: 172 } - if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var6 -= var9; - var8 += var9; - var7 += var9; + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 174 + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 175 + var6 -= var9; // L: 176 + var8 += var9; // L: 177 + var7 += var9; // L: 178 } - if (var6 > 0 && var5 > 0) { - Sprite_draw(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); + if (var6 > 0 && var5 > 0) { // L: 180 + Sprite_draw(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8); // L: 181 } - } + } // L: 182 - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("drawTransBgAt") public void drawTransBgAt(int var1, int var2) { - var1 += this.xOffset; - var2 += this.yOffset; - int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var4 = 0; - int var5 = this.subHeight; - int var6 = this.subWidth; - int var7 = Rasterizer2D.Rasterizer2D_width - var6; - int var8 = 0; + var1 += this.xOffset; // L: 203 + var2 += this.yOffset; // L: 204 + int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 205 + int var4 = 0; // L: 206 + int var5 = this.subHeight; // L: 207 + int var6 = this.subWidth; // L: 208 + int var7 = Rasterizer2D.Rasterizer2D_width - var6; // L: 209 + int var8 = 0; // L: 210 int var9; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var5 -= var9; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var4 += var9 * var6; - var3 += var9 * Rasterizer2D.Rasterizer2D_width; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 211 + var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 212 + var5 -= var9; // L: 213 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 214 + var4 += var9 * var6; // L: 215 + var3 += var9 * Rasterizer2D.Rasterizer2D_width; // L: 216 } - if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 218 var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var6 -= var9; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; - var4 += var9; - var3 += var9; - var8 += var9; - var7 += var9; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 219 + var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 220 + var6 -= var9; // L: 221 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 222 + var4 += var9; // L: 223 + var3 += var9; // L: 224 + var8 += var9; // L: 225 + var7 += var9; // L: 226 } - if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var6 -= var9; - var8 += var9; - var7 += var9; + if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 228 + var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 229 + var6 -= var9; // L: 230 + var8 += var9; // L: 231 + var7 += var9; // L: 232 } - if (var6 > 0 && var5 > 0) { - Sprite_drawTransBg(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); + if (var6 > 0 && var5 > 0) { // L: 234 + Sprite_drawTransBg(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8); // L: 235 } - } + } // L: 236 - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("drawScaledAt") public void drawScaledAt(int var1, int var2, int var3, int var4) { - if (var3 > 0 && var4 > 0) { - int var5 = this.subWidth; - int var6 = this.subHeight; - int var7 = 0; - int var8 = 0; - int var9 = this.width; - int var10 = this.height; - int var11 = (var9 << 16) / var3; - int var12 = (var10 << 16) / var4; + if (var3 > 0 && var4 > 0) { // L: 267 + int var5 = this.subWidth; // L: 268 + int var6 = this.subHeight; // L: 269 + int var7 = 0; // L: 270 + int var8 = 0; // L: 271 + int var9 = this.width; // L: 272 + int var10 = this.height; // L: 273 + int var11 = (var9 << 16) / var3; // L: 274 + int var12 = (var10 << 16) / var4; // L: 275 int var13; - if (this.xOffset > 0) { - var13 = (var11 + (this.xOffset << 16) - 1) / var11; - var1 += var13; - var7 += var13 * var11 - (this.xOffset << 16); + if (this.xOffset > 0) { // L: 276 + var13 = (var11 + (this.xOffset << 16) - 1) / var11; // L: 277 + var1 += var13; // L: 278 + var7 += var13 * var11 - (this.xOffset << 16); // L: 279 } - if (this.yOffset > 0) { - var13 = (var12 + (this.yOffset << 16) - 1) / var12; - var2 += var13; - var8 += var13 * var12 - (this.yOffset << 16); + if (this.yOffset > 0) { // L: 281 + var13 = (var12 + (this.yOffset << 16) - 1) / var12; // L: 282 + var2 += var13; // L: 283 + var8 += var13 * var12 - (this.yOffset << 16); // L: 284 } - if (var5 < var9) { + if (var5 < var9) { // L: 286 var3 = (var11 + ((var5 << 16) - var7) - 1) / var11; } - if (var6 < var10) { + if (var6 < var10) { // L: 287 var4 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_width - var3; - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 288 + int var14 = Rasterizer2D.Rasterizer2D_width - var3; // L: 289 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 290 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var15; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var15; - var13 += var15 * Rasterizer2D.Rasterizer2D_width; - var8 += var12 * var15; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 291 + var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 292 + var4 -= var15; // L: 293 + var13 += var15 * Rasterizer2D.Rasterizer2D_width; // L: 294 + var8 += var12 * var15; // L: 295 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var15; - var14 += var15; + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 297 + var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 298 + var3 -= var15; // L: 299 + var14 += var15; // L: 300 } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var15; - var13 += var15; - var7 += var11 * var15; - var14 += var15; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 302 + var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 303 + var3 -= var15; // L: 304 + var13 += var15; // L: 305 + var7 += var11 * var15; // L: 306 + var14 += var15; // L: 307 } - Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); + Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5); // L: 309 } - } + } // L: 310 - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("drawTransOverlayAt") public void drawTransOverlayAt(int var1, int var2, int var3, int var4) { - if (var3 == 256) { - this.drawTransBgAt(var1, var2); + if (var3 == 256) { // L: 329 + this.drawTransBgAt(var1, var2); // L: 330 } else { - var1 += this.xOffset; - var2 += this.yOffset; - int var5 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var6 = 0; - int var7 = this.subHeight; - int var8 = this.subWidth; - int var9 = Rasterizer2D.Rasterizer2D_width - var8; - int var10 = 0; + var1 += this.xOffset; // L: 333 + var2 += this.yOffset; // L: 334 + int var5 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 335 + int var6 = 0; // L: 336 + int var7 = this.subHeight; // L: 337 + int var8 = this.subWidth; // L: 338 + int var9 = Rasterizer2D.Rasterizer2D_width - var8; // L: 339 + int var10 = 0; // L: 340 int var11; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var7 -= var11; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var6 += var11 * var8; - var5 += var11 * Rasterizer2D.Rasterizer2D_width; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 341 + var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 342 + var7 -= var11; // L: 343 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 344 + var6 += var11 * var8; // L: 345 + var5 += var11 * Rasterizer2D.Rasterizer2D_width; // L: 346 } - if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 348 var7 -= var7 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var8 -= var11; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; - var6 += var11; - var5 += var11; - var10 += var11; - var9 += var11; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 349 + var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 350 + var8 -= var11; // L: 351 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 352 + var6 += var11; // L: 353 + var5 += var11; // L: 354 + var10 += var11; // L: 355 + var9 += var11; // L: 356 } - if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var8 -= var11; - var10 += var11; - var9 += var11; + if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 358 + var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 359 + var8 -= var11; // L: 360 + var10 += var11; // L: 361 + var9 += var11; // L: 362 } - if (var8 > 0 && var7 > 0) { - Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4); + if (var8 > 0 && var7 > 0) { // L: 364 + Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4); // L: 365 } } - } + } // L: 331 366 - @ObfuscatedName("e") + @ObfuscatedName("r") @Export("drawTransAt") public void drawTransAt(int var1, int var2, int var3) { - var1 += this.xOffset; - var2 += this.yOffset; - int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var5 = 0; - int var6 = this.subHeight; - int var7 = this.subWidth; - int var8 = Rasterizer2D.Rasterizer2D_width - var7; - int var9 = 0; + var1 += this.xOffset; // L: 389 + var2 += this.yOffset; // L: 390 + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 391 + int var5 = 0; // L: 392 + int var6 = this.subHeight; // L: 393 + int var7 = this.subWidth; // L: 394 + int var8 = Rasterizer2D.Rasterizer2D_width - var7; // L: 395 + int var9 = 0; // L: 396 int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var6 -= var10; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var5 += var10 * var7; - var4 += var10 * Rasterizer2D.Rasterizer2D_width; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 397 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 398 + var6 -= var10; // L: 399 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 400 + var5 += var10 * var7; // L: 401 + var4 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 402 } - if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 404 var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var7 -= var10; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; - var5 += var10; - var4 += var10; - var9 += var10; - var8 += var10; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 405 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 406 + var7 -= var10; // L: 407 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 408 + var5 += var10; // L: 409 + var4 += var10; // L: 410 + var9 += var10; // L: 411 + var8 += var10; // L: 412 } - if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var7 -= var10; - var9 += var10; - var8 += var10; + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 414 + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 415 + var7 -= var10; // L: 416 + var9 += var10; // L: 417 + var8 += var10; // L: 418 } - if (var7 > 0 && var6 > 0) { - Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); + if (var7 > 0 && var6 > 0) { // L: 420 + Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3); // L: 421 } - } + } // L: 422 - @ObfuscatedName("t") + @ObfuscatedName("p") @Export("drawTransScaledAt") public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) { - if (var3 > 0 && var4 > 0) { - int var6 = this.subWidth; - int var7 = this.subHeight; - int var8 = 0; - int var9 = 0; - int var10 = this.width; - int var11 = this.height; - int var12 = (var10 << 16) / var3; - int var13 = (var11 << 16) / var4; + if (var3 > 0 && var4 > 0) { // L: 441 + int var6 = this.subWidth; // L: 442 + int var7 = this.subHeight; // L: 443 + int var8 = 0; // L: 444 + int var9 = 0; // L: 445 + int var10 = this.width; // L: 446 + int var11 = this.height; // L: 447 + int var12 = (var10 << 16) / var3; // L: 448 + int var13 = (var11 << 16) / var4; // L: 449 int var14; - if (this.xOffset > 0) { - var14 = (var12 + (this.xOffset << 16) - 1) / var12; - var1 += var14; - var8 += var14 * var12 - (this.xOffset << 16); + if (this.xOffset > 0) { // L: 450 + var14 = (var12 + (this.xOffset << 16) - 1) / var12; // L: 451 + var1 += var14; // L: 452 + var8 += var14 * var12 - (this.xOffset << 16); // L: 453 } - if (this.yOffset > 0) { - var14 = (var13 + (this.yOffset << 16) - 1) / var13; - var2 += var14; - var9 += var14 * var13 - (this.yOffset << 16); + if (this.yOffset > 0) { // L: 455 + var14 = (var13 + (this.yOffset << 16) - 1) / var13; // L: 456 + var2 += var14; // L: 457 + var9 += var14 * var13 - (this.yOffset << 16); // L: 458 } - if (var6 < var10) { + if (var6 < var10) { // L: 460 var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if (var7 < var11) { + if (var7 < var11) { // L: 461 var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; } - var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var15 = Rasterizer2D.Rasterizer2D_width - var3; - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 462 + int var15 = Rasterizer2D.Rasterizer2D_width - var3; // L: 463 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 464 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var16; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var16; - var14 += var16 * Rasterizer2D.Rasterizer2D_width; - var9 += var13 * var16; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 465 + var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 466 + var4 -= var16; // L: 467 + var14 += var16 * Rasterizer2D.Rasterizer2D_width; // L: 468 + var9 += var13 * var16; // L: 469 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var16; - var15 += var16; + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 471 + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 472 + var3 -= var16; // L: 473 + var15 += var16; // L: 474 } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var16; - var14 += var16; - var8 += var12 * var16; - var15 += var16; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 476 + var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 477 + var3 -= var16; // L: 478 + var14 += var16; // L: 479 + var8 += var12 * var16; // L: 480 + var15 += var16; // L: 481 } - Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); + Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5); // L: 483 } - } + } // L: 484 - @ObfuscatedName("ah") - public void method6337(int var1, int var2, int var3) { - var1 += this.xOffset; - var2 += this.yOffset; - int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var5 = 0; - int var6 = this.subHeight; - int var7 = this.subWidth; - int var8 = Rasterizer2D.Rasterizer2D_width - var7; - int var9 = 0; + @ObfuscatedName("l") + public void method6260(int var1, int var2, int var3) { + var1 += this.xOffset; // L: 507 + var2 += this.yOffset; // L: 508 + int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 509 + int var5 = 0; // L: 510 + int var6 = this.subHeight; // L: 511 + int var7 = this.subWidth; // L: 512 + int var8 = Rasterizer2D.Rasterizer2D_width - var7; // L: 513 + int var9 = 0; // L: 514 int var10; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var6 -= var10; - var2 = Rasterizer2D.Rasterizer2D_yClipStart; - var5 += var10 * var7; - var4 += var10 * Rasterizer2D.Rasterizer2D_width; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 515 + var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 516 + var6 -= var10; // L: 517 + var2 = Rasterizer2D.Rasterizer2D_yClipStart; // L: 518 + var5 += var10 * var7; // L: 519 + var4 += var10 * Rasterizer2D.Rasterizer2D_width; // L: 520 } - if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 522 var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var7 -= var10; - var1 = Rasterizer2D.Rasterizer2D_xClipStart; - var5 += var10; - var4 += var10; - var9 += var10; - var8 += var10; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 523 + var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 524 + var7 -= var10; // L: 525 + var1 = Rasterizer2D.Rasterizer2D_xClipStart; // L: 526 + var5 += var10; // L: 527 + var4 += var10; // L: 528 + var9 += var10; // L: 529 + var8 += var10; // L: 530 } - if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var7 -= var10; - var9 += var10; - var8 += var10; + if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 532 + var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 533 + var7 -= var10; // L: 534 + var9 += var10; // L: 535 + var8 += var10; // L: 536 } - if (var7 > 0 && var6 > 0) { + if (var7 > 0 && var6 > 0) { // L: 538 if (var3 == 256) { - method6409(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); + method6257(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9); // L: 539 } else { - method6362(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); + method6258(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3); // L: 540 } } - } + } // L: 541 - @ObfuscatedName("ae") - public void method6366(int var1, int var2, int var3, int var4, int var5) { - if (var3 > 0 && var4 > 0) { - int var6 = this.subWidth; - int var7 = this.subHeight; - int var8 = 0; - int var9 = 0; - int var10 = this.width; - int var11 = this.height; - int var12 = (var10 << 16) / var3; - int var13 = (var11 << 16) / var4; + @ObfuscatedName("ag") + public void method6278(int var1, int var2, int var3, int var4, int var5) { + if (var3 > 0 && var4 > 0) { // L: 582 + int var6 = this.subWidth; // L: 583 + int var7 = this.subHeight; // L: 584 + int var8 = 0; // L: 585 + int var9 = 0; // L: 586 + int var10 = this.width; // L: 587 + int var11 = this.height; // L: 588 + int var12 = (var10 << 16) / var3; // L: 589 + int var13 = (var11 << 16) / var4; // L: 590 int var14; - if (this.xOffset > 0) { - var14 = (var12 + (this.xOffset << 16) - 1) / var12; - var1 += var14; - var8 += var14 * var12 - (this.xOffset << 16); + if (this.xOffset > 0) { // L: 591 + var14 = (var12 + (this.xOffset << 16) - 1) / var12; // L: 592 + var1 += var14; // L: 593 + var8 += var14 * var12 - (this.xOffset << 16); // L: 594 } - if (this.yOffset > 0) { - var14 = (var13 + (this.yOffset << 16) - 1) / var13; - var2 += var14; - var9 += var14 * var13 - (this.yOffset << 16); + if (this.yOffset > 0) { // L: 596 + var14 = (var13 + (this.yOffset << 16) - 1) / var13; // L: 597 + var2 += var14; // L: 598 + var9 += var14 * var13 - (this.yOffset << 16); // L: 599 } - if (var6 < var10) { + if (var6 < var10) { // L: 601 var3 = (var12 + ((var6 << 16) - var8) - 1) / var12; } - if (var7 < var11) { + if (var7 < var11) { // L: 602 var4 = (var13 + ((var7 << 16) - var9) - 1) / var13; } - var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; - int var15 = Rasterizer2D.Rasterizer2D_width - var3; - if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { + var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 603 + int var15 = Rasterizer2D.Rasterizer2D_width - var3; // L: 604 + if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 605 var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd; } int var16; - if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { - var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; - var4 -= var16; - var14 += var16 * Rasterizer2D.Rasterizer2D_width; - var9 += var13 * var16; + if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 606 + var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2; // L: 607 + var4 -= var16; // L: 608 + var14 += var16 * Rasterizer2D.Rasterizer2D_width; // L: 609 + var9 += var13 * var16; // L: 610 } - if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { - var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; - var3 -= var16; - var15 += var16; + if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 612 + var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd; // L: 613 + var3 -= var16; // L: 614 + var15 += var16; // L: 615 } - if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { - var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; - var3 -= var16; - var14 += var16; - var8 += var12 * var16; - var15 += var16; + if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 617 + var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1; // L: 618 + var3 -= var16; // L: 619 + var14 += var16; // L: 620 + var8 += var12 * var16; // L: 621 + var15 += var16; // L: 622 } - if (var5 == 256) { - method6364(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); + if (var5 == 256) { // L: 624 + method6289(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6); } else { - method6365(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); + method6261(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5); // L: 625 } } - } + } // L: 626 - @ObfuscatedName("ab") - public void method6408(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { - int var9 = var2 < 0 ? -var2 : 0; - int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; - int var11 = var1 < 0 ? -var1 : 0; + @ObfuscatedName("ap") + public void method6262(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) { + int var9 = var2 < 0 ? -var2 : 0; // L: 675 + int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2; // L: 676 + int var11 = var1 < 0 ? -var1 : 0; // L: 677 int var10000; - if (this.subWidth + var1 <= var5) { + if (this.subWidth + var1 <= var5) { // L: 678 var10000 = this.subWidth; } else { var10000 = var5 - var1; } - int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; - int var14 = var9 + var2; + int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1; // L: 679 + int var14 = var9 + var2; // L: 680 - for (int var15 = var9; var15 < var10; ++var15) { - int var16 = var7[var14]; - int var17 = var8[var14++]; - int var18 = var13; + for (int var15 = var9; var15 < var10; ++var15) { // L: 681 + int var16 = var7[var14]; // L: 682 + int var17 = var8[var14++]; // L: 683 + int var18 = var13; // L: 684 int var19; - if (var1 < var16) { - var19 = var16 - var1; - var18 = var13 + (var19 - var11); + if (var1 < var16) { // L: 686 + var19 = var16 - var1; // L: 687 + var18 = var13 + (var19 - var11); // L: 688 } else { - var19 = var11; + var19 = var11; // L: 690 } int var12; - if (this.subWidth + var1 <= var16 + var17) { + if (this.subWidth + var1 <= var16 + var17) { // L: 691 var12 = this.subWidth; } else { - var12 = var16 + var17 - var1; + var12 = var16 + var17 - var1; // L: 692 } - for (int var20 = var19; var20 < var12; ++var20) { - int var21 = this.pixels[var20 + var15 * this.subWidth]; + for (int var20 = var19; var20 < var12; ++var20) { // L: 693 + int var21 = this.pixels[var20 + var15 * this.subWidth]; // L: 694 if (var21 != 0) { - Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; + Rasterizer2D.Rasterizer2D_pixels[var18++] = var21; // L: 695 } else { - ++var18; + ++var18; // L: 696 } } - var13 += Rasterizer2D.Rasterizer2D_width; + var13 += Rasterizer2D.Rasterizer2D_width; // L: 698 } - } + } // L: 700 - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("drawRotatedMaskedCenteredAround") public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) { try { - int var11 = -var3 / 2; - int var12 = -var4 / 2; - int var13 = (int)(Math.sin((double)var7 / 326.11D) * 65536.0D); - int var14 = (int)(Math.cos((double)var7 / 326.11D) * 65536.0D); - var13 = var13 * var8 >> 8; - var14 = var14 * var8 >> 8; - int var15 = var12 * var13 + var11 * var14 + (var5 << 16); - int var16 = var12 * var14 - var11 * var13 + (var6 << 16); - int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var11 = -var3 / 2; // L: 704 + int var12 = -var4 / 2; // L: 705 + int var13 = (int)(Math.sin((double)var7 / 326.11D) * 65536.0D); // L: 706 + int var14 = (int)(Math.cos((double)var7 / 326.11D) * 65536.0D); // L: 707 + var13 = var13 * var8 >> 8; // L: 708 + var14 = var14 * var8 >> 8; // L: 709 + int var15 = var12 * var13 + var11 * var14 + (var5 << 16); // L: 710 + int var16 = var12 * var14 - var11 * var13 + (var6 << 16); // L: 711 + int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 712 - for (var2 = 0; var2 < var4; ++var2) { - int var18 = var9[var2]; - int var19 = var17 + var18; - int var20 = var15 + var14 * var18; - int var21 = var16 - var13 * var18; + for (var2 = 0; var2 < var4; ++var2) { // L: 713 + int var18 = var9[var2]; // L: 714 + int var19 = var17 + var18; // L: 715 + int var20 = var15 + var14 * var18; // L: 716 + int var21 = var16 - var13 * var18; // L: 717 - for (var1 = -var10[var2]; var1 < 0; ++var1) { - Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)]; - var20 += var14; - var21 -= var13; + for (var1 = -var10[var2]; var1 < 0; ++var1) { // L: 718 + Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)]; // L: 719 + var20 += var14; // L: 720 + var21 -= var13; // L: 721 } - var15 += var13; - var16 += var14; - var17 += Rasterizer2D.Rasterizer2D_width; + var15 += var13; // L: 723 + var16 += var14; // L: 724 + var17 += Rasterizer2D.Rasterizer2D_width; // L: 725 } - } catch (Exception var23) { + } catch (Exception var23) { // L: 728 } - } + } // L: 729 - @ObfuscatedName("ak") - public void method6435(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { + @ObfuscatedName("aa") + public void method6264(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) { try { - int var10 = -var3 / 2; - int var11 = -var4 / 2; - int var12 = (int)(Math.sin(var7) * 65536.0D); - int var13 = (int)(Math.cos(var7) * 65536.0D); - var12 = var12 * var9 >> 8; - var13 = var13 * var9 >> 8; - int var14 = var11 * var12 + var10 * var13 + (var5 << 16); - int var15 = var11 * var13 - var10 * var12 + (var6 << 16); - int var16 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; + int var10 = -var3 / 2; // L: 733 + int var11 = -var4 / 2; // L: 734 + int var12 = (int)(Math.sin(var7) * 65536.0D); // L: 735 + int var13 = (int)(Math.cos(var7) * 65536.0D); // L: 736 + var12 = var12 * var9 >> 8; // L: 737 + var13 = var13 * var9 >> 8; // L: 738 + int var14 = var11 * var12 + var10 * var13 + (var5 << 16); // L: 739 + int var15 = var11 * var13 - var10 * var12 + (var6 << 16); // L: 740 + int var16 = var1 + var2 * Rasterizer2D.Rasterizer2D_width; // L: 741 - for (var2 = 0; var2 < var4; ++var2) { - int var17 = var16; - int var18 = var14; - int var19 = var15; + for (var2 = 0; var2 < var4; ++var2) { // L: 742 + int var17 = var16; // L: 743 + int var18 = var14; // L: 744 + int var19 = var15; // L: 745 - for (var1 = -var3; var1 < 0; ++var1) { - int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)]; - if (var20 != 0) { + for (var1 = -var3; var1 < 0; ++var1) { // L: 746 + int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)]; // L: 747 + if (var20 != 0) { // L: 748 Rasterizer2D.Rasterizer2D_pixels[var17++] = var20; } else { - ++var17; + ++var17; // L: 749 } - var18 += var13; - var19 -= var12; + var18 += var13; // L: 750 + var19 -= var12; // L: 751 } - var14 += var12; - var15 += var13; - var16 += Rasterizer2D.Rasterizer2D_width; + var14 += var12; // L: 753 + var15 += var13; // L: 754 + var16 += Rasterizer2D.Rasterizer2D_width; // L: 755 } - } catch (Exception var22) { + } catch (Exception var22) { // L: 758 } - } + } // L: 759 - @ObfuscatedName("ad") - public void method6369(int var1, int var2, int var3, int var4) { - this.method6370(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); - } + @ObfuscatedName("ar") + public void method6296(int var1, int var2, int var3, int var4) { + this.method6266(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4); // L: 762 + } // L: 763 - @ObfuscatedName("as") - void method6370(int var1, int var2, int var3, int var4, int var5, int var6) { - if (var6 != 0) { - var1 -= this.xOffset << 4; - var2 -= this.yOffset << 4; - double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; - int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); - int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); - int var11 = var10 * -var1 + -var2 * var9; - int var12 = -var2 * var10 + var9 * -(-var1); - int var13 = var10 * ((this.subWidth << 4) - var1) + -var2 * var9; - int var14 = var9 * -((this.subWidth << 4) - var1) + -var2 * var10; - int var15 = ((this.subHeight << 4) - var2) * var9 + var10 * -var1; - int var16 = ((this.subHeight << 4) - var2) * var10 + var9 * -(-var1); - int var17 = ((this.subHeight << 4) - var2) * var9 + var10 * ((this.subWidth << 4) - var1); - int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); + @ObfuscatedName("at") + void method6266(int var1, int var2, int var3, int var4, int var5, int var6) { + if (var6 != 0) { // L: 766 + var1 -= this.xOffset << 4; // L: 767 + var2 -= this.yOffset << 4; // L: 768 + double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D; // L: 769 + int var9 = (int)Math.floor(Math.sin(var7) * (double)var6 + 0.5D); // L: 770 + int var10 = (int)Math.floor(Math.cos(var7) * (double)var6 + 0.5D); // L: 771 + int var11 = var10 * -var1 + -var2 * var9; // L: 772 + int var12 = -var2 * var10 + var9 * -(-var1); // L: 773 + int var13 = var10 * ((this.subWidth << 4) - var1) + -var2 * var9; // L: 774 + int var14 = var9 * -((this.subWidth << 4) - var1) + -var2 * var10; // L: 775 + int var15 = ((this.subHeight << 4) - var2) * var9 + var10 * -var1; // L: 776 + int var16 = ((this.subHeight << 4) - var2) * var10 + var9 * -(-var1); // L: 777 + int var17 = ((this.subHeight << 4) - var2) * var9 + var10 * ((this.subWidth << 4) - var1); // L: 778 + int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1); // L: 779 int var19; int var20; - if (var11 < var13) { - var19 = var11; - var20 = var13; + if (var11 < var13) { // L: 782 + var19 = var11; // L: 783 + var20 = var13; // L: 784 } else { - var19 = var13; - var20 = var11; + var19 = var13; // L: 787 + var20 = var11; // L: 788 } - if (var15 < var19) { + if (var15 < var19) { // L: 790 var19 = var15; } - if (var17 < var19) { + if (var17 < var19) { // L: 791 var19 = var17; } - if (var15 > var20) { + if (var15 > var20) { // L: 792 var20 = var15; } - if (var17 > var20) { + if (var17 > var20) { // L: 793 var20 = var17; } int var21; int var22; - if (var12 < var14) { - var21 = var12; - var22 = var14; + if (var12 < var14) { // L: 796 + var21 = var12; // L: 797 + var22 = var14; // L: 798 } else { - var21 = var14; - var22 = var12; + var21 = var14; // L: 801 + var22 = var12; // L: 802 } - if (var16 < var21) { + if (var16 < var21) { // L: 804 var21 = var16; } - if (var18 < var21) { + if (var18 < var21) { // L: 805 var21 = var18; } - if (var16 > var22) { + if (var16 > var22) { // L: 806 var22 = var16; } - if (var18 > var22) { + if (var18 > var22) { // L: 807 var22 = var18; } - var19 >>= 12; - var20 = var20 + 4095 >> 12; - var21 >>= 12; - var22 = var22 + 4095 >> 12; - var19 += var3; - var20 += var3; - var21 += var4; - var22 += var4; - var19 >>= 4; - var20 = var20 + 15 >> 4; - var21 >>= 4; - var22 = var22 + 15 >> 4; - if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { + var19 >>= 12; // L: 808 + var20 = var20 + 4095 >> 12; // L: 809 + var21 >>= 12; // L: 810 + var22 = var22 + 4095 >> 12; // L: 811 + var19 += var3; // L: 812 + var20 += var3; // L: 813 + var21 += var4; // L: 814 + var22 += var4; // L: 815 + var19 >>= 4; // L: 816 + var20 = var20 + 15 >> 4; // L: 817 + var21 >>= 4; // L: 818 + var22 = var22 + 15 >> 4; // L: 819 + if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 820 var19 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 821 var20 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 822 var21 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 823 var22 = Rasterizer2D.Rasterizer2D_yClipEnd; } - var20 = var19 - var20; - if (var20 < 0) { - var22 = var21 - var22; - if (var22 < 0) { - int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; - double var24 = 1.6777216E7D / (double)var6; - int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); - int var27 = (int)Math.floor(Math.cos(var7) * var24 + 0.5D); - int var28 = (var19 << 4) + 8 - var3; - int var29 = (var21 << 4) + 8 - var4; - int var30 = (var1 << 8) - (var29 * var26 >> 4); - int var31 = (var29 * var27 >> 4) + (var2 << 8); + var20 = var19 - var20; // L: 824 + if (var20 < 0) { // L: 825 + var22 = var21 - var22; // L: 826 + if (var22 < 0) { // L: 827 + int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width; // L: 828 + double var24 = 1.6777216E7D / (double)var6; // L: 829 + int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D); // L: 830 + int var27 = (int)Math.floor(Math.cos(var7) * var24 + 0.5D); // L: 831 + int var28 = (var19 << 4) + 8 - var3; // L: 832 + int var29 = (var21 << 4) + 8 - var4; // L: 833 + int var30 = (var1 << 8) - (var29 * var26 >> 4); // L: 834 + int var31 = (var29 * var27 >> 4) + (var2 << 8); // L: 835 int var32; int var33; int var34; @@ -903,350 +903,350 @@ public final class Sprite extends Rasterizer2D { int var36; int var37; int var38; - if (var27 == 0) { - if (var26 == 0) { + if (var27 == 0) { // L: 837 + if (var26 == 0) { // L: 838 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = var30; - var36 = var31; - var37 = var20; - if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { - for (; var37 < 0; ++var37) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var34 = var23; // L: 840 + var35 = var30; // L: 841 + var36 = var31; // L: 842 + var37 = var20; // L: 843 + if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) { // L: 844 845 846 847 + for (; var37 < 0; ++var37) { // L: 848 + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 849 + if (var38 != 0) { // L: 850 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 851 } } } - ++var33; + ++var33; // L: 839 } - } else if (var26 < 0) { + } else if (var26 < 0) { // L: 855 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { - var32 = (var26 - var32) / var26; - var37 = var20 + var32; - var36 += var26 * var32; - var34 = var23 + var32; + var34 = var23; // L: 857 + var35 = var30; // L: 858 + var36 = (var28 * var26 >> 4) + var31; // L: 859 + var37 = var20; // L: 860 + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { // L: 861 862 + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { // L: 863 + var32 = (var26 - var32) / var26; // L: 864 + var37 = var20 + var32; // L: 865 + var36 += var26 * var32; // L: 866 + var34 = var23 + var32; // L: 867 } - if ((var32 = (var36 - var26) / var26) > var37) { + if ((var32 = (var36 - var26) / var26) > var37) { // L: 869 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 871 + if (var38 != 0) { // L: 872 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 873 } - var36 += var26; - ++var37; + var36 += var26; // L: 874 + ++var37; // L: 870 } } - ++var33; + ++var33; // L: 856 var30 -= var26; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { - if (var36 < 0) { - var32 = (var26 - 1 - var36) / var26; - var37 = var20 + var32; - var36 += var26 * var32; - var34 = var23 + var32; + var34 = var23; // L: 880 + var35 = var30; // L: 881 + var36 = (var28 * var26 >> 4) + var31; // L: 882 + var37 = var20; // L: 883 + if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) { // L: 884 885 + if (var36 < 0) { // L: 886 + var32 = (var26 - 1 - var36) / var26; // L: 887 + var37 = var20 + var32; // L: 888 + var36 += var26 * var32; // L: 889 + var34 = var23 + var32; // L: 890 } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 892 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 894 + if (var38 != 0) { // L: 895 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 896 } - var36 += var26; - ++var37; + var36 += var26; // L: 897 + ++var37; // L: 893 } } - ++var33; + ++var33; // L: 879 var30 -= var26; } } - } else if (var27 < 0) { - if (var26 == 0) { + } else if (var27 < 0) { // L: 902 + if (var26 == 0) { // L: 903 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = var31; - var37 = var20; - if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { - var32 = (var27 - var32) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var34 = var23 + var32; + var34 = var23; // L: 905 + var35 = (var28 * var27 >> 4) + var30; // L: 906 + var36 = var31; // L: 907 + var37 = var20; // L: 908 + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { // L: 909 910 + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { // L: 911 + var32 = (var27 - var32) / var27; // L: 912 + var37 = var20 + var32; // L: 913 + var35 += var27 * var32; // L: 914 + var34 = var23 + var32; // L: 915 } - if ((var32 = (var35 - var27) / var27) > var37) { + if ((var32 = (var35 - var27) / var27) > var37) { // L: 917 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 919 + if (var38 != 0) { // L: 920 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 921 } - var35 += var27; - ++var37; + var35 += var27; // L: 922 + ++var37; // L: 918 } } - ++var33; + ++var33; // L: 904 var31 += var27; } - } else if (var26 < 0) { + } else if (var26 < 0) { // L: 926 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { - var32 = (var27 - var32) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; + var34 = var23; // L: 928 + var35 = (var28 * var27 >> 4) + var30; // L: 929 + var36 = (var28 * var26 >> 4) + var31; // L: 930 + var37 = var20; // L: 931 + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { // L: 932 + var32 = (var27 - var32) / var27; // L: 933 + var37 = var20 + var32; // L: 934 + var35 += var27 * var32; // L: 935 + var36 += var26 * var32; // L: 936 + var34 = var23 + var32; // L: 937 } - if ((var32 = (var35 - var27) / var27) > var37) { + if ((var32 = (var35 - var27) / var27) > var37) { // L: 939 var37 = var32; } - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { - var32 = (var26 - var32) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { // L: 940 + var32 = (var26 - var32) / var26; // L: 941 + var37 += var32; // L: 942 + var35 += var27 * var32; // L: 943 + var36 += var26 * var32; // L: 944 + var34 += var32; // L: 945 } - if ((var32 = (var36 - var26) / var26) > var37) { + if ((var32 = (var36 - var26) / var26) > var37) { // L: 947 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 949 + if (var38 != 0) { // L: 950 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 951 } - var35 += var27; - var36 += var26; - ++var37; + var35 += var27; // L: 952 + var36 += var26; // L: 953 + ++var37; // L: 948 } - ++var33; + ++var33; // L: 927 var30 -= var26; var31 += var27; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if ((var32 = var35 - (this.subWidth << 12)) >= 0) { - var32 = (var27 - var32) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; + var34 = var23; // L: 959 + var35 = (var28 * var27 >> 4) + var30; // L: 960 + var36 = (var28 * var26 >> 4) + var31; // L: 961 + var37 = var20; // L: 962 + if ((var32 = var35 - (this.subWidth << 12)) >= 0) { // L: 963 + var32 = (var27 - var32) / var27; // L: 964 + var37 = var20 + var32; // L: 965 + var35 += var27 * var32; // L: 966 + var36 += var26 * var32; // L: 967 + var34 = var23 + var32; // L: 968 } - if ((var32 = (var35 - var27) / var27) > var37) { + if ((var32 = (var35 - var27) / var27) > var37) { // L: 970 var37 = var32; } - if (var36 < 0) { - var32 = (var26 - 1 - var36) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; + if (var36 < 0) { // L: 971 + var32 = (var26 - 1 - var36) / var26; // L: 972 + var37 += var32; // L: 973 + var35 += var27 * var32; // L: 974 + var36 += var26 * var32; // L: 975 + var34 += var32; // L: 976 } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 978 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 980 + if (var38 != 0) { // L: 981 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 982 } - var35 += var27; - var36 += var26; - ++var37; + var35 += var27; // L: 983 + var36 += var26; // L: 984 + ++var37; // L: 979 } - ++var33; + ++var33; // L: 958 var30 -= var26; var31 += var27; } } - } else if (var26 == 0) { + } else if (var26 == 0) { // L: 990 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = var31; - var37 = var20; - if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { - if (var35 < 0) { - var32 = (var27 - 1 - var35) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var34 = var23 + var32; + var34 = var23; // L: 992 + var35 = (var28 * var27 >> 4) + var30; // L: 993 + var36 = var31; // L: 994 + var37 = var20; // L: 995 + if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) { // L: 996 997 + if (var35 < 0) { // L: 998 + var32 = (var27 - 1 - var35) / var27; // L: 999 + var37 = var20 + var32; // L: 1000 + var35 += var27 * var32; // L: 1001 + var34 = var23 + var32; // L: 1002 } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1004 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1006 + if (var38 != 0) { // L: 1007 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 1008 } - var35 += var27; - ++var37; + var35 += var27; // L: 1009 + ++var37; // L: 1005 } } - ++var33; + ++var33; // L: 991 var31 += var27; } - } else if (var26 < 0) { + } else if (var26 < 0) { // L: 1013 for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var35 < 0) { - var32 = (var27 - 1 - var35) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; + var34 = var23; // L: 1015 + var35 = (var28 * var27 >> 4) + var30; // L: 1016 + var36 = (var28 * var26 >> 4) + var31; // L: 1017 + var37 = var20; // L: 1018 + if (var35 < 0) { // L: 1019 + var32 = (var27 - 1 - var35) / var27; // L: 1020 + var37 = var20 + var32; // L: 1021 + var35 += var27 * var32; // L: 1022 + var36 += var26 * var32; // L: 1023 + var34 = var23 + var32; // L: 1024 } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1026 var37 = var32; } - if ((var32 = var36 - (this.subHeight << 12)) >= 0) { - var32 = (var26 - var32) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; + if ((var32 = var36 - (this.subHeight << 12)) >= 0) { // L: 1027 + var32 = (var26 - var32) / var26; // L: 1028 + var37 += var32; // L: 1029 + var35 += var27 * var32; // L: 1030 + var36 += var26 * var32; // L: 1031 + var34 += var32; // L: 1032 } - if ((var32 = (var36 - var26) / var26) > var37) { + if ((var32 = (var36 - var26) / var26) > var37) { // L: 1034 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1036 + if (var38 != 0) { // L: 1037 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 1038 } - var35 += var27; - var36 += var26; - ++var37; + var35 += var27; // L: 1039 + var36 += var26; // L: 1040 + ++var37; // L: 1035 } - ++var33; + ++var33; // L: 1014 var30 -= var26; var31 += var27; } } else { for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) { - var34 = var23; - var35 = (var28 * var27 >> 4) + var30; - var36 = (var28 * var26 >> 4) + var31; - var37 = var20; - if (var35 < 0) { - var32 = (var27 - 1 - var35) / var27; - var37 = var20 + var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 = var23 + var32; + var34 = var23; // L: 1046 + var35 = (var28 * var27 >> 4) + var30; // L: 1047 + var36 = (var28 * var26 >> 4) + var31; // L: 1048 + var37 = var20; // L: 1049 + if (var35 < 0) { // L: 1050 + var32 = (var27 - 1 - var35) / var27; // L: 1051 + var37 = var20 + var32; // L: 1052 + var35 += var27 * var32; // L: 1053 + var36 += var26 * var32; // L: 1054 + var34 = var23 + var32; // L: 1055 } - if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { + if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) { // L: 1057 var37 = var32; } - if (var36 < 0) { - var32 = (var26 - 1 - var36) / var26; - var37 += var32; - var35 += var27 * var32; - var36 += var26 * var32; - var34 += var32; + if (var36 < 0) { // L: 1058 + var32 = (var26 - 1 - var36) / var26; // L: 1059 + var37 += var32; // L: 1060 + var35 += var27 * var32; // L: 1061 + var36 += var26 * var32; // L: 1062 + var34 += var32; // L: 1063 } - if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { + if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) { // L: 1065 var37 = var32; } while (var37 < 0) { - var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; - if (var38 != 0) { + var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth]; // L: 1067 + if (var38 != 0) { // L: 1068 Rasterizer2D.Rasterizer2D_pixels[var34++] = var38; } else { - ++var34; + ++var34; // L: 1069 } - var35 += var27; - var36 += var26; - ++var37; + var35 += var27; // L: 1070 + var36 += var26; // L: 1071 + ++var37; // L: 1066 } - ++var33; + ++var33; // L: 1045 var30 -= var26; var31 += var27; } @@ -1255,405 +1255,405 @@ public final class Sprite extends Rasterizer2D { } } } - } + } // L: 1076 - @ObfuscatedName("ar") + @ObfuscatedName("aq") @Export("drawScaledWorldmap") public void drawScaledWorldmap(int var1, int var2, int var3, int var4) { - if (var3 <= this.width && var4 <= this.height) { - int var5 = var3 * this.xOffset / this.width + var1; - int var6 = (var3 * (this.xOffset + this.subWidth) + this.width - 1) / this.width + var1; - int var7 = var2 + var4 * this.yOffset / this.height; - int var8 = var2 + (this.height + (this.yOffset + this.subHeight) * var4 - 1) / this.height; - if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { + if (var3 <= this.width && var4 <= this.height) { // L: 1079 + int var5 = var3 * this.xOffset / this.width + var1; // L: 1082 + int var6 = (var3 * (this.xOffset + this.subWidth) + this.width - 1) / this.width + var1; // L: 1083 + int var7 = var2 + var4 * this.yOffset / this.height; // L: 1084 + int var8 = var2 + (this.height + (this.yOffset + this.subHeight) * var4 - 1) / this.height; // L: 1085 + if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) { // L: 1086 var5 = Rasterizer2D.Rasterizer2D_xClipStart; } - if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { + if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) { // L: 1087 var6 = Rasterizer2D.Rasterizer2D_xClipEnd; } - if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { + if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) { // L: 1088 var7 = Rasterizer2D.Rasterizer2D_yClipStart; } - if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { + if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) { // L: 1089 var8 = Rasterizer2D.Rasterizer2D_yClipEnd; } - if (var5 < var6 && var7 < var8) { - int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; - int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); - if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) { - for (int var11 = var7; var11 < var8; ++var11) { - for (int var12 = var5; var12 < var6; ++var12) { - int var13 = var12 - var1 << 4; - int var14 = var11 - var2 << 4; - int var15 = var13 * this.width / var3 - (this.xOffset << 4); - int var16 = (var13 + 16) * this.width / var3 - (this.xOffset << 4); - int var17 = var14 * this.height / var4 - (this.yOffset << 4); - int var18 = (var14 + 16) * this.height / var4 - (this.yOffset << 4); - int var19 = (var16 - var15) * (var18 - var17) >> 1; - if (var19 != 0) { - if (var15 < 0) { + if (var5 < var6 && var7 < var8) { // L: 1090 + int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width; // L: 1091 + int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5); // L: 1092 + if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) { // L: 1093 + for (int var11 = var7; var11 < var8; ++var11) { // L: 1096 + for (int var12 = var5; var12 < var6; ++var12) { // L: 1097 + int var13 = var12 - var1 << 4; // L: 1098 + int var14 = var11 - var2 << 4; // L: 1099 + int var15 = var13 * this.width / var3 - (this.xOffset << 4); // L: 1100 + int var16 = (var13 + 16) * this.width / var3 - (this.xOffset << 4); // L: 1101 + int var17 = var14 * this.height / var4 - (this.yOffset << 4); // L: 1102 + int var18 = (var14 + 16) * this.height / var4 - (this.yOffset << 4); // L: 1103 + int var19 = (var16 - var15) * (var18 - var17) >> 1; // L: 1104 + if (var19 != 0) { // L: 1105 + if (var15 < 0) { // L: 1106 var15 = 0; } - if (var16 >= this.subWidth << 4) { + if (var16 >= this.subWidth << 4) { // L: 1107 var16 = this.subWidth << 4; } - if (var17 < 0) { + if (var17 < 0) { // L: 1108 var17 = 0; } - if (var18 >= this.subHeight << 4) { + if (var18 >= this.subHeight << 4) { // L: 1109 var18 = this.subHeight << 4; } - --var16; - --var18; - int var20 = 16 - (var15 & 15); - int var21 = (var16 & 15) + 1; - int var22 = 16 - (var17 & 15); - int var23 = (var18 & 15) + 1; - var15 >>= 4; - var16 >>= 4; - var17 >>= 4; - var18 >>= 4; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; + --var16; // L: 1110 + --var18; // L: 1111 + int var20 = 16 - (var15 & 15); // L: 1112 + int var21 = (var16 & 15) + 1; // L: 1113 + int var22 = 16 - (var17 & 15); // L: 1114 + int var23 = (var18 & 15) + 1; // L: 1115 + var15 >>= 4; // L: 1116 + var16 >>= 4; // L: 1117 + var17 >>= 4; // L: 1118 + var18 >>= 4; // L: 1119 + int var24 = 0; // L: 1120 + int var25 = 0; // L: 1121 + int var26 = 0; // L: 1122 + int var27 = 0; // L: 1123 int var28; - for (var28 = var17; var28 <= var18; ++var28) { - int var29 = 16; - if (var28 == var17) { + for (var28 = var17; var28 <= var18; ++var28) { // L: 1124 + int var29 = 16; // L: 1125 + if (var28 == var17) { // L: 1126 var29 = var22; } - if (var28 == var18) { + if (var28 == var18) { // L: 1127 var29 = var23; } - for (int var30 = var15; var30 <= var16; ++var30) { - int var31 = this.pixels[var30 + var28 * this.subWidth]; - if (var31 != 0) { + for (int var30 = var15; var30 <= var16; ++var30) { // L: 1128 + int var31 = this.pixels[var30 + var28 * this.subWidth]; // L: 1129 + if (var31 != 0) { // L: 1130 int var32; - if (var30 == var15) { + if (var30 == var15) { // L: 1132 var32 = var29 * var20; - } else if (var30 == var16) { + } else if (var30 == var16) { // L: 1133 var32 = var29 * var21; } else { - var32 = var29 << 4; + var32 = var29 << 4; // L: 1134 } - var27 += var32; - var24 += var32 * (var31 >> 16 & 255); - var25 += var32 * (var31 >> 8 & 255); - var26 += (var31 & 255) * var32; + var27 += var32; // L: 1135 + var24 += var32 * (var31 >> 16 & 255); // L: 1136 + var25 += var32 * (var31 >> 8 & 255); // L: 1137 + var26 += (var31 & 255) * var32; // L: 1138 } } } - if (var27 >= var19) { - var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); - if (var28 == 0) { + if (var27 >= var19) { // L: 1142 + var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8); // L: 1143 + if (var28 == 0) { // L: 1144 var28 = 1; } - Rasterizer2D.Rasterizer2D_pixels[var9] = var28; + Rasterizer2D.Rasterizer2D_pixels[var9] = var28; // L: 1145 } - ++var9; + ++var9; // L: 1147 } } - var9 += var10; + var9 += var10; // L: 1149 } } } } else { - throw new IllegalArgumentException(); + throw new IllegalArgumentException(); // L: 1080 } - } + } // L: 1094 1151 - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("Sprite_draw") static void Sprite_draw(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = -var5; var8 < 0; ++var8) { + for (int var8 = -var5; var8 < 0; ++var8) { // L: 185 int var9; - for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) { - var0[var3++] = var1[var2++]; - var0[var3++] = var1[var2++]; - var0[var3++] = var1[var2++]; + for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 186 187 191 + var0[var3++] = var1[var2++]; // L: 188 + var0[var3++] = var1[var2++]; // L: 189 + var0[var3++] = var1[var2++]; // L: 190 } - for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { + for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) { // L: 193 194 195 } - var3 += var6; - var2 += var7; + var3 += var6; // L: 197 + var2 += var7; // L: 198 } - } + } // L: 200 - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("Sprite_drawTransBg") static void Sprite_drawTransBg(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int var9 = -(var5 >> 2); - var5 = -(var5 & 3); + int var9 = -(var5 >> 2); // L: 239 + var5 = -(var5 & 3); // L: 240 - for (int var10 = -var6; var10 < 0; ++var10) { + for (int var10 = -var6; var10 < 0; ++var10) { // L: 241 int var11; - for (var11 = var9; var11 < 0; ++var11) { - var2 = var1[var3++]; - if (var2 != 0) { + for (var11 = var9; var11 < 0; ++var11) { // L: 242 + var2 = var1[var3++]; // L: 243 + if (var2 != 0) { // L: 244 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 245 } - var2 = var1[var3++]; - if (var2 != 0) { + var2 = var1[var3++]; // L: 246 + if (var2 != 0) { // L: 247 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 248 } - var2 = var1[var3++]; - if (var2 != 0) { + var2 = var1[var3++]; // L: 249 + if (var2 != 0) { // L: 250 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 251 } - var2 = var1[var3++]; - if (var2 != 0) { + var2 = var1[var3++]; // L: 252 + if (var2 != 0) { // L: 253 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 254 } } - for (var11 = var5; var11 < 0; ++var11) { - var2 = var1[var3++]; - if (var2 != 0) { + for (var11 = var5; var11 < 0; ++var11) { // L: 256 + var2 = var1[var3++]; // L: 257 + if (var2 != 0) { // L: 258 var0[var4++] = var2; } else { - ++var4; + ++var4; // L: 259 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 261 + var3 += var8; // L: 262 } - } + } // L: 264 - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("Sprite_drawScaled") static void Sprite_drawScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11) { - int var12 = var3; + int var12 = var3; // L: 313 - for (int var13 = -var8; var13 < 0; ++var13) { - int var14 = var11 * (var4 >> 16); + for (int var13 = -var8; var13 < 0; ++var13) { // L: 314 + int var14 = var11 * (var4 >> 16); // L: 315 - for (int var15 = -var7; var15 < 0; ++var15) { - var2 = var1[(var3 >> 16) + var14]; - if (var2 != 0) { + for (int var15 = -var7; var15 < 0; ++var15) { // L: 316 + var2 = var1[(var3 >> 16) + var14]; // L: 317 + if (var2 != 0) { // L: 318 var0[var5++] = var2; } else { - ++var5; + ++var5; // L: 319 } - var3 += var9; + var3 += var9; // L: 320 } - var4 += var10; - var3 = var12; - var5 += var6; + var4 += var10; // L: 322 + var3 = var12; // L: 323 + var5 += var6; // L: 324 } - } + } // L: 326 - @ObfuscatedName("d") + @ObfuscatedName("j") @Export("Sprite_drawTransOverlay") static void Sprite_drawTransOverlay(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - int var11 = 256 - var9; - int var12 = (var10 & 16711935) * var11 & -16711936; - int var13 = (var10 & 65280) * var11 & 16711680; - var10 = (var12 | var13) >>> 8; + int var11 = 256 - var9; // L: 369 + int var12 = (var10 & 16711935) * var11 & -16711936; // L: 370 + int var13 = (var10 & 65280) * var11 & 16711680; // L: 371 + var10 = (var12 | var13) >>> 8; // L: 372 - for (int var14 = -var6; var14 < 0; ++var14) { - for (int var15 = -var5; var15 < 0; ++var15) { - var2 = var1[var3++]; - if (var2 != 0) { - var12 = var9 * (var2 & 16711935) & -16711936; - var13 = (var2 & 65280) * var9 & 16711680; - var0[var4++] = var10 + ((var12 | var13) >>> 8); + for (int var14 = -var6; var14 < 0; ++var14) { // L: 373 + for (int var15 = -var5; var15 < 0; ++var15) { // L: 374 + var2 = var1[var3++]; // L: 375 + if (var2 != 0) { // L: 376 + var12 = var9 * (var2 & 16711935) & -16711936; // L: 377 + var13 = (var2 & 65280) * var9 & 16711680; // L: 378 + var0[var4++] = var10 + ((var12 | var13) >>> 8); // L: 379 } else { - ++var4; + ++var4; // L: 381 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 383 + var3 += var8; // L: 384 } - } + } // L: 386 - @ObfuscatedName("l") + @ObfuscatedName("u") @Export("Sprite_drawTransparent") static void Sprite_drawTransparent(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) { - int var10 = 256 - var9; + int var10 = 256 - var9; // L: 425 - for (int var11 = -var6; var11 < 0; ++var11) { - for (int var12 = -var5; var12 < 0; ++var12) { - var2 = var1[var3++]; - if (var2 != 0) { - int var13 = var0[var4]; - var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; + for (int var11 = -var6; var11 < 0; ++var11) { // L: 426 + for (int var12 = -var5; var12 < 0; ++var12) { // L: 427 + var2 = var1[var3++]; // L: 428 + if (var2 != 0) { // L: 429 + int var13 = var0[var4]; // L: 430 + var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8; // L: 431 } else { - ++var4; + ++var4; // L: 433 } } - var4 += var7; - var3 += var8; + var4 += var7; // L: 435 + var3 += var8; // L: 436 } - } + } // L: 438 - @ObfuscatedName("x") + @ObfuscatedName("b") @Export("Sprite_drawTransScaled") static void Sprite_drawTransScaled(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { - int var13 = 256 - var12; - int var14 = var3; + int var13 = 256 - var12; // L: 487 + int var14 = var3; // L: 488 - for (int var15 = -var8; var15 < 0; ++var15) { - int var16 = var11 * (var4 >> 16); + for (int var15 = -var8; var15 < 0; ++var15) { // L: 489 + int var16 = var11 * (var4 >> 16); // L: 490 - for (int var17 = -var7; var17 < 0; ++var17) { - var2 = var1[(var3 >> 16) + var16]; - if (var2 != 0) { - int var18 = var0[var5]; - var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; + for (int var17 = -var7; var17 < 0; ++var17) { // L: 491 + var2 = var1[(var3 >> 16) + var16]; // L: 492 + if (var2 != 0) { // L: 493 + int var18 = var0[var5]; // L: 494 + var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8; // L: 495 } else { - ++var5; + ++var5; // L: 497 } - var3 += var9; + var3 += var9; // L: 498 } - var4 += var10; - var3 = var14; - var5 += var6; + var4 += var10; // L: 500 + var3 = var14; // L: 501 + var5 += var6; // L: 502 } - } + } // L: 504 - @ObfuscatedName("ai") - static void method6409(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { - for (var8 = -var10; var8 < 0; ++var8) { - for (var6 = -var9; var6 < 0; ++var6) { - var0 = var4[var5++]; - if (var0 != 0) { - var1 = var3[var7]; - var2 = var0 + var1; - var0 = (var0 & 16711935) + (var1 & 16711935); - var1 = (var0 & 16777472) + (var2 - var0 & 65536); - var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); + @ObfuscatedName("e") + static void method6257(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12) { + for (var8 = -var10; var8 < 0; ++var8) { // L: 544 + for (var6 = -var9; var6 < 0; ++var6) { // L: 545 + var0 = var4[var5++]; // L: 546 + if (var0 != 0) { // L: 547 + var1 = var3[var7]; // L: 548 + var2 = var0 + var1; // L: 549 + var0 = (var0 & 16711935) + (var1 & 16711935); // L: 550 + var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 551 + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); // L: 552 } else { - ++var7; + ++var7; // L: 554 } } - var7 += var11; - var5 += var12; + var7 += var11; // L: 556 + var5 += var12; // L: 557 } - } + } // L: 559 + + @ObfuscatedName("ab") + static void method6258(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { + for (var8 = -var10; var8 < 0; ++var8) { // L: 562 + for (var6 = -var9; var6 < 0; ++var6) { // L: 563 + var0 = var4[var5++]; // L: 564 + if (var0 != 0) { // L: 565 + var1 = var13 * (var0 & 16711935); // L: 566 + var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; // L: 567 + var1 = var3[var7]; // L: 568 + var2 = var0 + var1; // L: 569 + var0 = (var0 & 16711935) + (var1 & 16711935); // L: 570 + var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 571 + var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); // L: 572 + } else { + ++var7; // L: 574 + } + } + + var7 += var11; // L: 576 + var5 += var12; // L: 577 + } + + } // L: 579 @ObfuscatedName("ao") - static void method6362(int var0, int var1, int var2, int[] var3, int[] var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13) { - for (var8 = -var10; var8 < 0; ++var8) { - for (var6 = -var9; var6 < 0; ++var6) { - var0 = var4[var5++]; - if (var0 != 0) { - var1 = var13 * (var0 & 16711935); - var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8; - var1 = var3[var7]; - var2 = var0 + var1; - var0 = (var0 & 16711935) + (var1 & 16711935); - var1 = (var0 & 16777472) + (var2 - var0 & 65536); - var3[var7++] = var2 - var1 | var1 - (var1 >>> 8); + static void method6289(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { + for (int var16 = var3; var8 < 0; ++var8) { // L: 629 630 + var7 = var15 * (var9 >> 16); // L: 631 + + for (var6 = -var12; var6 < 0; ++var6) { // L: 632 + var0 = var4[(var3 >> 16) + var7]; // L: 633 + if (var0 != 0) { // L: 634 + var1 = var5[var10]; // L: 635 + var2 = var0 + var1; // L: 636 + var0 = (var0 & 16711935) + (var1 & 16711935); // L: 637 + var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 638 + var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); // L: 639 } else { - ++var7; - } - } - - var7 += var11; - var5 += var12; - } - - } - - @ObfuscatedName("ax") - static void method6364(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15) { - for (int var16 = var3; var8 < 0; ++var8) { - var7 = var15 * (var9 >> 16); - - for (var6 = -var12; var6 < 0; ++var6) { - var0 = var4[(var3 >> 16) + var7]; - if (var0 != 0) { - var1 = var5[var10]; - var2 = var0 + var1; - var0 = (var0 & 16711935) + (var1 & 16711935); - var1 = (var0 & 16777472) + (var2 - var0 & 65536); - var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); - } else { - ++var10; + ++var10; // L: 641 } - var3 += var13; + var3 += var13; // L: 642 } - var9 += var14; - var3 = var16; - var10 += var11; + var9 += var14; // L: 644 + var3 = var16; // L: 645 + var10 += var11; // L: 646 } - } + } // L: 648 - @ObfuscatedName("ag") - static void method6365(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { - for (int var17 = var3; var8 < 0; ++var8) { - var7 = var15 * (var9 >> 16); + @ObfuscatedName("ae") + static void method6261(int var0, int var1, int var2, int var3, int[] var4, int[] var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16) { + for (int var17 = var3; var8 < 0; ++var8) { // L: 651 652 + var7 = var15 * (var9 >> 16); // L: 653 - for (var6 = -var12; var6 < 0; ++var6) { - var0 = var4[(var3 >> 16) + var7]; - if (var0 != 0) { - var1 = (var0 & 16711935) * var16; - var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8; - var1 = var5[var10]; - var2 = var0 + var1; - var0 = (var0 & 16711935) + (var1 & 16711935); - var1 = (var0 & 16777472) + (var2 - var0 & 65536); - var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); + for (var6 = -var12; var6 < 0; ++var6) { // L: 654 + var0 = var4[(var3 >> 16) + var7]; // L: 655 + if (var0 != 0) { // L: 656 + var1 = (var0 & 16711935) * var16; // L: 657 + var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8; // L: 658 + var1 = var5[var10]; // L: 659 + var2 = var0 + var1; // L: 660 + var0 = (var0 & 16711935) + (var1 & 16711935); // L: 661 + var1 = (var0 & 16777472) + (var2 - var0 & 65536); // L: 662 + var5[var10++] = var2 - var1 | var1 - (var1 >>> 8); // L: 663 } else { - ++var10; + ++var10; // L: 665 } - var3 += var13; + var3 += var13; // L: 666 } - var9 += var14; - var3 = var17; - var10 += var11; + var9 += var14; // L: 668 + var3 = var17; // L: 669 + var10 += var11; // L: 670 } - } + } // L: 672 } diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java index 7b99e2a49a..03a917767d 100644 --- a/runescape-client/src/main/java/SpriteMask.java +++ b/runescape-client/src/main/java/SpriteMask.java @@ -4,130 +4,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hh") +@ObfuscatedName("hz") @Implements("SpriteMask") public class SpriteMask extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 293169349 + intValue = -1396616335 + ) + static int field2552; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 2052975947 ) @Export("width") public final int width; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1667471455 + intValue = -583477063 ) @Export("height") public final int height; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("xWidths") public final int[] xWidths; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("xStarts") public final int[] xStarts; SpriteMask(int var1, int var2, int[] var3, int[] var4, int var5) { - this.width = var1; - this.height = var2; - this.xWidths = var3; - this.xStarts = var4; - } + this.width = var1; // L: 712 + this.height = var2; // L: 713 + this.xWidths = var3; // L: 714 + this.xStarts = var4; // L: 715 + } // L: 716 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(III)Z", - garbageValue = "-679501708" + garbageValue = "1864355280" ) @Export("contains") public boolean contains(int var1, int var2) { - if (var2 >= 0 && var2 < this.xStarts.length) { - int var3 = this.xStarts[var2]; - if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { + if (var2 >= 0 && var2 < this.xStarts.length) { // L: 719 + int var3 = this.xStarts[var2]; // L: 720 + if (var1 >= var3 && var1 <= var3 + this.xWidths[var2]) { // L: 721 return true; } } - return false; + return false; // L: 723 } - @ObfuscatedName("m") - @Export("sleepExact") - public static final void sleepExact(long var0) { - try { - Thread.sleep(var0); - } catch (InterruptedException var3) { - } - - } - - @ObfuscatedName("q") + @ObfuscatedName("ku") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "39704682" + descriptor = "(Lhq;I)Ljava/lang/String;", + garbageValue = "1504596976" ) - @Export("savePreferences") - static void savePreferences() { - AccessFile var0 = null; - - try { - var0 = GameShell.getPreferencesFile("", GrandExchangeOfferWorldComparator.field54.name, true); - Buffer var1 = NetSocket.clientPreferences.toBuffer(); - var0.write(var1.array, 0, var1.offset); - } catch (Exception var3) { + @Export("Widget_getSpellActionName") + static String Widget_getSpellActionName(Widget var0) { + if (GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var0)) == 0) { // L: 10744 + return null; + } else { + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; // L: 10745 10746 10748 } - - try { - if (var0 != null) { - var0.closeSync(true); - } - } catch (Exception var2) { - } - - } - - @ObfuscatedName("km") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZI)V", - garbageValue = "2008753616" - ) - @Export("findItemDefinitions") - static void findItemDefinitions(String var0, boolean var1) { - var0 = var0.toLowerCase(); - short[] var2 = new short[16]; - int var3 = 0; - - for (int var4 = 0; var4 < HitSplatDefinition.ItemDefinition_fileCount; ++var4) { - ItemDefinition var5 = KitDefinition.ItemDefinition_get(var4); - if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) { - if (var3 >= 250) { - TileItemPile.foundItemIdCount = -1; - WorldMapScaleHandler.foundItemIds = null; - return; - } - - if (var3 >= var2.length) { - short[] var6 = new short[var2.length * 2]; - - for (int var7 = 0; var7 < var3; ++var7) { - var6[var7] = var2[var7]; - } - - var2 = var6; - } - - var2[var3++] = (short)var4; - } - } - - WorldMapScaleHandler.foundItemIds = var2; - ArchiveLoader.foundItemIndex = 0; - TileItemPile.foundItemIdCount = var3; - String[] var8 = new String[TileItemPile.foundItemIdCount]; - - for (int var9 = 0; var9 < TileItemPile.foundItemIdCount; ++var9) { - var8[var9] = KitDefinition.ItemDefinition_get(var2[var9]).name; - } - - WorldMapDecoration.method400(var8, WorldMapScaleHandler.foundItemIds); } } diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java index 3475b88d67..a14543fdd1 100644 --- a/runescape-client/src/main/java/Strings.java +++ b/runescape-client/src/main/java/Strings.java @@ -1,25 +1,71 @@ +import java.io.IOException; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hc") +@ObfuscatedName("hy") @Implements("Strings") public class Strings { - @ObfuscatedName("be") - public static String field2845; - @ObfuscatedName("ca") - public static String field2856; - @ObfuscatedName("jx") - public static String field3060; - @ObfuscatedName("jp") - public static String field3061; - @ObfuscatedName("jn") - public static String field3062; + @ObfuscatedName("bj") + public static String field2988; + @ObfuscatedName("cx") + public static String field2936; + @ObfuscatedName("jv") + public static String field3067; + @ObfuscatedName("ji") + public static String field3015; + @ObfuscatedName("jb") + public static String field3069; static { - field2845 = "Please visit the support page for assistance."; - field2856 = "Please visit the support page for assistance."; - field3060 = ""; - field3061 = "Page has opened in a new window."; - field3062 = "(Please check your popup blocker.)"; - } + field2988 = "Please visit the support page for assistance."; // L: 60 + field2936 = "Please visit the support page for assistance."; // L: 99 + field3067 = ""; // L: 275 + field3015 = "Page has opened in a new window."; // L: 276 + field3069 = "(Please check your popup blocker.)"; // L: 277 + } // L: 307 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-21" + ) + static void method4202() { + if (Login.clearLoginScreen) { // L: 226 + class296.titleboxSprite = null; // L: 227 + ModelData0.titlebuttonSprite = null; // L: 228 + GrandExchangeOfferTotalQuantityComparator.runesSprite = null; // L: 229 + UserComparator2.leftTitleSprite = null; // L: 230 + Login.rightTitleSprite = null; // L: 231 + AbstractByteArrayCopier.logoSprite = null; // L: 232 + ClientPreferences.title_muteSprite = null; // L: 233 + class227.options_buttons_0Sprite = null; // L: 234 + MusicPatchNode2.options_buttons_2Sprite = null; // L: 235 + MidiPcmStream.worldSelectBackSprites = null; // L: 236 + AbstractWorldMapIcon.worldSelectFlagSprites = null; // L: 237 + MusicPatchNode.worldSelectArrows = null; // L: 238 + Login.worldSelectStars = null; // L: 239 + class7.field36 = null; // L: 240 + Varcs.loginScreenRunesAnimation.method1904(); // L: 241 + class58.method915(2); // L: 242 + if (NetCache.NetCache_socket != null) { // L: 244 + try { + Buffer var0 = new Buffer(4); // L: 246 + var0.writeByte(2); // L: 247 + var0.writeMedium(0); // L: 248 + NetCache.NetCache_socket.write(var0.array, 0, 4); // L: 249 + } catch (IOException var3) { + try { + NetCache.NetCache_socket.close(); // L: 253 + } catch (Exception var2) { // L: 255 + } + + ++NetCache.NetCache_ioExceptions; // L: 256 + NetCache.NetCache_socket = null; // L: 257 + } + } + + Login.clearLoginScreen = false; // L: 260 + } + } // L: 261 } diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 053e88aa0f..0b12b87e2b 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -3,263 +3,114 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("je") +@ObfuscatedName("jj") @Implements("StructDefinition") public class StructDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("StructDefinition_archive") static AbstractArchive StructDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("StructDefinition_cached") - public static EvictingDualNodeHashTable StructDefinition_cached; - @ObfuscatedName("q") + static EvictingDualNodeHashTable StructDefinition_cached; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Llf;" + descriptor = "Llq;" ) @Export("params") IterableNodeHashTable params; static { - StructDefinition_cached = new EvictingDualNodeHashTable(64); + StructDefinition_cached = new EvictingDualNodeHashTable(64); // L: 13 } StructDefinition() { - } + } // L: 16 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-98" + descriptor = "(I)V", + garbageValue = "-2018201430" ) @Export("postDecode") void postDecode() { - } + } // L: 33 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "381784776" + descriptor = "(Lkf;I)V", + garbageValue = "1854456107" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 37 + if (var2 == 0) { // L: 38 + return; // L: 41 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 39 } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "337645419" + descriptor = "(Lkf;II)V", + garbageValue = "1912740742" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { if (var2 == 249) { - this.params = WorldMapElement.readStringIntParameters(var1, this.params); + this.params = PacketWriter.readStringIntParameters(var1, this.params); // L: 44 } - } + } // L: 46 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "48203250" + descriptor = "(IIB)I", + garbageValue = "1" ) @Export("getIntParam") public int getIntParam(int var1, int var2) { - return Language.method3801(this.params, var1, var2); + return Username.method5309(this.params, var1, var2); // L: 49 } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;I)Ljava/lang/String;", - garbageValue = "-1617799993" + descriptor = "(ILjava/lang/String;B)Ljava/lang/String;", + garbageValue = "101" ) @Export("getStringParam") public String getStringParam(int var1, String var2) { - return FloorUnderlayDefinition.method4612(this.params, var1, var2); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(S)[Lgu;", - garbageValue = "8211" - ) - @Export("ServerPacket_values") - public static ServerPacket[] ServerPacket_values() { - return new ServerPacket[]{ServerPacket.field2191, ServerPacket.field2177, ServerPacket.field2200, ServerPacket.field2156, ServerPacket.field2211, ServerPacket.field2158, ServerPacket.field2219, ServerPacket.field2228, ServerPacket.field2161, ServerPacket.field2169, ServerPacket.field2224, ServerPacket.field2164, ServerPacket.field2155, ServerPacket.field2166, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2181, ServerPacket.field2170, ServerPacket.field2232, ServerPacket.field2172, ServerPacket.field2173, ServerPacket.field2189, ServerPacket.field2171, ServerPacket.field2176, ServerPacket.field2165, ServerPacket.field2178, ServerPacket.field2175, ServerPacket.field2180, ServerPacket.field2240, ServerPacket.field2182, ServerPacket.field2183, ServerPacket.field2184, ServerPacket.field2185, ServerPacket.field2186, ServerPacket.field2187, ServerPacket.field2188, ServerPacket.field2160, ServerPacket.field2220, ServerPacket.field2162, ServerPacket.field2159, ServerPacket.field2199, ServerPacket.field2194, ServerPacket.field2157, ServerPacket.field2193, ServerPacket.field2197, ServerPacket.field2190, ServerPacket.field2223, ServerPacket.field2163, ServerPacket.field2201, ServerPacket.field2202, ServerPacket.field2203, ServerPacket.field2204, ServerPacket.field2205, ServerPacket.field2206, ServerPacket.field2207, ServerPacket.field2208, ServerPacket.field2209, ServerPacket.field2210, ServerPacket.field2230, ServerPacket.field2212, ServerPacket.field2213, ServerPacket.field2226, ServerPacket.field2215, ServerPacket.field2216, ServerPacket.field2217, ServerPacket.field2218, ServerPacket.field2196, ServerPacket.field2174, ServerPacket.field2221, ServerPacket.field2222, ServerPacket.field2235, ServerPacket.field2153, ServerPacket.field2225, ServerPacket.field2195, ServerPacket.field2227, ServerPacket.field2233, ServerPacket.field2229, ServerPacket.field2179, ServerPacket.field2231, ServerPacket.field2214, ServerPacket.field2154, ServerPacket.field2234, ServerPacket.field2198, ServerPacket.field2236, ServerPacket.field2237, ServerPacket.field2238}; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/CharSequence;III)Ljava/lang/String;", - garbageValue = "1817057195" - ) - public static String method4718(CharSequence[] var0, int var1, int var2) { - if (var2 == 0) { - return ""; - } else if (var2 == 1) { - CharSequence var3 = var0[var1]; - return var3 == null ? "null" : var3.toString(); + IterableNodeHashTable var4 = this.params; // L: 54 + String var3; + if (var4 == null) { // L: 56 + var3 = var2; // L: 57 } else { - int var8 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var8; ++var5) { - CharSequence var6 = var0[var5]; - if (var6 == null) { - var4 += 4; - } else { - var4 += var6.length(); - } - } - - StringBuilder var9 = new StringBuilder(var4); - - for (int var10 = var1; var10 < var8; ++var10) { - CharSequence var7 = var0[var10]; - if (var7 == null) { - var9.append("null"); - } else { - var9.append(var7); - } - } - - return var9.toString(); - } - } - - @ObfuscatedName("jb") - @ObfuscatedSignature( - descriptor = "(Lhd;IIII)V", - garbageValue = "-1082386904" - ) - @Export("drawMinimap") - static final void drawMinimap(Widget var0, int var1, int var2, int var3) { - Timer.playPcmPlayers(); - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height); - if (Client.minimapState != 2 && Client.minimapState != 5) { - int var5 = Client.camAngleY & 2047; - int var6 = class60.localPlayer.x / 32 + 48; - int var7 = 464 - class60.localPlayer.y / 32; - class3.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths); - - int var8; - int var9; - int var10; - for (var8 = 0; var8 < Client.mapIconCount; ++var8) { - var9 = Client.mapIconXs[var8] * 4 + 2 - class60.localPlayer.x / 32; - var10 = Client.mapIconYs[var8] * 4 + 2 - class60.localPlayer.y / 32; - GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4); - } - - int var11; - int var12; - for (var8 = 0; var8 < 104; ++var8) { - for (var9 = 0; var9 < 104; ++var9) { - NodeDeque var15 = Client.groundItems[TileItemPile.Client_plane][var8][var9]; - if (var15 != null) { - var11 = var8 * 4 + 2 - class60.localPlayer.x / 32; - var12 = var9 * 4 + 2 - class60.localPlayer.y / 32; - GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var11, var12, AttackOption.mapDotSprites[0], var4); - } - } - } - - for (var8 = 0; var8 < Client.npcCount; ++var8) { - NPC var16 = Client.npcs[Client.npcIndices[var8]]; - if (var16 != null && var16.isVisible()) { - NPCDefinition var18 = var16.definition; - if (var18 != null && var18.transforms != null) { - var18 = var18.transform(); - } - - if (var18 != null && var18.drawMapDot && var18.isInteractable) { - var11 = var16.x / 32 - class60.localPlayer.x / 32; - var12 = var16.y / 32 - class60.localPlayer.y / 32; - GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var11, var12, AttackOption.mapDotSprites[1], var4); - } - } - } - - var8 = Players.Players_count; - int[] var19 = Players.Players_indices; - - for (var10 = 0; var10 < var8; ++var10) { - Player var17 = Client.players[var19[var10]]; - if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != class60.localPlayer) { - var12 = var17.x / 32 - class60.localPlayer.x / 32; - int var13 = var17.y / 32 - class60.localPlayer.y / 32; - boolean var14 = false; - if (class60.localPlayer.team != 0 && var17.team != 0 && var17.team == class60.localPlayer.team) { - var14 = true; - } - - if (var17.isFriend()) { - GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var12, var13, AttackOption.mapDotSprites[3], var4); - } else if (var14) { - GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var12, var13, AttackOption.mapDotSprites[4], var4); - } else if (var17.isClanMember()) { - GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var12, var13, AttackOption.mapDotSprites[5], var4); - } else { - GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var12, var13, AttackOption.mapDotSprites[2], var4); - } - } - } - - if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) { - if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) { - NPC var20 = Client.npcs[Client.hintArrowNpcIndex]; - if (var20 != null) { - var11 = var20.x / 32 - class60.localPlayer.x / 32; - var12 = var20.y / 32 - class60.localPlayer.y / 32; - WorldMapRectangle.worldToMinimap(var1, var2, var11, var12, class9.mapMarkerSprites[1], var4); - } - } - - if (Client.hintArrowType == 2) { - var10 = Client.hintArrowX * 4 - class182.baseX * 4 + 2 - class60.localPlayer.x / 32; - var11 = Client.hintArrowY * 4 - SecureRandomFuture.baseY * 4 + 2 - class60.localPlayer.y / 32; - WorldMapRectangle.worldToMinimap(var1, var2, var10, var11, class9.mapMarkerSprites[1], var4); - } - - if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) { - Player var21 = Client.players[Client.hintArrowPlayerIndex]; - if (var21 != null) { - var11 = var21.x / 32 - class60.localPlayer.x / 32; - var12 = var21.y / 32 - class60.localPlayer.y / 32; - WorldMapRectangle.worldToMinimap(var1, var2, var11, var12, class9.mapMarkerSprites[1], var4); - } - } - } - - if (Client.destinationX != 0) { - var10 = Client.destinationX * 4 + 2 - class60.localPlayer.x / 32; - var11 = Client.destinationY * 4 + 2 - class60.localPlayer.y / 32; - GrandExchangeOffer.drawSpriteOnMinimap(var1, var2, var10, var11, class9.mapMarkerSprites[0], var4); - } - - if (!class60.localPlayer.isHidden) { - Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215); - } + ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 60 + if (var5 == null) { // L: 61 + var3 = var2; // L: 62 } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); + var3 = (String)var5.obj; // L: 65 } - - Client.field879[var3] = true; } + + return var3; // L: 67 } + + @ObfuscatedName("hl") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIII)V", + garbageValue = "-1032705828" + ) + @Export("insertMenuItemNoShift") + public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) { + Tiles.insertMenuItem(var0, var1, var2, var3, var4, var5, false); // L: 8236 + } // L: 8237 } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 2d58d44203..80e3d9ca1a 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -4,122 +4,77 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ib") +@ObfuscatedName("is") @Implements("StudioGame") public enum StudioGame implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lis;" ) @Export("runescape") runescape("runescape", "RuneScape", 0), - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lis;" ) @Export("stellardawn") stellardawn("stellardawn", "Stellar Dawn", 1), - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lis;" ) @Export("game3") game3("game3", "Game 3", 2), - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lis;" ) @Export("game4") game4("game4", "Game 4", 3), - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lis;" ) @Export("game5") game5("game5", "Game 5", 4), - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lib;" + descriptor = "Lis;" ) @Export("oldscape") oldscape("oldscape", "RuneScape 2007", 5); - @ObfuscatedName("gu") - @Export("regionMapArchiveIds") - static int[] regionMapArchiveIds; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("name") public final String name; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1640024773 + intValue = -1491225247 ) @Export("id") final int id; StudioGame(String var3, String var4, int var5) { - this.name = var3; - this.id = var5; - } + this.name = var3; // L: 21 + this.id = var5; // L: 22 + } // L: 23 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 26 } - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Ljz;", - garbageValue = "916487028" + descriptor = "(III)Z", + garbageValue = "1502336414" ) - @Export("getNpcDefinition") - public static NPCDefinition getNpcDefinition(int var0) { - NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("ih") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-1280022094" - ) - @Export("drawScrollBar") - static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) { - WorldMapElement.scrollBarSprites[0].drawAt(var0, var1); - WorldMapElement.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field736); - int var5 = var3 * (var3 - 32) / var4; - if (var5 < 8) { - var5 = 8; - } - - int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field737); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field739); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field739); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field739); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field739); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field694); - Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field694); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field694); - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var5 + var6 + var1 + 14, 15, Client.field694); + public static boolean method4230(int var0, int var1) { + return (var0 >> var1 + 1 & 1) != 0; // L: 13 } } diff --git a/runescape-client/src/main/java/Task.java b/runescape-client/src/main/java/Task.java index 18236fc1f8..4e669cc655 100644 --- a/runescape-client/src/main/java/Task.java +++ b/runescape-client/src/main/java/Task.java @@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fa") +@ObfuscatedName("fl") @Implements("Task") public class Task { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lfl;" ) @Export("next") Task next; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("status") public volatile int status; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -681465255 + intValue = 1774016279 ) @Export("type") int type; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("intArgument") public int intArgument; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("objectArgument") Object objectArgument; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("result") public volatile Object result; Task() { - this.status = 0; - } + this.status = 0; // L: 11 + } // L: 23 } diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java index ca10fe2b73..1cc539d486 100644 --- a/runescape-client/src/main/java/TaskHandler.java +++ b/runescape-client/src/main/java/TaskHandler.java @@ -1,4 +1,3 @@ -import java.applet.Applet; import java.io.DataInputStream; import java.net.InetAddress; import java.net.Socket; @@ -8,558 +7,208 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fm") +@ObfuscatedName("fo") @Implements("TaskHandler") public class TaskHandler implements Runnable { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("javaVendor") public static String javaVendor; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("javaVersion") public static String javaVersion; - @ObfuscatedName("jq") + @ObfuscatedName("w") + @Export("SpriteBuffer_spritePalette") + static int[] SpriteBuffer_spritePalette; + @ObfuscatedName("lp") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lcf;" ) - @Export("hoveredItemContainer") - static Widget hoveredItemContainer; - @ObfuscatedName("q") + @Export("tempMenuAction") + static MenuAction tempMenuAction; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lfl;" ) @Export("current") Task current; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lfa;" + descriptor = "Lfl;" ) @Export("task") Task task; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("thread") Thread thread; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("isClosed") boolean isClosed; public TaskHandler() { this.current = null; this.task = null; - this.isClosed = false; + this.isClosed = false; // L: 14 javaVendor = "Unknown"; javaVersion = "1.6"; try { javaVendor = System.getProperty("java.vendor"); javaVersion = System.getProperty("java.version"); - } catch (Exception var2) { + } catch (Exception var2) { // L: 26 } - this.isClosed = false; - this.thread = new Thread(this); - this.thread.setPriority(10); - this.thread.setDaemon(true); - this.thread.start(); - } + this.isClosed = false; // L: 27 + this.thread = new Thread(this); // L: 28 + this.thread.setPriority(10); // L: 29 + this.thread.setDaemon(true); // L: 30 + this.thread.start(); // L: 31 + } // L: 32 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "622783218" + garbageValue = "-1905813436" ) @Export("close") public final void close() { - synchronized(this) { - this.isClosed = true; - this.notifyAll(); - } + synchronized(this) { // L: 35 + this.isClosed = true; // L: 36 + this.notifyAll(); // L: 37 + } // L: 38 try { - this.thread.join(); - } catch (InterruptedException var3) { + this.thread.join(); // L: 40 + } catch (InterruptedException var3) { // L: 42 } - } + } // L: 43 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIILjava/lang/Object;I)Lfa;", - garbageValue = "962190485" + descriptor = "(IIILjava/lang/Object;B)Lfl;", + garbageValue = "1" ) @Export("newTask") final Task newTask(int var1, int var2, int var3, Object var4) { - Task var5 = new Task(); - var5.type = var1; - var5.intArgument = var2; - var5.objectArgument = var4; - synchronized(this) { - if (this.task != null) { - this.task.next = var5; - this.task = var5; + Task var5 = new Task(); // L: 90 + var5.type = var1; // L: 91 + var5.intArgument = var2; // L: 92 + var5.objectArgument = var4; // L: 93 + synchronized(this) { // L: 94 + if (this.task != null) { // L: 95 + this.task.next = var5; // L: 96 + this.task = var5; // L: 97 } else { - this.task = this.current = var5; + this.task = this.current = var5; // L: 100 } - this.notify(); - return var5; + this.notify(); // L: 102 + return var5; // L: 104 } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)Lfa;", - garbageValue = "746026781" + descriptor = "(Ljava/lang/String;II)Lfl;", + garbageValue = "-1230716173" ) @Export("newSocketTask") public final Task newSocketTask(String var1, int var2) { - return this.newTask(1, var2, 0, var1); + return this.newTask(1, var2, 0, var1); // L: 108 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Runnable;II)Lfa;", - garbageValue = "2089571271" + descriptor = "(Ljava/lang/Runnable;II)Lfl;", + garbageValue = "1199992408" ) @Export("newThreadTask") public final Task newThreadTask(Runnable var1, int var2) { - return this.newTask(2, var2, 0, var1); + return this.newTask(2, var2, 0, var1); // L: 112 } public final void run() { while (true) { Task var1; - synchronized(this) { + synchronized(this) { // L: 48 while (true) { - if (this.isClosed) { + if (this.isClosed) { // L: 50 return; } - if (this.current != null) { - var1 = this.current; - this.current = this.current.next; - if (this.current == null) { + if (this.current != null) { // L: 51 + var1 = this.current; // L: 52 + this.current = this.current.next; // L: 53 + if (this.current == null) { // L: 54 this.task = null; } break; } try { - this.wait(); - } catch (InterruptedException var8) { + this.wait(); // L: 58 + } catch (InterruptedException var8) { // L: 60 } } } try { - int var5 = var1.type; - if (var5 == 1) { - var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); - } else if (var5 == 2) { - Thread var3 = new Thread((Runnable)var1.objectArgument); - var3.setDaemon(true); - var3.start(); - var3.setPriority(var1.intArgument); - var1.result = var3; - } else if (var5 == 4) { - var1.result = new DataInputStream(((URL)var1.objectArgument).openStream()); + int var5 = var1.type; // L: 64 + if (var5 == 1) { // L: 65 + var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); // L: 66 + } else if (var5 == 2) { // L: 68 + Thread var3 = new Thread((Runnable)var1.objectArgument); // L: 69 + var3.setDaemon(true); // L: 70 + var3.start(); // L: 71 + var3.setPriority(var1.intArgument); // L: 72 + var1.result = var3; // L: 73 + } else if (var5 == 4) { // L: 75 + var1.result = new DataInputStream(((URL)var1.objectArgument).openStream()); // L: 76 } - var1.status = 1; - } catch (ThreadDeath var6) { - throw var6; - } catch (Throwable var7) { - var1.status = 2; + var1.status = 1; // L: 78 + } catch (ThreadDeath var6) { // L: 80 + throw var6; // L: 81 + } catch (Throwable var7) { // L: 83 + var1.status = 2; // L: 84 } } } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-1144544095" + descriptor = "(II)Liy;", + garbageValue = "960281764" ) - public static void method3606(Applet var0, String var1) { - class60.applet = var0; - if (var1 != null) { - class60.field450 = var1; - } - - } - - @ObfuscatedName("fa") - @ObfuscatedSignature( - descriptor = "(Lcc;IB)V", - garbageValue = "-73" - ) - @Export("updateActorSequence") - static final void updateActorSequence(Actor var0, int var1) { - int var2; - int var3; - int var4; - SequenceDefinition var11; - if (var0.field966 >= Client.cycle) { - var2 = Math.max(1, var0.field966 - Client.cycle); - var3 = var0.field967 * 64 + var0.field995 * 128; - var4 = var0.field967 * 64 + var0.field1008 * 128; - var0.x += (var3 - var0.x) / var2; - var0.y += (var4 - var0.y) / var2; - var0.field1022 = 0; - var0.orientation = var0.field1006; + public static VarbitDefinition method3567(int var0) { + VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); // L: 19 + if (var1 != null) { // L: 20 + return var1; } else { - int var5; - int var7; - if (var0.field1011 >= Client.cycle) { - if (var0.field1011 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > NetSocket.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { - var2 = var0.field1011 - var0.field966; - var3 = Client.cycle - var0.field966; - var4 = var0.field967 * 64 + var0.field995 * 128; - var5 = var0.field967 * 64 + var0.field1008 * 128; - int var6 = var0.field967 * 64 + var0.field1007 * 128; - var7 = var0.field967 * 64 + var0.field1009 * 128; - var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2; - var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2; - } - - var0.field1022 = 0; - var0.orientation = var0.field1006; - var0.rotation = var0.orientation; - } else { - var0.movementSequence = var0.idleSequence; - if (var0.pathLength == 0) { - var0.field1022 = 0; - } else { - label550: { - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var11 = NetSocket.SequenceDefinition_get(var0.sequence); - if (var0.field1023 > 0 && var11.field3559 == 0) { - ++var0.field1022; - break label550; - } - - if (var0.field1023 <= 0 && var11.field3560 == 0) { - ++var0.field1022; - break label550; - } - } - - var2 = var0.x; - var3 = var0.y; - var4 = var0.field967 * 64 + var0.pathX[var0.pathLength - 1] * 128; - var5 = var0.field967 * 64 + var0.pathY[var0.pathLength - 1] * 128; - if (var2 < var4) { - if (var3 < var5) { - var0.orientation = 1280; - } else if (var3 > var5) { - var0.orientation = 1792; - } else { - var0.orientation = 1536; - } - } else if (var2 > var4) { - if (var3 < var5) { - var0.orientation = 768; - } else if (var3 > var5) { - var0.orientation = 256; - } else { - var0.orientation = 512; - } - } else if (var3 < var5) { - var0.orientation = 1024; - } else if (var3 > var5) { - var0.orientation = 0; - } - - byte var14 = var0.pathTraversed[var0.pathLength - 1]; - if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) { - var7 = var0.orientation - var0.rotation & 2047; - if (var7 > 1024) { - var7 -= 2048; - } - - int var8 = var0.walkBackSequence; - if (var7 >= -256 && var7 <= 256) { - var8 = var0.walkSequence; - } else if (var7 >= 256 && var7 < 768) { - var8 = var0.walkRightSequence; - } else if (var7 >= -768 && var7 <= -256) { - var8 = var0.walkLeftSequence; - } - - if (var8 == -1) { - var8 = var0.walkSequence; - } - - var0.movementSequence = var8; - int var9 = 4; - boolean var10 = true; - if (var0 instanceof NPC) { - var10 = ((NPC)var0).definition.isClickable; - } - - if (var10) { - if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1017 != 0) { - var9 = 2; - } - - if (var0.pathLength > 2) { - var9 = 6; - } - - if (var0.pathLength > 3) { - var9 = 8; - } - - if (var0.field1022 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1022; - } - } else { - if (var0.pathLength > 1) { - var9 = 6; - } - - if (var0.pathLength > 2) { - var9 = 8; - } - - if (var0.field1022 > 0 && var0.pathLength > 1) { - var9 = 8; - --var0.field1022; - } - } - - if (var14 == 2) { - var9 <<= 1; - } - - if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) { - var0.movementSequence = var0.runSequence; - } - - if (var4 != var2 || var3 != var5) { - if (var2 < var4) { - var0.x += var9; - if (var0.x > var4) { - var0.x = var4; - } - } else if (var2 > var4) { - var0.x -= var9; - if (var0.x < var4) { - var0.x = var4; - } - } - - if (var3 < var5) { - var0.y += var9; - if (var0.y > var5) { - var0.y = var5; - } - } else if (var3 > var5) { - var0.y -= var9; - if (var0.y < var5) { - var0.y = var5; - } - } - } - - if (var4 == var0.x && var5 == var0.y) { - --var0.pathLength; - if (var0.field1023 > 0) { - --var0.field1023; - } - } - } else { - var0.x = var4; - var0.y = var5; - --var0.pathLength; - if (var0.field1023 > 0) { - --var0.field1023; - } - } - } - } + byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); // L: 21 + var1 = new VarbitDefinition(); // L: 22 + if (var2 != null) { // L: 23 + var1.decode(new Buffer(var2)); } + + VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); // L: 24 + return var1; // L: 25 } + } - if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field966 = 0; - var0.field1011 = 0; - var0.x = var0.pathX[0] * 128 + var0.field967 * 64; - var0.y = var0.pathY[0] * 128 + var0.field967 * 64; - var0.method1810(); + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "-1918850707" + ) + public static int method3568(int var0, int var1, int var2) { + var2 &= 3; // L: 9 + if (var2 == 0) { // L: 10 + return var0; + } else if (var2 == 1) { // L: 11 + return var1; + } else { + return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13 } - - if (class60.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) { - var0.sequence = -1; - var0.spotAnimation = -1; - var0.field966 = 0; - var0.field1011 = 0; - var0.x = var0.pathX[0] * 128 + var0.field967 * 64; - var0.y = var0.field967 * 64 + var0.pathY[0] * 128; - var0.method1810(); - } - - if (var0.field1017 != 0) { - if (var0.targetIndex != -1) { - Object var15 = null; - if (var0.targetIndex < 32768) { - var15 = Client.npcs[var0.targetIndex]; - } else if (var0.targetIndex >= 32768) { - var15 = Client.players[var0.targetIndex - 32768]; - } - - if (var15 != null) { - var3 = var0.x - ((Actor)var15).x; - var4 = var0.y - ((Actor)var15).y; - if (var3 != 0 || var4 != 0) { - var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047; - } - } else if (var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - } - - if (var0.field992 != -1 && (var0.pathLength == 0 || var0.field1022 > 0)) { - var0.orientation = var0.field992; - var0.field992 = -1; - } - - var2 = var0.orientation - var0.rotation & 2047; - if (var2 == 0 && var0.false0) { - var0.targetIndex = -1; - var0.false0 = false; - } - - if (var2 != 0) { - ++var0.field1016; - boolean var13; - if (var2 > 1024) { - var0.rotation -= var0.field1017; - var13 = true; - if (var2 < var0.field1017 || var2 > 2048 - var0.field1017) { - var0.rotation = var0.orientation; - var13 = false; - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1016 > 25 || var13)) { - if (var0.turnLeftSequence != -1) { - var0.movementSequence = var0.turnLeftSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } else { - var0.rotation += var0.field1017; - var13 = true; - if (var2 < var0.field1017 || var2 > 2048 - var0.field1017) { - var0.rotation = var0.orientation; - var13 = false; - } - - if (var0.movementSequence == var0.idleSequence && (var0.field1016 > 25 || var13)) { - if (var0.turnRightSequence != -1) { - var0.movementSequence = var0.turnRightSequence; - } else { - var0.movementSequence = var0.walkSequence; - } - } - } - - var0.rotation &= 2047; - } else { - var0.field1016 = 0; - } - } - - var0.isWalking = false; - if (var0.movementSequence != -1) { - var11 = NetSocket.SequenceDefinition_get(var0.movementSequence); - if (var11 != null && var11.frameIds != null) { - ++var0.movementFrameCycle; - if (var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) { - var0.movementFrameCycle = 1; - ++var0.movementFrame; - GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y); - } - - if (var0.movementFrame >= var11.frameIds.length) { - var0.movementFrameCycle = 0; - var0.movementFrame = 0; - GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y); - } - } else { - var0.movementSequence = -1; - } - } - - if (var0.spotAnimation != -1 && Client.cycle >= var0.field987) { - if (var0.spotAnimationFrame < 0) { - var0.spotAnimationFrame = 0; - } - - var2 = class4.SpotAnimationDefinition_get(var0.spotAnimation).sequence; - if (var2 != -1) { - SequenceDefinition var12 = NetSocket.SequenceDefinition_get(var2); - if (var12 != null && var12.frameIds != null) { - ++var0.spotAnimationFrameCycle; - if (var0.spotAnimationFrame < var12.frameIds.length && var0.spotAnimationFrameCycle > var12.frameLengths[var0.spotAnimationFrame]) { - var0.spotAnimationFrameCycle = 1; - ++var0.spotAnimationFrame; - GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var12, var0.spotAnimationFrame, var0.x, var0.y); - } - - if (var0.spotAnimationFrame >= var12.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var12.frameIds.length)) { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } else { - var0.spotAnimation = -1; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay <= 1) { - var11 = NetSocket.SequenceDefinition_get(var0.sequence); - if (var11.field3559 == 1 && var0.field1023 > 0 && var0.field966 <= Client.cycle && var0.field1011 < Client.cycle) { - var0.sequenceDelay = 1; - return; - } - } - - if (var0.sequence != -1 && var0.sequenceDelay == 0) { - var11 = NetSocket.SequenceDefinition_get(var0.sequence); - if (var11 != null && var11.frameIds != null) { - ++var0.sequenceFrameCycle; - if (var0.sequenceFrame < var11.frameIds.length && var0.sequenceFrameCycle > var11.frameLengths[var0.sequenceFrame]) { - var0.sequenceFrameCycle = 1; - ++var0.sequenceFrame; - GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y); - } - - if (var0.sequenceFrame >= var11.frameIds.length) { - var0.sequenceFrame -= var11.frameCount; - ++var0.field1000; - if (var0.field1000 >= var11.field3562) { - var0.sequence = -1; - } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var11.frameIds.length) { - GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y); - } else { - var0.sequence = -1; - } - } - - var0.isWalking = var11.field3558; - } else { - var0.sequence = -1; - } - } - - if (var0.sequenceDelay > 0) { - --var0.sequenceDelay; - } - } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index a5470e03ff..ca296d92ba 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -6,204 +6,195 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("eo") @Implements("Texture") public class Texture extends Node { - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("Texture_animatedPixels") static int[] Texture_animatedPixels; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("averageRGB") int averageRGB; - @ObfuscatedName("g") - boolean field1650; - @ObfuscatedName("n") + @ObfuscatedName("o") + boolean field1647; + @ObfuscatedName("x") @Export("fileIds") int[] fileIds; - @ObfuscatedName("u") - int[] field1652; - @ObfuscatedName("a") - int[] field1653; - @ObfuscatedName("z") - int[] field1654; @ObfuscatedName("w") + int[] field1649; + @ObfuscatedName("g") + int[] field1650; + @ObfuscatedName("m") + int[] field1651; + @ObfuscatedName("n") @Export("animationDirection") int animationDirection; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("animationSpeed") int animationSpeed; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("pixels") int[] pixels; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("isLoaded") boolean isLoaded; @ObfuscatedSignature( - descriptor = "(Lkn;)V" + descriptor = "(Lkf;)V" ) Texture(Buffer var1) { - this.isLoaded = false; - this.averageRGB = var1.readUnsignedShort(); - this.field1650 = var1.readUnsignedByte() == 1; - int var2 = var1.readUnsignedByte(); - if (var2 >= 1 && var2 <= 4) { - this.fileIds = new int[var2]; + this.isLoaded = false; // L: 25 + this.averageRGB = var1.readUnsignedShort(); // L: 29 + this.field1647 = var1.readUnsignedByte() == 1; // L: 30 + int var2 = var1.readUnsignedByte(); // L: 31 + if (var2 >= 1 && var2 <= 4) { // L: 32 + this.fileIds = new int[var2]; // L: 35 int var3; - for (var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { // L: 36 this.fileIds[var3] = var1.readUnsignedShort(); } - if (var2 > 1) { - this.field1652 = new int[var2 - 1]; + if (var2 > 1) { // L: 37 + this.field1649 = new int[var2 - 1]; // L: 38 - for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1652[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 39 + this.field1649[var3] = var1.readUnsignedByte(); } } - if (var2 > 1) { - this.field1653 = new int[var2 - 1]; + if (var2 > 1) { // L: 41 + this.field1650 = new int[var2 - 1]; // L: 42 - for (var3 = 0; var3 < var2 - 1; ++var3) { - this.field1653[var3] = var1.readUnsignedByte(); + for (var3 = 0; var3 < var2 - 1; ++var3) { // L: 43 + this.field1650[var3] = var1.readUnsignedByte(); } } - this.field1654 = new int[var2]; + this.field1651 = new int[var2]; // L: 45 - for (var3 = 0; var3 < var2; ++var3) { - this.field1654[var3] = var1.readInt(); + for (var3 = 0; var3 < var2; ++var3) { // L: 46 + this.field1651[var3] = var1.readInt(); } - this.animationDirection = var1.readUnsignedByte(); - this.animationSpeed = var1.readUnsignedByte(); - this.pixels = null; + this.animationDirection = var1.readUnsignedByte(); // L: 47 + this.animationSpeed = var1.readUnsignedByte(); // L: 48 + this.pixels = null; // L: 49 } else { - throw new RuntimeException(); + throw new RuntimeException(); // L: 33 } - } + } // L: 50 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(DILic;)Z" ) @Export("load") boolean load(double var1, int var3, AbstractArchive var4) { int var5; - for (var5 = 0; var5 < this.fileIds.length; ++var5) { - if (var4.getFileFlat(this.fileIds[var5]) == null) { + for (var5 = 0; var5 < this.fileIds.length; ++var5) { // L: 53 + if (var4.getFileFlat(this.fileIds[var5]) == null) { // L: 54 return false; } } - var5 = var3 * var3; - this.pixels = new int[var5]; - - for (int var6 = 0; var6 < this.fileIds.length; ++var6) { - int var8 = this.fileIds[var6]; - byte[] var10 = var4.takeFileFlat(var8); - boolean var9; - if (var10 == null) { - var9 = false; - } else { - class3.SpriteBuffer_decode(var10); - var9 = true; - } + var5 = var3 * var3; // L: 56 + this.pixels = new int[var5]; // L: 57 + for (int var6 = 0; var6 < this.fileIds.length; ++var6) { // L: 58 + int var8 = this.fileIds[var6]; // L: 60 IndexedSprite var7; - if (!var9) { - var7 = null; + if (!class197.method3742(var4, var8)) { // L: 62 + var7 = null; // L: 63 } else { - var7 = AttackOption.method2173(); + var7 = InvDefinition.method4448(); // L: 66 } - var7.normalize(); - var10 = var7.pixels; - int[] var11 = var7.palette; - int var12 = this.field1654[var6]; - if ((var12 & -16777216) == 16777216) { + var7.normalize(); // L: 69 + byte[] var10 = var7.pixels; // L: 70 + int[] var11 = var7.palette; // L: 71 + int var12 = this.field1651[var6]; // L: 72 + if ((var12 & -16777216) == 16777216) { // L: 73 } - if ((var12 & -16777216) == 33554432) { + if ((var12 & -16777216) == 33554432) { // L: 74 } int var13; int var14; int var15; int var16; - if ((var12 & -16777216) == 50331648) { - var13 = var12 & 16711935; - var14 = var12 >> 8 & 255; + if ((var12 & -16777216) == 50331648) { // L: 75 + var13 = var12 & 16711935; // L: 76 + var14 = var12 >> 8 & 255; // L: 77 - for (var15 = 0; var15 < var11.length; ++var15) { - var16 = var11[var15]; - if (var16 >> 8 == (var16 & 65535)) { - var16 &= 255; - var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; + for (var15 = 0; var15 < var11.length; ++var15) { // L: 78 + var16 = var11[var15]; // L: 79 + if (var16 >> 8 == (var16 & 65535)) { // L: 80 + var16 &= 255; // L: 81 + var11[var15] = var13 * var16 >> 8 & 16711935 | var14 * var16 & 65280; // L: 82 } } } - for (var13 = 0; var13 < var11.length; ++var13) { + for (var13 = 0; var13 < var11.length; ++var13) { // L: 86 var11[var13] = Rasterizer3D.Rasterizer3D_brighten(var11[var13], var1); } - if (var6 == 0) { + if (var6 == 0) { // L: 88 var13 = 0; } else { - var13 = this.field1652[var6 - 1]; + var13 = this.field1649[var6 - 1]; // L: 89 } - if (var13 == 0) { - if (var3 == var7.subWidth) { - for (var14 = 0; var14 < var5; ++var14) { + if (var13 == 0) { // L: 90 + if (var3 == var7.subWidth) { // L: 91 + for (var14 = 0; var14 < var5; ++var14) { // L: 92 this.pixels[var14] = var11[var10[var14] & 255]; } - } else if (var7.subWidth == 64 && var3 == 128) { - var14 = 0; + } else if (var7.subWidth == 64 && var3 == 128) { // L: 94 + var14 = 0; // L: 95 - for (var15 = 0; var15 < var3; ++var15) { - for (var16 = 0; var16 < var3; ++var16) { + for (var15 = 0; var15 < var3; ++var15) { // L: 96 + for (var16 = 0; var16 < var3; ++var16) { // L: 97 this.pixels[var14++] = var11[var10[(var15 >> 1 << 6) + (var16 >> 1)] & 255]; } } } else { - if (var7.subWidth != 128 || var3 != 64) { - throw new RuntimeException(); + if (var7.subWidth != 128 || var3 != 64) { // L: 100 + throw new RuntimeException(); // L: 107 } - var14 = 0; + var14 = 0; // L: 101 - for (var15 = 0; var15 < var3; ++var15) { - for (var16 = 0; var16 < var3; ++var16) { + for (var15 = 0; var15 < var3; ++var15) { // L: 102 + for (var16 = 0; var16 < var3; ++var16) { // L: 103 this.pixels[var14++] = var11[var10[(var16 << 1) + (var15 << 1 << 7)] & 255]; } } } } - if (var13 == 1) { + if (var13 == 1) { // L: 110 } - if (var13 == 2) { + if (var13 == 2) { // L: 111 } - if (var13 == 3) { + if (var13 == 3) { // L: 112 } } - return true; + return true; // L: 114 } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("reset") void reset() { - this.pixels = null; - } + this.pixels = null; // L: 118 + } // L: 119 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("animate") void animate(int var1) { - if (this.pixels != null) { + if (this.pixels != null) { // L: 122 short var2; int var3; int var4; @@ -211,65 +202,65 @@ public class Texture extends Node { int var6; int var7; int[] var10; - if (this.animationDirection == 1 || this.animationDirection == 3) { - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { + if (this.animationDirection == 1 || this.animationDirection == 3) { // L: 123 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 124 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { + if (this.pixels.length == 4096) { // L: 126 var2 = 64; } else { - var2 = 128; + var2 = 128; // L: 127 } - var3 = this.pixels.length; - var4 = var2 * this.animationSpeed * var1; - var5 = var3 - 1; - if (this.animationDirection == 1) { + var3 = this.pixels.length; // L: 128 + var4 = var2 * this.animationSpeed * var1; // L: 129 + var5 = var3 - 1; // L: 130 + if (this.animationDirection == 1) { // L: 131 var4 = -var4; } - for (var6 = 0; var6 < var3; ++var6) { - var7 = var6 + var4 & var5; - Texture_animatedPixels[var6] = this.pixels[var7]; + for (var6 = 0; var6 < var3; ++var6) { // L: 132 + var7 = var6 + var4 & var5; // L: 133 + Texture_animatedPixels[var6] = this.pixels[var7]; // L: 134 } - var10 = this.pixels; - this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; + var10 = this.pixels; // L: 136 + this.pixels = Texture_animatedPixels; // L: 137 + Texture_animatedPixels = var10; // L: 138 } - if (this.animationDirection == 2 || this.animationDirection == 4) { - if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { + if (this.animationDirection == 2 || this.animationDirection == 4) { // L: 140 + if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) { // L: 141 Texture_animatedPixels = new int[this.pixels.length]; } - if (this.pixels.length == 4096) { + if (this.pixels.length == 4096) { // L: 143 var2 = 64; } else { - var2 = 128; + var2 = 128; // L: 144 } - var3 = this.pixels.length; - var4 = this.animationSpeed * var1; - var5 = var2 - 1; - if (this.animationDirection == 2) { + var3 = this.pixels.length; // L: 145 + var4 = this.animationSpeed * var1; // L: 146 + var5 = var2 - 1; // L: 147 + if (this.animationDirection == 2) { // L: 148 var4 = -var4; } - for (var6 = 0; var6 < var3; var6 += var2) { - for (var7 = 0; var7 < var2; ++var7) { - int var8 = var6 + var7; - int var9 = var6 + (var7 + var4 & var5); - Texture_animatedPixels[var8] = this.pixels[var9]; + for (var6 = 0; var6 < var3; var6 += var2) { // L: 149 + for (var7 = 0; var7 < var2; ++var7) { // L: 150 + int var8 = var6 + var7; // L: 151 + int var9 = var6 + (var7 + var4 & var5); // L: 152 + Texture_animatedPixels[var8] = this.pixels[var9]; // L: 153 } } - var10 = this.pixels; - this.pixels = Texture_animatedPixels; - Texture_animatedPixels = var10; + var10 = this.pixels; // L: 156 + this.pixels = Texture_animatedPixels; // L: 157 + Texture_animatedPixels = var10; // L: 158 } } - } + } // L: 160 } diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java index 4f3d17783e..55b87fbee4 100644 --- a/runescape-client/src/main/java/TextureLoader.java +++ b/runescape-client/src/main/java/TextureLoader.java @@ -6,33 +6,33 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ey") @Implements("TextureLoader") public interface TextureLoader { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1948753683" + garbageValue = "-1265290789" ) @Export("getTexturePixels") int[] getTexturePixels(int var1); - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(II)I", - garbageValue = "1038437362" + garbageValue = "260599249" ) @Export("getAverageTextureRGB") int getAverageTextureRGB(int var1); - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "54" + descriptor = "(II)Z", + garbageValue = "168595235" ) - boolean vmethod3404(int var1); + boolean vmethod3396(int var1); - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "18" + descriptor = "(IS)Z", + garbageValue = "14506" ) @Export("isLowDetail") boolean isLowDetail(int var1); diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index a10d610e32..058737a39b 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -3,48 +3,49 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("du") +@ObfuscatedName("dt") @Implements("TextureProvider") public class TextureProvider implements TextureLoader { - @ObfuscatedName("y") - @Export("Tiles_lightness") - static int[] Tiles_lightness; - @ObfuscatedName("m") + @ObfuscatedName("ri") + @ObfuscatedGetter( + intValue = 1518116289 + ) + static int field1561; + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "[Leo;" ) @Export("textures") Texture[] textures; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Ljp;" + descriptor = "Lji;" ) @Export("deque") NodeDeque deque; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1950202761 + intValue = 1194513141 ) @Export("capacity") int capacity; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 742782017 + intValue = 1829748835 ) @Export("remaining") int remaining; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("brightness") double brightness; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1900729685 + intValue = -436241833 ) @Export("textureSize") int textureSize; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lic;" ) @@ -55,403 +56,205 @@ public class TextureProvider implements TextureLoader { descriptor = "(Lic;Lic;IDI)V" ) public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) { - this.deque = new NodeDeque(); - this.remaining = 0; - this.brightness = 1.0D; - this.textureSize = 128; + this.deque = new NodeDeque(); // L: 9 + this.remaining = 0; // L: 11 + this.brightness = 1.0D; // L: 12 + this.textureSize = 128; // L: 13 this.archive = var2; this.capacity = var3; this.remaining = this.capacity; - this.brightness = var4; + this.brightness = var4; // L: 20 this.textureSize = var6; - int[] var7 = var1.getGroupFileIds(0); + int[] var7 = var1.getGroupFileIds(0); // L: 22 int var8 = var7.length; this.textures = new Texture[var1.getGroupFileCount(0)]; for (int var9 = 0; var9 < var8; ++var9) { - Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); + Buffer var10 = new Buffer(var1.takeFile(0, var7[var9])); // L: 26 this.textures[var7[var9]] = new Texture(var10); } - } + } // L: 29 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1846975444" + garbageValue = "861798052" ) @Export("getLoadedPercentage") public int getLoadedPercentage() { - int var1 = 0; - int var2 = 0; - Texture[] var3 = this.textures; + int var1 = 0; // L: 32 + int var2 = 0; // L: 33 + Texture[] var3 = this.textures; // L: 35 - for (int var4 = 0; var4 < var3.length; ++var4) { - Texture var5 = var3[var4]; - if (var5 != null && var5.fileIds != null) { - var1 += var5.fileIds.length; + for (int var4 = 0; var4 < var3.length; ++var4) { // L: 36 + Texture var5 = var3[var4]; // L: 37 + if (var5 != null && var5.fileIds != null) { // L: 39 + var1 += var5.fileIds.length; // L: 40 int[] var6 = var5.fileIds; - for (int var7 = 0; var7 < var6.length; ++var7) { - int var8 = var6[var7]; - if (this.archive.method4359(var8)) { - ++var2; + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 43 + int var8 = var6[var7]; // L: 44 + if (this.archive.method4251(var8)) { // L: 46 + ++var2; // L: 47 } } } } - if (var1 == 0) { + if (var1 == 0) { // L: 55 return 0; } else { - return var2 * 100 / var1; + return var2 * 100 / var1; // L: 56 } } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("setBrightness") public void setBrightness(double var1) { - this.brightness = var1; - this.clear(); - } + this.brightness = var1; // L: 60 + this.clear(); // L: 61 + } // L: 62 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(II)[I", - garbageValue = "1948753683" + garbageValue = "-1265290789" ) @Export("getTexturePixels") public int[] getTexturePixels(int var1) { - Texture var2 = this.textures[var1]; - if (var2 != null) { - if (var2.pixels != null) { - this.deque.addLast(var2); - var2.isLoaded = true; - return var2.pixels; + Texture var2 = this.textures[var1]; // L: 65 + if (var2 != null) { // L: 66 + if (var2.pixels != null) { // L: 67 + this.deque.addLast(var2); // L: 68 + var2.isLoaded = true; // L: 69 + return var2.pixels; // L: 70 } - boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); - if (var3) { - if (this.remaining == 0) { - Texture var4 = (Texture)this.deque.removeFirst(); - var4.reset(); + boolean var3 = var2.load(this.brightness, this.textureSize, this.archive); // L: 72 + if (var3) { // L: 73 + if (this.remaining == 0) { // L: 74 + Texture var4 = (Texture)this.deque.removeFirst(); // L: 75 + var4.reset(); // L: 76 } else { - --this.remaining; + --this.remaining; // L: 78 } - this.deque.addLast(var2); - var2.isLoaded = true; - return var2.pixels; + this.deque.addLast(var2); // L: 79 + var2.isLoaded = true; // L: 80 + return var2.pixels; // L: 81 + } + } + + return null; // L: 84 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "260599249" + ) + @Export("getAverageTextureRGB") + public int getAverageTextureRGB(int var1) { + return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; // L: 88 89 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "168595235" + ) + public boolean vmethod3396(int var1) { + return this.textures[var1].field1647; // L: 93 + } + + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "14506" + ) + @Export("isLowDetail") + public boolean isLowDetail(int var1) { + return this.textureSize == 64; // L: 97 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "8" + ) + @Export("clear") + public void clear() { + for (int var1 = 0; var1 < this.textures.length; ++var1) { // L: 101 + if (this.textures[var1] != null) { // L: 102 + this.textures[var1].reset(); + } + } + + this.deque = new NodeDeque(); // L: 104 + this.remaining = this.capacity; // L: 105 + } // L: 106 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-736148510" + ) + @Export("animate") + public void animate(int var1) { + for (int var2 = 0; var2 < this.textures.length; ++var2) { // L: 109 + Texture var3 = this.textures[var2]; // L: 110 + if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) { // L: 111 + var3.animate(var1); // L: 112 + var3.isLoaded = false; // L: 113 + } + } + + } // L: 116 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)Z", + garbageValue = "194887508" + ) + public static boolean method2876(int var0) { + return var0 >= WorldMapDecorationType.field2760.id && var0 <= WorldMapDecorationType.field2757.id || var0 == WorldMapDecorationType.field2761.id; // L: 42 + } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "([Lgq;II)Lgq;", + garbageValue = "1374231902" + ) + @Export("findEnumerated") + public static Enumerated findEnumerated(Enumerated[] var0, int var1) { + Enumerated[] var2 = var0; // L: 17 + + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 18 + Enumerated var4 = var2[var3]; // L: 19 + if (var1 == var4.rsOrdinal()) { + return var4; // L: 21 } } return null; } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1038437362" + descriptor = "(IB)Lij;", + garbageValue = "38" ) - @Export("getAverageTextureRGB") - public int getAverageTextureRGB(int var1) { - return this.textures[var1] != null ? this.textures[var1].averageRGB : 0; - } + public static GameBuild method2863(int var0) { + GameBuild[] var1 = IgnoreList.method5182(); // L: 23 - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "54" - ) - public boolean vmethod3404(int var1) { - return this.textures[var1].field1650; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "18" - ) - @Export("isLowDetail") - public boolean isLowDetail(int var1) { - return this.textureSize == 64; - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-426854674" - ) - @Export("clear") - public void clear() { - for (int var1 = 0; var1 < this.textures.length; ++var1) { - if (this.textures[var1] != null) { - this.textures[var1].reset(); + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 24 + GameBuild var3 = var1[var2]; // L: 25 + if (var0 == var3.buildId) { + return var3; // L: 27 } } - this.deque = new NodeDeque(); - this.remaining = this.capacity; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "245586965" - ) - @Export("animate") - public void animate(int var1) { - for (int var2 = 0; var2 < this.textures.length; ++var2) { - Texture var3 = this.textures[var2]; - if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) { - var3.animate(var1); - var3.isLoaded = false; - } - } - - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1729691421" - ) - static int method2888(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.OC_NAME) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = KitDefinition.ItemDefinition_get(var3).name; - return 1; - } else { - int var4; - ItemDefinition var5; - if (var0 == ScriptOpcodes.OC_OP) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var5 = KitDefinition.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_IOP) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var5 = KitDefinition.ItemDefinition_get(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_COST) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = KitDefinition.ItemDefinition_get(var3).price; - return 1; - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = KitDefinition.ItemDefinition_get(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemDefinition var6; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var6 = KitDefinition.ItemDefinition_get(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var6 = KitDefinition.ItemDefinition_get(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = KitDefinition.ItemDefinition_get(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var6 = KitDefinition.ItemDefinition_get(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var6 = KitDefinition.ItemDefinition_get(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_FIND) { - String var7 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - SpriteMask.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = TileItemPile.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - ArchiveLoader.foundItemIndex = 0; - return 1; - } else { - return 2; - } - } else { - if (WorldMapScaleHandler.foundItemIds != null && ArchiveLoader.foundItemIndex < TileItemPile.foundItemIdCount) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapScaleHandler.foundItemIds[++ArchiveLoader.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } - } - } - } - - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)I", - garbageValue = "1974416966" - ) - public static int method2873(String var0) { - return var0.length() + 2; - } - - @ObfuscatedName("gz") - @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "-64" - ) - static final void method2900(int var0, int var1, boolean var2) { - if (!var2 || var0 != WorldMapCacheName.field328 || class22.field104 != var1) { - WorldMapCacheName.field328 = var0; - class22.field104 = var1; - ClientPreferences.updateGameState(25); - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait.", true); - int var3 = class182.baseX; - int var4 = SecureRandomFuture.baseY; - class182.baseX = (var0 - 6) * 8; - SecureRandomFuture.baseY = (var1 - 6) * 8; - int var5 = class182.baseX - var3; - int var6 = SecureRandomFuture.baseY - var4; - var3 = class182.baseX; - var4 = SecureRandomFuture.baseY; - - int var7; - int var9; - int[] var10000; - for (var7 = 0; var7 < 32768; ++var7) { - NPC var8 = Client.npcs[var7]; - if (var8 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var8.pathX; - var10000[var9] -= var5; - var10000 = var8.pathY; - var10000[var9] -= var6; - } - - var8.x -= var5 * 128; - var8.y -= var6 * 128; - } - } - - for (var7 = 0; var7 < 2048; ++var7) { - Player var21 = Client.players[var7]; - if (var21 != null) { - for (var9 = 0; var9 < 10; ++var9) { - var10000 = var21.pathX; - var10000[var9] -= var5; - var10000 = var21.pathY; - var10000[var9] -= var6; - } - - var21.x -= var5 * 128; - var21.y -= var6 * 128; - } - } - - byte var20 = 0; - byte var18 = 104; - byte var22 = 1; - if (var5 < 0) { - var20 = 103; - var18 = -1; - var22 = -1; - } - - byte var10 = 0; - byte var11 = 104; - byte var12 = 1; - if (var6 < 0) { - var10 = 103; - var11 = -1; - var12 = -1; - } - - int var14; - for (int var13 = var20; var18 != var13; var13 += var22) { - for (var14 = var10; var11 != var14; var14 += var12) { - int var15 = var13 + var5; - int var16 = var6 + var14; - - for (int var17 = 0; var17 < 4; ++var17) { - if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { - Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; - } else { - Client.groundItems[var17][var13][var14] = null; - } - } - } - } - - for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) { - var19.x -= var5; - var19.y -= var6; - if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) { - var19.remove(); - } - } - - if (Client.destinationX != 0) { - Client.destinationX -= var5; - Client.destinationY -= var6; - } - - Client.soundEffectCount = 0; - Client.isCameraLocked = false; - MouseHandler.cameraX -= var5 << 7; - ObjectSound.cameraZ -= var6 << 7; - class225.oculusOrbFocalPointX -= var5 << 7; - HealthBarDefinition.oculusOrbFocalPointY -= var6 << 7; - Client.field937 = -1; - Client.graphicsObjects.clear(); - Client.projectiles.clear(); - - for (var14 = 0; var14 < 4; ++var14) { - Client.collisionMaps[var14].clear(); - } - - } + return null; // L: 31 } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index d7b053bc8a..540e28cf4c 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -4,164 +4,145 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ea") +@ObfuscatedName("ek") @Implements("Tile") public final class Tile extends Node { - @ObfuscatedName("df") + @ObfuscatedName("sg") @ObfuscatedSignature( - descriptor = "Lig;" + descriptor = "Lce;" ) - @Export("archive9") - static Archive archive9; - @ObfuscatedName("m") + @Export("clientPreferences") + static ClientPreferences clientPreferences; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 7067627 - ) - @Export("plane") - int plane; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1147939477 - ) - @Export("x") - int x; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -646787087 - ) - @Export("y") - int y; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -250018079 + intValue = -400770483 ) @Export("originalPlane") int originalPlane; - @ObfuscatedName("p") + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1404568893 + ) + @Export("plane") + int plane; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -378034661 + ) + @Export("x") + int x; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -266768933 + ) + @Export("y") + int y; + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lex;" + descriptor = "Lem;" ) @Export("paint") TilePaint paint; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Lej;" + descriptor = "Len;" ) @Export("model") TileModel model; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lez;" + descriptor = "Leb;" ) @Export("boundaryObject") BoundaryObject boundaryObject; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lep;" + descriptor = "Lex;" ) @Export("wallDecoration") WallDecoration wallDecoration; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Leu;" ) @Export("floorDecoration") FloorDecoration floorDecoration; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Ldj;" + descriptor = "Ldg;" ) @Export("tileItemPile") TileItemPile tileItemPile; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -149176885 + intValue = 240084109 ) @Export("gameObjectsCount") int gameObjectsCount; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[Lev;" + descriptor = "[Led;" ) @Export("gameObjects") GameObject[] gameObjects; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("gameObjectEdgeMasks") int[] gameObjectEdgeMasks; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1097023535 + intValue = -640534231 ) @Export("gameObjectsEdgeMask") int gameObjectsEdgeMask; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 432677957 + intValue = -1686983663 ) @Export("minPlane") int minPlane; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("drawPrimary") boolean drawPrimary; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("drawSecondary") boolean drawSecondary; - @ObfuscatedName("v") + @ObfuscatedName("y") @Export("drawGameObjects") boolean drawGameObjects; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = -1728513867 + intValue = 913733009 ) @Export("drawGameObjectEdges") int drawGameObjectEdges; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 1085148465 + intValue = -870351799 ) - int field1690; - @ObfuscatedName("l") + int field1678; + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = -1172057717 + intValue = -1246325149 ) - int field1691; - @ObfuscatedName("t") + int field1687; + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -881770719 + intValue = 465843851 ) - int field1692; - @ObfuscatedName("x") + int field1689; + @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lea;" + descriptor = "Lek;" ) @Export("linkedBelowTile") Tile linkedBelowTile; Tile(int var1, int var2, int var3) { - this.gameObjects = new GameObject[5]; - this.gameObjectEdgeMasks = new int[5]; - this.gameObjectsEdgeMask = 0; - this.originalPlane = this.plane = var1; - this.x = var2; - this.y = var3; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)Lgj;", - garbageValue = "3" - ) - public static PacketBufferNode method2990() { - PacketBufferNode var0; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { - var0 = new PacketBufferNode(); - } else { - var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } - - var0.clientPacket = null; - var0.clientPacketLength = 0; - var0.packetBuffer = new PacketBuffer(5000); - return var0; - } + this.gameObjects = new GameObject[5]; // L: 17 + this.gameObjectEdgeMasks = new int[5]; // L: 18 + this.gameObjectsEdgeMask = 0; // L: 19 + this.originalPlane = this.plane = var1; // L: 31 + this.x = var2; // L: 32 + this.y = var3; // L: 33 + } // L: 34 } diff --git a/runescape-client/src/main/java/TileItem.java b/runescape-client/src/main/java/TileItem.java index d1af4c6662..f739b52ae4 100644 --- a/runescape-client/src/main/java/TileItem.java +++ b/runescape-client/src/main/java/TileItem.java @@ -1,135 +1,236 @@ +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cf") +@ObfuscatedName("ch") @Implements("TileItem") public final class TileItem extends Entity { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2027317293 + intValue = 652464565 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1677245385 + intValue = 417363545 ) @Export("quantity") int quantity; TileItem() { - } + } // L: 11 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)Lef;", - garbageValue = "1832696685" + descriptor = "(I)Ler;", + garbageValue = "-2026237468" ) @Export("getModel") protected final Model getModel() { - return KitDefinition.ItemDefinition_get(this.id).getModel(this.quantity); + return GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(this.id).getModel(this.quantity); // L: 14 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lic;II)Lhi;", - garbageValue = "-1379318821" + descriptor = "(II)Lhq;", + garbageValue = "7632896" ) - static MusicPatch method2255(AbstractArchive var0, int var1) { - byte[] var2 = var0.takeFileFlat(var1); - return var2 == null ? null : new MusicPatch(var2); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lic;B)V", - garbageValue = "14" - ) - public static void method2256(AbstractArchive var0) { - VarpDefinition.VarpDefinition_archive = var0; - VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "16711935" - ) - @Export("isCharPrintable") - public static boolean isCharPrintable(char var0) { - if (var0 >= ' ' && var0 <= '~') { - return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; + @Export("getWidget") + public static Widget getWidget(int var0) { + int var1 = var0 >> 16; // L: 186 + int var2 = var0 & 65535; // L: 187 + if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { // L: 188 + boolean var3 = WorldMapSprite.loadInterface(var1); // L: 189 + if (!var3) { // L: 190 + return null; + } } + + return Widget.Widget_interfaceComponents[var1][var2]; // L: 192 } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-145657229" + descriptor = "(IB)Lld;", + garbageValue = "86" ) - public static int method2259(int var0) { - if (var0 > 0) { - return 1; + public static PrivateChatMode method2202(int var0) { + PrivateChatMode[] var1 = SpotAnimationDefinition.method4518(); // L: 20 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21 + PrivateChatMode var3 = var1[var2]; // L: 22 + if (var0 == var3.field3824) { + return var3; // L: 24 + } + } + + return null; // L: 28 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(CLgn;I)C", + garbageValue = "-2022621554" + ) + @Export("standardizeChar") + static char standardizeChar(char var0, Language var1) { + if (var0 >= 192 && var0 <= 255) { // L: 93 + if (var0 >= 192 && var0 <= 198) { // L: 94 + return 'A'; + } + + if (var0 == 199) { // L: 95 + return 'C'; + } + + if (var0 >= 200 && var0 <= 203) { // L: 96 + return 'E'; + } + + if (var0 >= 204 && var0 <= 207) { // L: 97 + return 'I'; + } + + if (var0 == 209 && var1 != Language.Language_ES) { // L: 98 + return 'N'; + } + + if (var0 >= 210 && var0 <= 214) { // L: 99 + return 'O'; + } + + if (var0 >= 217 && var0 <= 220) { // L: 100 + return 'U'; + } + + if (var0 == 221) { // L: 101 + return 'Y'; + } + + if (var0 == 223) { // L: 102 + return 's'; + } + + if (var0 >= 224 && var0 <= 230) { // L: 103 + return 'a'; + } + + if (var0 == 231) { // L: 104 + return 'c'; + } + + if (var0 >= 232 && var0 <= 235) { // L: 105 + return 'e'; + } + + if (var0 >= 236 && var0 <= 239) { + return 'i'; // L: 106 + } + + if (var0 == 241 && var1 != Language.Language_ES) { // L: 107 + return 'n'; + } + + if (var0 >= 242 && var0 <= 246) { // L: 108 + return 'o'; + } + + if (var0 >= 249 && var0 <= 252) { // L: 109 + return 'u'; + } + + if (var0 == 253 || var0 == 255) { // L: 110 + return 'y'; + } + } + + if (var0 == 338) { // L: 112 + return 'O'; + } else if (var0 == 339) { // L: 113 + return 'o'; + } else if (var0 == 376) { // L: 114 + return 'Y'; } else { - return var0 < 0 ? -1 : 0; + return var0; // L: 115 } } - @ObfuscatedName("fs") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "748561937" - ) - static final void method2260() { - int var0 = Players.Players_count; - int[] var1 = Players.Players_indices; - - for (int var2 = 0; var2 < var0; ++var2) { - Player var3 = Client.players[var1[var2]]; - if (var3 != null) { - TaskHandler.updateActorSequence(var3, 1); - } - } - + @ObfuscatedName("t") + @Export("Entity_unpackSceneX") + public static int Entity_unpackSceneX(long var0) { + return (int)(var0 >>> 0 & 127L); } - @ObfuscatedName("gp") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(IIIIIIIIII)V", - garbageValue = "393644147" + descriptor = "(IIB)I", + garbageValue = "1" ) - @Export("updatePendingSpawn") - static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - PendingSpawn var9 = null; + static final int method2206(int var0, int var1) { + int var2 = GrandExchangeOfferOwnWorldComparator.method1334(var0 - 1, var1 - 1) + GrandExchangeOfferOwnWorldComparator.method1334(var0 + 1, var1 - 1) + GrandExchangeOfferOwnWorldComparator.method1334(var0 - 1, 1 + var1) + GrandExchangeOfferOwnWorldComparator.method1334(var0 + 1, var1 + 1); // L: 849 + int var3 = GrandExchangeOfferOwnWorldComparator.method1334(var0 - 1, var1) + GrandExchangeOfferOwnWorldComparator.method1334(1 + var0, var1) + GrandExchangeOfferOwnWorldComparator.method1334(var0, var1 - 1) + GrandExchangeOfferOwnWorldComparator.method1334(var0, var1 + 1); // L: 850 + int var4 = GrandExchangeOfferOwnWorldComparator.method1334(var0, var1); // L: 851 + return var2 / 16 + var3 / 8 + var4 / 4; // L: 852 + } - for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { - var9 = var10; - break; + @ObfuscatedName("l") + @ObfuscatedSignature( + descriptor = "(Lfo;III)Ldr;", + garbageValue = "-1837543032" + ) + public static final PcmPlayer method2205(TaskHandler var0, int var1, int var2) { + if (PcmPlayer.field1447 == 0) { // L: 52 + throw new IllegalStateException(); + } else if (var1 >= 0 && var1 < 2) { // L: 53 + if (var2 < 256) { // L: 54 + var2 = 256; } - } - if (var9 == null) { - var9 = new PendingSpawn(); - var9.plane = var0; - var9.type = var3; - var9.x = var1; - var9.y = var2; - MusicPatchNode2.method3819(var9); - Client.pendingSpawns.addFirst(var9); - } + try { + PcmPlayer var3 = class300.pcmPlayerProvider.player(); // L: 56 + var3.samples = new int[256 * (PcmPlayer.PcmPlayer_stereo ? 2 : 1)]; // L: 57 + var3.field1438 = var2; // L: 58 + var3.init(); // L: 59 + var3.capacity = (var2 & -1024) + 1024; // L: 60 + if (var3.capacity > 16384) { // L: 61 + var3.capacity = 16384; + } - var9.id = var4; - var9.field962 = var5; - var9.orientation = var6; - var9.delay = var7; - var9.hitpoints = var8; + var3.open(var3.capacity); // L: 62 + if (Decimator.field1491 > 0 && class1.soundSystem == null) { // L: 63 + class1.soundSystem = new SoundSystem(); // L: 64 + PcmPlayer.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 65 + PcmPlayer.soundSystemExecutor.scheduleAtFixedRate(class1.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 66 + } + + if (class1.soundSystem != null) { // L: 68 + if (class1.soundSystem.players[var1] != null) { // L: 69 + throw new IllegalArgumentException(); + } + + class1.soundSystem.players[var1] = var3; // L: 70 + } + + return var3; // L: 72 + } catch (Throwable var4) { // L: 74 + return new PcmPlayer(); // L: 75 + } + } else { + throw new IllegalArgumentException(); + } + } + + @ObfuscatedName("ga") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "41" + ) + static boolean method2208() { + return (Client.drawPlayerNames & 8) != 0; // L: 4409 } } diff --git a/runescape-client/src/main/java/TileItemPile.java b/runescape-client/src/main/java/TileItemPile.java index 0ef232313f..9e395ab056 100644 --- a/runescape-client/src/main/java/TileItemPile.java +++ b/runescape-client/src/main/java/TileItemPile.java @@ -1,332 +1,61 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("dj") +@ObfuscatedName("dg") @Implements("TileItemPile") public final class TileItemPile { - @ObfuscatedName("sa") - @ObfuscatedGetter( - intValue = 1773920485 - ) - @Export("foundItemIdCount") - static int foundItemIdCount; - @ObfuscatedName("al") - @Export("null_string") - protected static String null_string; - @ObfuscatedName("kc") - @ObfuscatedGetter( - intValue = -1785150485 - ) - @Export("Client_plane") - static int Client_plane; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lez;" + ) + @Export("first") + Entity first; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 715274953 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -987294249 + ) + @Export("x") + int x; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1805580001 + ) + @Export("y") + int y; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lez;" ) @Export("second") Entity second; @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1942211729 - ) - @Export("tileHeight") - int tileHeight; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = 548225741 - ) - @Export("x") - int x; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1448931095 - ) - @Export("y") - int y; - @ObfuscatedName("p") @ObfuscatedSignature( - descriptor = "Lel;" - ) - @Export("first") - Entity first; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lez;" ) @Export("third") Entity third; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = 8936593533857120715L + longValue = -7395510386628271631L ) @Export("tag") long tag; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1184518539 + intValue = -863180021 ) @Export("height") int height; TileItemPile() { - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;S)Ljava/lang/String;", - garbageValue = "256" - ) - public static String method2903(String var0) { - int var1 = var0.length(); - char[] var2 = new char[var1]; - byte var3 = 2; - - for (int var4 = 0; var4 < var1; ++var4) { - char var5 = var0.charAt(var4); - if (var3 == 0) { - var5 = Character.toLowerCase(var5); - } else if (var3 == 2 || Character.isUpperCase(var5)) { - var5 = class296.method5464(var5); - } - - if (Character.isLetter(var5)) { - var3 = 0; - } else if (var5 != '.' && var5 != '?' && var5 != '!') { - if (Character.isSpaceChar(var5)) { - if (var3 != 2) { - var3 = 1; - } - } else { - var3 = 1; - } - } else { - var3 = 2; - } - - var2[var4] = var5; - } - - return new String(var2); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1884532154" - ) - static final void method2904(String var0) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; - var10000 = var10000.append("Please remove ").append(var0); - var10001 = null; - String var1 = var10000.append(" from your friend list first").toString(); - ObjectSound.addGameMessage(30, "", var1); - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(ILcs;ZS)I", - garbageValue = "1024" - ) - static int method2902(int var0, Script var1, boolean var2) { - String var3; - int var4; - if (var0 == ScriptOpcodes.APPEND_NUM) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3 + var4; - return 1; - } else { - String var9; - if (var0 == ScriptOpcodes.APPEND) { - WorldMapEvent.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3 + class298.intToString(var4, true); - return 1; - } else if (var0 == ScriptOpcodes.LOWERCASE) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; - } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - long var11 = (11745L + (long)var10) * 86400000L; - Interpreter.Interpreter_calendar.setTime(new Date(var11)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var16 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8; - return 1; - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { - if (var0 == ScriptOpcodes.TOSTRING) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == ScriptOpcodes.COMPARE) { - WorldMapEvent.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = TileItem.method2259(FriendLoginUpdate.compareStrings(Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1], UserComparator9.clientLanguage)); - return 1; - } else { - int var5; - byte[] var13; - Font var14; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - UrlRequester.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var13 = GameBuild.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - UrlRequester.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - var13 = GameBuild.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { - WorldMapEvent.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var9; - } - - return 1; - } else if (var0 == ScriptOpcodes.ESCAPE) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3 + (char)var4; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = TileItem.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Varps.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = GameObject.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class296.isDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.SUBSTRING) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - UrlRequester.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - StringBuilder var17 = new StringBuilder(var3.length()); - boolean var15 = false; - - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var15 = true; - } else if (var7 == '>') { - var15 = false; - } else if (!var15) { - var17.append(var7); - } - } - - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var17.toString(); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - WorldMapEvent.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } else if (var0 == ScriptOpcodes.UPPERCASE) { - var3 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else { - return 2; - } - } - } else { - WorldMapEvent.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[WorldMapEvent.Interpreter_stringStackSize + 1]; - if (class60.localPlayer.appearance != null && class60.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3; - } - - return 1; - } - } - } - } - - @ObfuscatedName("gn") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-907670239" - ) - static final void method2901() { - Client.field787 = 0; - int var0 = (class60.localPlayer.x >> 7) + class182.baseX; - int var1 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; - if (var0 >= 3053 && var0 <= 3156 && var1 >= 3056 && var1 <= 3136) { - Client.field787 = 1; - } - - if (var0 >= 3072 && var0 <= 3118 && var1 >= 9492 && var1 <= 9535) { - Client.field787 = 1; - } - - if (Client.field787 == 1 && var0 >= 3139 && var0 <= 3199 && var1 >= 3008 && var1 <= 3062) { - Client.field787 = 0; - } - - } + } // L: 13 } diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java index ce21dcf4f7..9cd6cc561c 100644 --- a/runescape-client/src/main/java/TileModel.java +++ b/runescape-client/src/main/java/TileModel.java @@ -2,102 +2,102 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ej") +@ObfuscatedName("en") @Implements("TileModel") public final class TileModel { - @ObfuscatedName("r") - static int[] field1632; - @ObfuscatedName("s") - static int[] field1625; + @ObfuscatedName("c") + static int[] field1626; + @ObfuscatedName("f") + static int[] field1627; + @ObfuscatedName("y") + static int[] field1628; @ObfuscatedName("v") - static int[] field1634; - @ObfuscatedName("d") - static int[] field1635; - @ObfuscatedName("e") - static int[] field1636; - @ObfuscatedName("l") - static final int[][] field1637; - @ObfuscatedName("t") - static final int[][] field1626; - @ObfuscatedName("m") + static int[] field1624; + @ObfuscatedName("j") + static int[] field1630; + @ObfuscatedName("r") + static final int[][] field1632; + @ObfuscatedName("u") + static final int[][] field1616; + @ObfuscatedName("z") @Export("vertexX") int[] vertexX; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("vertexY") int[] vertexY; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("vertexZ") int[] vertexZ; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("triangleColorA") int[] triangleColorA; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("triangleColorB") int[] triangleColorB; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("triangleColorC") int[] triangleColorC; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("faceX") int[] faceX; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("faceY") int[] faceY; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("faceZ") int[] faceZ; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("triangleTextureId") int[] triangleTextureId; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("isFlat") boolean isFlat; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("shape") int shape; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("rotation") int rotation; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("underlayRgb") int underlayRgb; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("overlayRgb") int overlayRgb; static { - field1632 = new int[6]; - field1625 = new int[6]; - field1634 = new int[6]; - field1635 = new int[6]; - field1636 = new int[6]; - field1637 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; - field1626 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; + field1626 = new int[6]; // L: 21 + field1627 = new int[6]; // L: 22 + field1628 = new int[6]; // L: 23 + field1624 = new int[6]; // L: 24 + field1630 = new int[6]; // L: 25 + field1632 = new int[][]{{1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 6}, {1, 3, 5, 7, 2, 6}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 2, 8}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 11, 12}, {1, 3, 5, 7, 13, 14}}; // L: 26 + field1616 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41 } TileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) { - this.isFlat = true; - if (var7 != var6 || var8 != var6 || var9 != var6) { + this.isFlat = true; // L: 16 + if (var7 != var6 || var8 != var6 || var9 != var6) { // L: 58 this.isFlat = false; } - this.shape = var1; - this.rotation = var2; - this.underlayRgb = var18; - this.overlayRgb = var19; - short var20 = 128; - int var21 = var20 / 2; - int var22 = var20 / 4; - int var23 = var20 * 3 / 4; - int[] var24 = field1637[var1]; - int var25 = var24.length; - this.vertexX = new int[var25]; - this.vertexY = new int[var25]; - this.vertexZ = new int[var25]; - int[] var26 = new int[var25]; - int[] var27 = new int[var25]; - int var28 = var20 * var4; - int var29 = var5 * var20; + this.shape = var1; // L: 59 + this.rotation = var2; // L: 60 + this.underlayRgb = var18; // L: 61 + this.overlayRgb = var19; // L: 62 + short var20 = 128; // L: 63 + int var21 = var20 / 2; // L: 64 + int var22 = var20 / 4; // L: 65 + int var23 = var20 * 3 / 4; // L: 66 + int[] var24 = field1632[var1]; // L: 67 + int var25 = var24.length; // L: 68 + this.vertexX = new int[var25]; // L: 69 + this.vertexY = new int[var25]; // L: 70 + this.vertexZ = new int[var25]; // L: 71 + int[] var26 = new int[var25]; // L: 72 + int[] var27 = new int[var25]; // L: 73 + int var28 = var20 * var4; // L: 74 + int var29 = var5 * var20; // L: 75 int var31; int var32; @@ -105,204 +105,204 @@ public final class TileModel { int var34; int var35; int var36; - for (int var30 = 0; var30 < var25; ++var30) { - var31 = var24[var30]; - if ((var31 & 1) == 0 && var31 <= 8) { + for (int var30 = 0; var30 < var25; ++var30) { // L: 76 + var31 = var24[var30]; // L: 77 + if ((var31 & 1) == 0 && var31 <= 8) { // L: 78 var31 = (var31 - var2 - var2 - 1 & 7) + 1; } - if (var31 > 8 && var31 <= 12) { + if (var31 > 8 && var31 <= 12) { // L: 79 var31 = (var31 - 9 - var2 & 3) + 9; } - if (var31 > 12 && var31 <= 16) { + if (var31 > 12 && var31 <= 16) { // L: 80 var31 = (var31 - 13 - var2 & 3) + 13; } - if (var31 == 1) { - var32 = var28; - var33 = var29; - var34 = var6; - var35 = var10; - var36 = var14; - } else if (var31 == 2) { - var32 = var28 + var21; - var33 = var29; - var34 = var7 + var6 >> 1; - var35 = var11 + var10 >> 1; - var36 = var15 + var14 >> 1; - } else if (var31 == 3) { - var32 = var28 + var20; - var33 = var29; - var34 = var7; - var35 = var11; - var36 = var15; - } else if (var31 == 4) { - var32 = var28 + var20; - var33 = var29 + var21; - var34 = var8 + var7 >> 1; - var35 = var11 + var12 >> 1; - var36 = var15 + var16 >> 1; - } else if (var31 == 5) { - var32 = var28 + var20; - var33 = var29 + var20; - var34 = var8; - var35 = var12; - var36 = var16; - } else if (var31 == 6) { - var32 = var28 + var21; - var33 = var29 + var20; - var34 = var8 + var9 >> 1; - var35 = var13 + var12 >> 1; - var36 = var17 + var16 >> 1; - } else if (var31 == 7) { - var32 = var28; - var33 = var29 + var20; - var34 = var9; - var35 = var13; - var36 = var17; - } else if (var31 == 8) { - var32 = var28; - var33 = var29 + var21; - var34 = var9 + var6 >> 1; - var35 = var13 + var10 >> 1; - var36 = var17 + var14 >> 1; - } else if (var31 == 9) { - var32 = var28 + var21; - var33 = var29 + var22; - var34 = var7 + var6 >> 1; - var35 = var11 + var10 >> 1; - var36 = var15 + var14 >> 1; - } else if (var31 == 10) { - var32 = var28 + var23; - var33 = var29 + var21; - var34 = var8 + var7 >> 1; - var35 = var11 + var12 >> 1; - var36 = var15 + var16 >> 1; - } else if (var31 == 11) { - var32 = var28 + var21; - var33 = var29 + var23; - var34 = var8 + var9 >> 1; - var35 = var13 + var12 >> 1; - var36 = var17 + var16 >> 1; - } else if (var31 == 12) { - var32 = var28 + var22; - var33 = var29 + var21; - var34 = var9 + var6 >> 1; - var35 = var13 + var10 >> 1; - var36 = var17 + var14 >> 1; - } else if (var31 == 13) { - var32 = var28 + var22; - var33 = var29 + var22; - var34 = var6; - var35 = var10; - var36 = var14; - } else if (var31 == 14) { - var32 = var28 + var23; - var33 = var29 + var22; - var34 = var7; - var35 = var11; - var36 = var15; - } else if (var31 == 15) { - var32 = var28 + var23; - var33 = var29 + var23; - var34 = var8; - var35 = var12; - var36 = var16; + if (var31 == 1) { // L: 86 + var32 = var28; // L: 87 + var33 = var29; // L: 88 + var34 = var6; // L: 89 + var35 = var10; // L: 90 + var36 = var14; // L: 91 + } else if (var31 == 2) { // L: 93 + var32 = var28 + var21; // L: 94 + var33 = var29; // L: 95 + var34 = var7 + var6 >> 1; // L: 96 + var35 = var11 + var10 >> 1; // L: 97 + var36 = var15 + var14 >> 1; // L: 98 + } else if (var31 == 3) { // L: 100 + var32 = var28 + var20; // L: 101 + var33 = var29; // L: 102 + var34 = var7; // L: 103 + var35 = var11; // L: 104 + var36 = var15; // L: 105 + } else if (var31 == 4) { // L: 107 + var32 = var28 + var20; // L: 108 + var33 = var29 + var21; // L: 109 + var34 = var8 + var7 >> 1; // L: 110 + var35 = var11 + var12 >> 1; // L: 111 + var36 = var15 + var16 >> 1; // L: 112 + } else if (var31 == 5) { // L: 114 + var32 = var28 + var20; // L: 115 + var33 = var29 + var20; // L: 116 + var34 = var8; // L: 117 + var35 = var12; // L: 118 + var36 = var16; // L: 119 + } else if (var31 == 6) { // L: 121 + var32 = var28 + var21; // L: 122 + var33 = var29 + var20; // L: 123 + var34 = var8 + var9 >> 1; // L: 124 + var35 = var13 + var12 >> 1; // L: 125 + var36 = var17 + var16 >> 1; // L: 126 + } else if (var31 == 7) { // L: 128 + var32 = var28; // L: 129 + var33 = var29 + var20; // L: 130 + var34 = var9; // L: 131 + var35 = var13; // L: 132 + var36 = var17; // L: 133 + } else if (var31 == 8) { // L: 135 + var32 = var28; // L: 136 + var33 = var29 + var21; // L: 137 + var34 = var9 + var6 >> 1; // L: 138 + var35 = var13 + var10 >> 1; // L: 139 + var36 = var17 + var14 >> 1; // L: 140 + } else if (var31 == 9) { // L: 142 + var32 = var28 + var21; // L: 143 + var33 = var29 + var22; // L: 144 + var34 = var7 + var6 >> 1; // L: 145 + var35 = var11 + var10 >> 1; // L: 146 + var36 = var15 + var14 >> 1; // L: 147 + } else if (var31 == 10) { // L: 149 + var32 = var28 + var23; // L: 150 + var33 = var29 + var21; // L: 151 + var34 = var8 + var7 >> 1; // L: 152 + var35 = var11 + var12 >> 1; // L: 153 + var36 = var15 + var16 >> 1; // L: 154 + } else if (var31 == 11) { // L: 156 + var32 = var28 + var21; // L: 157 + var33 = var29 + var23; // L: 158 + var34 = var8 + var9 >> 1; // L: 159 + var35 = var13 + var12 >> 1; // L: 160 + var36 = var17 + var16 >> 1; // L: 161 + } else if (var31 == 12) { // L: 163 + var32 = var28 + var22; // L: 164 + var33 = var29 + var21; // L: 165 + var34 = var9 + var6 >> 1; // L: 166 + var35 = var13 + var10 >> 1; // L: 167 + var36 = var17 + var14 >> 1; // L: 168 + } else if (var31 == 13) { // L: 170 + var32 = var28 + var22; // L: 171 + var33 = var29 + var22; // L: 172 + var34 = var6; // L: 173 + var35 = var10; // L: 174 + var36 = var14; // L: 175 + } else if (var31 == 14) { // L: 177 + var32 = var28 + var23; // L: 178 + var33 = var29 + var22; // L: 179 + var34 = var7; // L: 180 + var35 = var11; // L: 181 + var36 = var15; // L: 182 + } else if (var31 == 15) { // L: 184 + var32 = var28 + var23; // L: 185 + var33 = var29 + var23; // L: 186 + var34 = var8; // L: 187 + var35 = var12; // L: 188 + var36 = var16; // L: 189 } else { - var32 = var28 + var22; - var33 = var29 + var23; - var34 = var9; - var35 = var13; - var36 = var17; + var32 = var28 + var22; // L: 192 + var33 = var29 + var23; // L: 193 + var34 = var9; // L: 194 + var35 = var13; // L: 195 + var36 = var17; // L: 196 } - this.vertexX[var30] = var32; - this.vertexY[var30] = var34; - this.vertexZ[var30] = var33; - var26[var30] = var35; - var27[var30] = var36; + this.vertexX[var30] = var32; // L: 198 + this.vertexY[var30] = var34; // L: 199 + this.vertexZ[var30] = var33; // L: 200 + var26[var30] = var35; // L: 201 + var27[var30] = var36; // L: 202 } - int[] var38 = field1626[var1]; - var31 = var38.length / 4; - this.faceX = new int[var31]; - this.faceY = new int[var31]; - this.faceZ = new int[var31]; - this.triangleColorA = new int[var31]; - this.triangleColorB = new int[var31]; - this.triangleColorC = new int[var31]; - if (var3 != -1) { + int[] var38 = field1616[var1]; // L: 204 + var31 = var38.length / 4; // L: 205 + this.faceX = new int[var31]; // L: 206 + this.faceY = new int[var31]; // L: 207 + this.faceZ = new int[var31]; // L: 208 + this.triangleColorA = new int[var31]; // L: 209 + this.triangleColorB = new int[var31]; // L: 210 + this.triangleColorC = new int[var31]; // L: 211 + if (var3 != -1) { // L: 212 this.triangleTextureId = new int[var31]; } - var32 = 0; + var32 = 0; // L: 213 - for (var33 = 0; var33 < var31; ++var33) { - var34 = var38[var32]; - var35 = var38[var32 + 1]; - var36 = var38[var32 + 2]; - int var37 = var38[var32 + 3]; - var32 += 4; - if (var35 < 4) { + for (var33 = 0; var33 < var31; ++var33) { // L: 214 + var34 = var38[var32]; // L: 215 + var35 = var38[var32 + 1]; // L: 216 + var36 = var38[var32 + 2]; // L: 217 + int var37 = var38[var32 + 3]; // L: 218 + var32 += 4; // L: 219 + if (var35 < 4) { // L: 220 var35 = var35 - var2 & 3; } - if (var36 < 4) { + if (var36 < 4) { // L: 221 var36 = var36 - var2 & 3; } - if (var37 < 4) { + if (var37 < 4) { // L: 222 var37 = var37 - var2 & 3; } - this.faceX[var33] = var35; - this.faceY[var33] = var36; - this.faceZ[var33] = var37; - if (var34 == 0) { - this.triangleColorA[var33] = var26[var35]; - this.triangleColorB[var33] = var26[var36]; - this.triangleColorC[var33] = var26[var37]; - if (this.triangleTextureId != null) { + this.faceX[var33] = var35; // L: 223 + this.faceY[var33] = var36; // L: 224 + this.faceZ[var33] = var37; // L: 225 + if (var34 == 0) { // L: 226 + this.triangleColorA[var33] = var26[var35]; // L: 227 + this.triangleColorB[var33] = var26[var36]; // L: 228 + this.triangleColorC[var33] = var26[var37]; // L: 229 + if (this.triangleTextureId != null) { // L: 230 this.triangleTextureId[var33] = -1; } } else { - this.triangleColorA[var33] = var27[var35]; - this.triangleColorB[var33] = var27[var36]; - this.triangleColorC[var33] = var27[var37]; - if (this.triangleTextureId != null) { + this.triangleColorA[var33] = var27[var35]; // L: 233 + this.triangleColorB[var33] = var27[var36]; // L: 234 + this.triangleColorC[var33] = var27[var37]; // L: 235 + if (this.triangleTextureId != null) { // L: 236 this.triangleTextureId[var33] = var3; } } } - var33 = var6; - var34 = var7; - if (var7 < var6) { + var33 = var6; // L: 239 + var34 = var7; // L: 240 + if (var7 < var6) { // L: 241 var33 = var7; } - if (var7 > var7) { + if (var7 > var7) { // L: 242 var34 = var7; } - if (var8 < var33) { + if (var8 < var33) { // L: 243 var33 = var8; } - if (var8 > var34) { + if (var8 > var34) { // L: 244 var34 = var8; } - if (var9 < var33) { + if (var9 < var33) { // L: 245 var33 = var9; } - if (var9 > var34) { + if (var9 > var34) { // L: 246 var34 = var9; } - var33 /= 14; - var34 /= 14; - } + var33 /= 14; // L: 247 + var34 /= 14; // L: 248 + } // L: 249 } diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 86076f649f..e6dabc6afd 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -1,112 +1,85 @@ -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ex") +@ObfuscatedName("em") @Implements("TilePaint") public final class TilePaint { - @ObfuscatedName("hw") - @ObfuscatedGetter( - intValue = -120739893 + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lio;" ) - @Export("cameraPitch") - static int cameraPitch; - @ObfuscatedName("m") + @Export("NetCache_currentResponse") + static NetFileRequest NetCache_currentResponse; + @ObfuscatedName("dt") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive13") + static Archive archive13; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -2010588443 + intValue = -533090373 ) @Export("swColor") int swColor; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 276331811 + intValue = -141428387 ) @Export("seColor") int seColor; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 249410369 + intValue = -2027106077 ) @Export("neColor") int neColor; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 911673263 + intValue = 1015841735 ) @Export("nwColor") int nwColor; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1767061331 + intValue = -1352493759 ) @Export("texture") int texture; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("isFlat") boolean isFlat; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1091728871 + intValue = 248691895 ) @Export("rgb") int rgb; TilePaint(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) { - this.isFlat = true; - this.swColor = var1; - this.seColor = var2; - this.neColor = var3; - this.nwColor = var4; - this.texture = var5; - this.rgb = var6; - this.isFlat = var7; - } + this.isFlat = true; // L: 9 + this.swColor = var1; // L: 13 + this.seColor = var2; // L: 14 + this.neColor = var3; // L: 15 + this.nwColor = var4; // L: 16 + this.texture = var5; // L: 17 + this.rgb = var6; // L: 18 + this.isFlat = var7; // L: 19 + } // L: 20 - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "1631719470" + descriptor = "(IZIZB)V", + garbageValue = "-24" ) - public static int method3187(int var0, int var1, int var2) { - var2 &= 3; - if (var2 == 0) { - return var0; - } else if (var2 == 1) { - return var1; - } else { - return var2 == 2 ? 7 - var0 : 7 - var1; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "215317048" - ) - public static void method3186() { - if (KeyHandler.KeyHandler_instance != null) { - synchronized(KeyHandler.KeyHandler_instance) { - KeyHandler.KeyHandler_instance = null; - } + @Export("sortWorldList") + static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { + if (AbstractByteArrayCopier.World_worlds != null) { // L: 171 + WorldMapRegion.doWorldSorting(0, AbstractByteArrayCopier.World_worlds.length - 1, var0, var1, var2, var3); // L: 172 } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "6" - ) - static void method3188() { - Iterator var0 = Messages.Messages_hashTable.iterator(); - - while (var0.hasNext()) { - Message var1 = (Message)var0.next(); - var1.clearIsFromIgnored(); - } - - } + } // L: 174 } diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java index 5a826b9960..b4613fc4b6 100644 --- a/runescape-client/src/main/java/Tiles.java +++ b/runescape-client/src/main/java/Tiles.java @@ -3,888 +3,185 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("bo") +@ObfuscatedName("bu") @Implements("Tiles") public final class Tiles { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("Tiles_heights") static int[][][] Tiles_heights; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("Tiles_renderFlags") static byte[][][] Tiles_renderFlags; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -896466609 + intValue = 210424451 ) @Export("Tiles_minPlane") static int Tiles_minPlane; - @ObfuscatedName("j") - static byte[][][] field530; - @ObfuscatedName("p") - static byte[][][] field524; - @ObfuscatedName("g") - static byte[][][] field525; - @ObfuscatedName("a") - static int[][] field526; - @ObfuscatedName("d") - static final int[] field527; - @ObfuscatedName("e") - static final int[] field528; - @ObfuscatedName("l") - static final int[] field523; @ObfuscatedName("t") - static final int[] field529; - @ObfuscatedName("x") - static final int[] field531; - @ObfuscatedName("b") - static final int[] field533; + static byte[][][] field528; @ObfuscatedName("i") + static byte[][][] field521; + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1455417145 + intValue = -1682339213 + ) + @Export("musicTrackVolume") + public static int musicTrackVolume; + @ObfuscatedName("m") + @Export("Tiles_hue") + static int[] Tiles_hue; + @ObfuscatedName("n") + @Export("Tiles_saturation") + static int[] Tiles_saturation; + @ObfuscatedName("v") + static final int[] field524; + @ObfuscatedName("j") + static final int[] field525; + @ObfuscatedName("r") + static final int[] field517; + @ObfuscatedName("u") + static final int[] field527; + @ObfuscatedName("p") + static final int[] field534; + @ObfuscatedName("b") + static final int[] field529; + @ObfuscatedName("l") + @ObfuscatedGetter( + intValue = -1084049787 ) static int field535; - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 342314257 + intValue = 96867879 ) static int field520; + @ObfuscatedName("bh") + @ObfuscatedSignature( + descriptor = "Lis;" + ) + static StudioGame field532; static { - Tiles_heights = new int[4][105][105]; - Tiles_renderFlags = new byte[4][104][104]; - Tiles_minPlane = 99; - field527 = new int[]{1, 2, 4, 8}; - field528 = new int[]{16, 32, 64, 128}; - field523 = new int[]{1, 0, -1, 0}; - field529 = new int[]{0, -1, 0, 1}; - field531 = new int[]{1, -1, -1, 1}; - field533 = new int[]{-1, -1, 1, 1}; - field535 = (int)(Math.random() * 17.0D) - 8; - field520 = (int)(Math.random() * 33.0D) - 16; + Tiles_heights = new int[4][105][105]; // L: 16 + Tiles_renderFlags = new byte[4][104][104]; // L: 17 + Tiles_minPlane = 99; // L: 18 + field524 = new int[]{1, 2, 4, 8}; + field525 = new int[]{16, 32, 64, 128}; + field517 = new int[]{1, 0, -1, 0}; + field527 = new int[]{0, -1, 0, 1}; + field534 = new int[]{1, -1, -1, 1}; + field529 = new int[]{-1, -1, 1, 1}; + field535 = (int)(Math.random() * 17.0D) - 8; // L: 40 + field520 = (int)(Math.random() * 33.0D) - 16; // L: 41 } - @ObfuscatedName("q") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "492291254" + descriptor = "(II)Lih;", + garbageValue = "1036194944" ) - @Export("parseInt") - public static int parseInt(CharSequence var0) { - return SecureRandomFuture.parseIntCustomRadix(var0, 10, true); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1908314929" - ) - public static void method1200(int var0) { - if (var0 != -1) { - if (UserComparator6.Widget_loadedInterfaces[var0]) { - Widget.Widget_archive.clearFilesGroup(var0); - if (Widget.Widget_interfaceComponents[var0] != null) { - boolean var1 = true; - - for (int var2 = 0; var2 < Widget.Widget_interfaceComponents[var0].length; ++var2) { - if (Widget.Widget_interfaceComponents[var0][var2] != null) { - if (Widget.Widget_interfaceComponents[var0][var2].type != 2) { - Widget.Widget_interfaceComponents[var0][var2] = null; - } else { - var1 = false; - } - } - } - - if (var1) { - Widget.Widget_interfaceComponents[var0] = null; - } - - UserComparator6.Widget_loadedInterfaces[var0] = false; - } - } - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(IIIZIZI)V", - garbageValue = "2067665025" - ) - @Export("doWorldSorting") - static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { - if (var0 < var1) { - int var6 = (var0 + var1) / 2; - int var7 = var0; - World var8 = class13.World_worlds[var6]; - class13.World_worlds[var6] = class13.World_worlds[var1]; - class13.World_worlds[var1] = var8; - - for (int var9 = var0; var9 < var1; ++var9) { - if (ItemContainer.method1225(class13.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { - World var10 = class13.World_worlds[var9]; - class13.World_worlds[var9] = class13.World_worlds[var7]; - class13.World_worlds[var7++] = var10; - } - } - - class13.World_worlds[var1] = class13.World_worlds[var7]; - class13.World_worlds[var7] = var8; - doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); - doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); - } - - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1760711343" - ) - static int method1199(int var0, Script var1, boolean var2) { - Widget var3; - if (var0 >= 2000) { - var0 -= 1000; - var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); + @Export("SpotAnimationDefinition_get") + public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { + SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); // L: 32 + if (var1 != null) { // L: 33 + return var1; } else { - var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - } - - String var4 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - int[] var5 = null; - if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') { - int var6 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (var6 > 0) { - for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]) { - } + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); // L: 34 + var1 = new SpotAnimationDefinition(); // L: 35 + var1.id = var0; // L: 36 + if (var2 != null) { // L: 37 + var1.decode(new Buffer(var2)); } - var4 = var4.substring(0, var4.length() - 1); + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); // L: 38 + return var1; // L: 39 } - - Object[] var8 = new Object[var4.length() + 1]; - - int var7; - for (var7 = var8.length - 1; var7 >= 1; --var7) { - if (var4.charAt(var7 - 1) == 's') { - var8[var7] = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - } else { - var8[var7] = new Integer(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - } - } - - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (var7 != -1) { - var8[0] = new Integer(var7); - } else { - var8 = null; - } - - if (var0 == ScriptOpcodes.CC_SETONCLICK) { - var3.onClick = var8; - } else if (var0 == ScriptOpcodes.CC_SETONHOLD) { - var3.onHold = var8; - } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) { - var3.onRelease = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) { - var3.onMouseOver = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) { - var3.onMouseLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAG) { - var3.onDrag = var8; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) { - var3.onTargetLeave = var8; - } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) { - var3.onVarTransmit = var8; - var3.varTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTIMER) { - var3.onTimer = var8; - } else if (var0 == ScriptOpcodes.CC_SETONOP) { - var3.onOp = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) { - var3.onDragComplete = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) { - var3.onClickRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) { - var3.onMouseRepeat = var8; - } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) { - var3.onInvTransmit = var8; - var3.invTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) { - var3.onStatTransmit = var8; - var3.statTransmitTriggers = var5; - } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) { - var3.onTargetEnter = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) { - var3.onScroll = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) { - var3.onChatTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONKEY) { - var3.onKey = var8; - } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) { - var3.onFriendTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) { - var3.onClanTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) { - var3.onMiscTransmit = var8; - } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) { - var3.onDialogAbort = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) { - var3.onSubChange = var8; - } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) { - var3.onStockTransmit = var8; - } else if (var0 == 1426) { - var3.field2719 = var8; - } else { - if (var0 != ScriptOpcodes.CC_SETONRESIZE) { - return 2; - } - - var3.onResize = var8; - } - - var3.hasListener = true; - return 1; } - @ObfuscatedName("c") + @ObfuscatedName("z") + static boolean method1191(long var0) { + int var2 = (int)(var0 >>> 14 & 3L); // L: 46 + return var2 == 2; // L: 48 + } + + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1187650171" + descriptor = "(Lky;S)I", + garbageValue = "5748" ) - static final int method1180() { - return ViewportMouse.ViewportMouse_y; + static int method1186(PacketBuffer var0) { + int var1 = var0.readBits(2); // L: 179 + int var2; + if (var1 == 0) { // L: 181 + var2 = 0; + } else if (var1 == 1) { // L: 182 + var2 = var0.readBits(5); + } else if (var1 == 2) { // L: 183 + var2 = var0.readBits(8); + } else { + var2 = var0.readBits(11); // L: 184 + } + + return var2; // L: 185 } - @ObfuscatedName("ib") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "([Lhd;IIIIIIIII)V", - garbageValue = "-2136045116" + descriptor = "(CI)Z", + garbageValue = "-877871317" ) - @Export("drawInterface") - static final void drawInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - - for (int var9 = 0; var9 < var0.length; ++var9) { - Widget var10 = var0[var9]; - if (var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) { - int var11; - if (var8 == -1) { - Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6; - Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y; - Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width; - Client.rootWidgetHeights[Client.rootWidgetCount] = var10.height; - var11 = ++Client.rootWidgetCount - 1; - } else { - var11 = var8; - } - - var10.rootIndex = var11; - var10.cycle = Client.cycle; - if (!var10.isIf3 || !Entity.isComponentHidden(var10)) { - if (var10.contentType > 0) { - class4.method57(var10); - } - - int var12 = var10.x + var6; - int var13 = var7 + var10.y; - int var14 = var10.transparencyTop; - int var15; - int var16; - if (var10 == Client.clickedWidget) { - if (var1 != -1412584499 && !var10.isScrollBar) { - class25.field124 = var0; - Clock.field2092 = var6; - Client.field950 = var7; - continue; - } - - if (Client.isDraggingWidget && Client.field692) { - var15 = MouseHandler.MouseHandler_x; - var16 = MouseHandler.MouseHandler_y; - var15 -= Client.widgetClickX; - var16 -= Client.widgetClickY; - if (var15 < Client.field852) { - var15 = Client.field852; - } - - if (var15 + var10.width > Client.field852 + Client.clickedWidgetParent.width) { - var15 = Client.field852 + Client.clickedWidgetParent.width - var10.width; - } - - if (var16 < Client.field853) { - var16 = Client.field853; - } - - if (var16 + var10.height > Client.field853 + Client.clickedWidgetParent.height) { - var16 = Client.field853 + Client.clickedWidgetParent.height - var10.height; - } - - var12 = var15; - var13 = var16; - } - - if (!var10.isScrollBar) { - var14 = 128; - } - } - - int var17; - int var18; - int var19; - int var20; - int var21; - int var22; - if (var10.type == 2) { - var15 = var2; - var16 = var3; - var17 = var4; - var18 = var5; - } else if (var10.type == 9) { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - if (var21 < var12) { - var19 = var21; - var21 = var12; - } - - if (var22 < var13) { - var20 = var22; - var22 = var13; - } - - ++var21; - ++var22; - var15 = var19 > var2 ? var19 : var2; - var16 = var20 > var3 ? var20 : var3; - var17 = var21 < var4 ? var21 : var4; - var18 = var22 < var5 ? var22 : var5; - } else { - var19 = var12 + var10.width; - var20 = var13 + var10.height; - var15 = var12 > var2 ? var12 : var2; - var16 = var13 > var3 ? var13 : var3; - var17 = var19 < var4 ? var19 : var4; - var18 = var20 < var5 ? var20 : var5; - } - - if (!var10.isIf3 || var15 < var17 && var16 < var18) { - if (var10.contentType != 0) { - if (var10.contentType == 1336) { - if (Client.displayFps) { - var13 += 15; - MusicPatchNode2.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); - var13 += 15; - Runtime var42 = Runtime.getRuntime(); - var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); - var21 = 16776960; - if (var20 > 327680 && !Client.isLowDetail) { - var21 = 16711680; - } - - MusicPatchNode2.fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1); - var13 += 15; - } - continue; - } - - if (var10.contentType == 1337) { - Client.viewportX = var12; - Client.viewportY = var13; - KeyHandler.drawEntities(var12, var13, var10.width, var10.height); - Client.field813[var10.rootIndex] = true; - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1338) { - StructDefinition.drawMinimap(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1339) { - class296.drawCompass(var10, var12, var13, var11); - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - continue; - } - - if (var10.contentType == 1400) { - class228.worldMap.draw(var12, var13, var10.width, var10.height, Client.cycle); - } - - if (var10.contentType == 1401) { - class228.worldMap.drawOverview(var12, var13, var10.width, var10.height); - } - - if (var10.contentType == 1402) { - Login.loginScreenRunesAnimation.draw(var12, Client.cycle); - } - } - - if (var10.type == 0) { - if (!var10.isIf3 && Entity.isComponentHidden(var10) && var10 != WorldMapSection1.mousedOverWidgetIf1) { - continue; - } - - if (!var10.isIf3) { - if (var10.scrollY > var10.scrollHeight - var10.height) { - var10.scrollY = var10.scrollHeight - var10.height; - } - - if (var10.scrollY < 0) { - var10.scrollY = 0; - } - } - - drawInterface(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - if (var10.children != null) { - drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11); - } - - InterfaceParent var30 = (InterfaceParent)Client.interfaceParents.get((long)var10.id); - if (var30 != null) { - NetFileRequest.drawWidgets(var30.group, var15, var16, var17, var18, var12, var13, var11); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - } - - if (Client.isResizable || Client.field880[var11] || Client.gameDrawingMode > 1) { - if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) { - StudioGame.drawScrollBar(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight); - } - - if (var10.type != 1) { - int var23; - int var24; - int var25; - int var26; - if (var10.type == 2) { - var19 = 0; - - for (var20 = 0; var20 < var10.rawHeight; ++var20) { - for (var21 = 0; var21 < var10.rawWidth; ++var21) { - var22 = var12 + var21 * (var10.paddingX + 32); - var23 = var13 + var20 * (var10.paddingY + 32); - if (var19 < 20) { - var22 += var10.inventoryXOffsets[var19]; - var23 += var10.inventoryYOffsets[var19]; - } - - if (var10.itemIds[var19] <= 0) { - if (var10.inventorySprites != null && var19 < 20) { - Sprite var46 = var10.getInventorySprite(var19); - if (var46 != null) { - var46.drawTransBgAt(var22, var23); - } else if (Widget.field2600) { - class234.invalidateWidget(var10); - } - } - } else { - boolean var37 = false; - boolean var38 = false; - var26 = var10.itemIds[var19] - 1; - if (var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == KeyHandler.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - Sprite var27; - if (Client.isItemSelected == 1 && var19 == LoginScreenAnimation.selectedItemSlot && var10.id == AbstractUserComparator.selectedItemWidget) { - var27 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 2, 0, 2, false); - } else { - var27 = SecureRandomFuture.getItemSprite(var26, var10.itemQuantities[var19], 1, 3153952, 2, false); - } - - if (var27 != null) { - if (var10 == KeyHandler.dragInventoryWidget && var19 == Client.dragItemSlotSource) { - var24 = MouseHandler.MouseHandler_x - Client.draggedWidgetX; - var25 = MouseHandler.MouseHandler_y - Client.draggedWidgetY; - if (var24 < 5 && var24 > -5) { - var24 = 0; - } - - if (var25 < 5 && var25 > -5) { - var25 = 0; - } - - if (Client.itemDragDuration < 5) { - var24 = 0; - var25 = 0; - } - - var27.drawTransAt(var22 + var24, var25 + var23, 128); - if (var1 != -1) { - Widget var28 = var0[var1 & 65535]; - int var29; - if (var25 + var23 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) { - var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.field747 / 3; - if (var29 > Client.field747 * 10) { - var29 = Client.field747 * 10; - } - - if (var29 > var28.scrollY) { - var29 = var28.scrollY; - } - - var28.scrollY -= var29; - Client.draggedWidgetY += var29; - class234.invalidateWidget(var28); - } - - if (var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) { - var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field747 / 3; - if (var29 > Client.field747 * 10) { - var29 = Client.field747 * 10; - } - - if (var29 > var28.scrollHeight - var28.height - var28.scrollY) { - var29 = var28.scrollHeight - var28.height - var28.scrollY; - } - - var28.scrollY += var29; - Client.draggedWidgetY -= var29; - class234.invalidateWidget(var28); - } - } - } else if (var10 == class194.field2356 && var19 == Client.field668) { - var27.drawTransAt(var22, var23, 128); - } else { - var27.drawTransBgAt(var22, var23); - } - } else { - class234.invalidateWidget(var10); - } - } - } - - ++var19; - } - } - } else if (var10.type == 3) { - if (DevicePcmPlayerProvider.runCs1(var10)) { - var19 = var10.color2; - if (var10 == WorldMapSection1.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var19 = var10.mouseOverColor2; - } - } else { - var19 = var10.color; - if (var10 == WorldMapSection1.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var19 = var10.mouseOverColor; - } - } - - if (var10.fill) { - switch(var10.fillMode.field3882) { - case 1: - Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); - break; - case 2: - Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparencyTop & 255), 255 - (var10.transparencyBot & 255)); - break; - default: - if (var14 == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } - } else if (var14 == 0) { - Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var19); - } else { - Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var19, 256 - (var14 & 255)); - } - } else { - Font var39; - if (var10.type == 4) { - var39 = var10.getFont(); - if (var39 == null) { - if (Widget.field2600) { - class234.invalidateWidget(var10); - } - } else { - String var44 = var10.text; - if (DevicePcmPlayerProvider.runCs1(var10)) { - var20 = var10.color2; - if (var10 == WorldMapSection1.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) { - var20 = var10.mouseOverColor2; - } - - if (var10.text2.length() > 0) { - var44 = var10.text2; - } - } else { - var20 = var10.color; - if (var10 == WorldMapSection1.mousedOverWidgetIf1 && var10.mouseOverColor != 0) { - var20 = var10.mouseOverColor; - } - } - - if (var10.isIf3 && var10.itemId != -1) { - ItemDefinition var47 = KitDefinition.ItemDefinition_get(var10.itemId); - var44 = var47.name; - if (var44 == null) { - var44 = "null"; - } - - if ((var47.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) { - var44 = ItemContainer.colorStartTag(16748608) + var44 + "" + " " + 'x' + WorldMapAreaData.formatItemStacks(var10.itemQuantity); - } - } - - if (var10 == Client.meslayerContinueWidget) { - var44 = "Please wait..."; - var20 = var10.color; - } - - if (!var10.isIf3) { - var44 = BZip2State.method6001(var44, var10); - } - - var39.drawLines(var44, var12, var13, var10.width, var10.height, var20, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight); - } - } else if (var10.type == 5) { - Sprite var40; - if (!var10.isIf3) { - var40 = var10.getSprite(DevicePcmPlayerProvider.runCs1(var10)); - if (var40 != null) { - var40.drawTransBgAt(var12, var13); - } else if (Widget.field2600) { - class234.invalidateWidget(var10); - } - } else { - if (var10.itemId != -1) { - var40 = SecureRandomFuture.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false); - } else { - var40 = var10.getSprite(false); - } - - if (var40 == null) { - if (Widget.field2600) { - class234.invalidateWidget(var10); - } - } else { - var20 = var40.width; - var21 = var40.height; - if (!var10.spriteTiling) { - var22 = var10.width * 4096 / var20; - if (var10.spriteAngle != 0) { - var40.method6369(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22); - } else if (var14 != 0) { - var40.drawTransScaledAt(var12, var13, var10.width, var10.height, 256 - (var14 & 255)); - } else if (var20 == var10.width && var21 == var10.height) { - var40.drawTransBgAt(var12, var13); - } else { - var40.drawScaledAt(var12, var13, var10.width, var10.height); - } - } else { - Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height); - var22 = (var20 - 1 + var10.width) / var20; - var23 = (var21 - 1 + var10.height) / var21; - - for (var24 = 0; var24 < var22; ++var24) { - for (var25 = 0; var25 < var23; ++var25) { - if (var10.spriteAngle != 0) { - var40.method6369(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var21 * var25, var10.spriteAngle, 4096); - } else if (var14 != 0) { - var40.drawTransAt(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255)); - } else { - var40.drawTransBgAt(var12 + var24 * var20, var13 + var21 * var25); - } - } - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5); - } - } - } - } else { - ItemDefinition var32; - if (var10.type == 6) { - boolean var36 = DevicePcmPlayerProvider.runCs1(var10); - if (var36) { - var20 = var10.sequenceId2; - } else { - var20 = var10.sequenceId; - } - - Model var41 = null; - var22 = 0; - if (var10.itemId != -1) { - var32 = KitDefinition.ItemDefinition_get(var10.itemId); - if (var32 != null) { - var32 = var32.getCountObj(var10.itemQuantity); - var41 = var32.getModel(1); - if (var41 != null) { - var41.calculateBoundsCylinder(); - var22 = var41.height / 2; - } else { - class234.invalidateWidget(var10); - } - } - } else if (var10.modelType == 5) { - if (var10.modelId == 0) { - var41 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1); - } else { - var41 = class60.localPlayer.getModel(); - } - } else if (var20 == -1) { - var41 = var10.getModel((SequenceDefinition)null, -1, var36, class60.localPlayer.appearance); - if (var41 == null && Widget.field2600) { - class234.invalidateWidget(var10); - } - } else { - SequenceDefinition var45 = NetSocket.SequenceDefinition_get(var20); - var41 = var10.getModel(var45, var10.modelFrame, var36, class60.localPlayer.appearance); - if (var41 == null && Widget.field2600) { - class234.invalidateWidget(var10); - } - } - - Rasterizer3D.method3147(var10.width / 2 + var12, var10.height / 2 + var13); - var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16; - var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16; - if (var41 != null) { - if (!var10.isIf3) { - var41.method3010(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24); - } else { - var41.calculateBoundsCylinder(); - if (var10.modelOrthog) { - var41.method3011(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom); - } else { - var41.method3010(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY); - } - } - } - - Rasterizer3D.Rasterizer3D_method3(); - } else { - if (var10.type == 7) { - var39 = var10.getFont(); - if (var39 == null) { - if (Widget.field2600) { - class234.invalidateWidget(var10); - } - continue; - } - - var20 = 0; - - for (var21 = 0; var21 < var10.rawHeight; ++var21) { - for (var22 = 0; var22 < var10.rawWidth; ++var22) { - if (var10.itemIds[var20] > 0) { - var32 = KitDefinition.ItemDefinition_get(var10.itemIds[var20] - 1); - String var34; - if (var32.isStackable != 1 && var10.itemQuantities[var20] == 1) { - var34 = ItemContainer.colorStartTag(16748608) + var32.name + ""; - } else { - var34 = ItemContainer.colorStartTag(16748608) + var32.name + "" + " " + 'x' + WorldMapAreaData.formatItemStacks(var10.itemQuantities[var20]); - } - - var25 = var22 * (var10.paddingX + 115) + var12; - var26 = (var10.paddingY + 12) * var21 + var13; - if (var10.textXAlignment == 0) { - var39.draw(var34, var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else if (var10.textXAlignment == 1) { - var39.drawCentered(var34, var10.width / 2 + var25, var26, var10.color, var10.textShadowed ? 0 : -1); - } else { - var39.drawRightAligned(var34, var25 + var10.width - 1, var26, var10.color, var10.textShadowed ? 0 : -1); - } - } - - ++var20; - } - } - } - - if (var10.type == 8 && var10 == SecureRandomCallable.field542 && Client.field825 == Client.field824) { - var19 = 0; - var20 = 0; - Font var31 = MusicPatchNode2.fontPlain12; - String var33 = var10.text; - - String var43; - for (var33 = BZip2State.method6001(var33, var10); var33.length() > 0; var20 = var20 + var31.ascent + 1) { - var24 = var33.indexOf("
"); - if (var24 != -1) { - var43 = var33.substring(0, var24); - var33 = var33.substring(var24 + 4); - } else { - var43 = var33; - var33 = ""; - } - - var25 = var31.stringWidth(var43); - if (var25 > var19) { - var19 = var25; - } - } - - var19 += 6; - var20 += 7; - var24 = var12 + var10.width - 5 - var19; - var25 = var13 + var10.height + 5; - if (var24 < var12 + 5) { - var24 = var12 + 5; - } - - if (var19 + var24 > var4) { - var24 = var4 - var19; - } - - if (var25 + var20 > var5) { - var25 = var5 - var20; - } - - Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var19, var20, 16777120); - Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var19, var20, 0); - var33 = var10.text; - var26 = var25 + var31.ascent + 2; - - for (var33 = BZip2State.method6001(var33, var10); var33.length() > 0; var26 = var26 + var31.ascent + 1) { - int var35 = var33.indexOf("
"); - if (var35 != -1) { - var43 = var33.substring(0, var35); - var33 = var33.substring(var35 + 4); - } else { - var43 = var33; - var33 = ""; - } - - var31.draw(var43, var24 + 3, var26, 0, -1); - } - } - - if (var10.type == 9) { - if (var10.field2633) { - var19 = var12; - var20 = var13 + var10.height; - var21 = var12 + var10.width; - var22 = var13; - } else { - var19 = var12; - var20 = var13; - var21 = var12 + var10.width; - var22 = var13 + var10.height; - } - - if (var10.lineWid == 1) { - Rasterizer2D.Rasterizer2D_drawLine(var19, var20, var21, var22, var10.color); - } else { - UserComparator5.method3540(var19, var20, var21, var22, var10.color, var10.lineWid); - } - } - } - } - } - } - } + public static boolean method1187(char var0) { + if ((var0 < ' ' || var0 >= 127) && (var0 <= 127 || var0 >= 160) && (var0 <= 160 || var0 > 255)) { // L: 61 + if (var0 != 0) { // L: 62 + char[] var1 = class297.cp1252AsciiExtension; // L: 64 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 65 + char var3 = var1[var2]; // L: 66 + if (var0 == var3) { // L: 68 + return true; // L: 69 } } } + + return false; // L: 75 + } else { + return true; + } + } + + @ObfuscatedName("gk") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1367737542" + ) + static void method1177() { + if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { // L: 4254 + VarpDefinition.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); // L: 4255 } - } + } // L: 4257 + + @ObfuscatedName("hd") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIIIZB)V", + garbageValue = "-1" + ) + @Export("insertMenuItem") + static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) { + if (!Client.isMenuOpen) { // L: 8240 + if (Client.menuOptionsCount < 500) { // L: 8241 + Client.menuActions[Client.menuOptionsCount] = var0; // L: 8242 + Client.menuTargets[Client.menuOptionsCount] = var1; // L: 8243 + Client.menuOpcodes[Client.menuOptionsCount] = var2; // L: 8244 + Client.menuIdentifiers[Client.menuOptionsCount] = var3; // L: 8245 + Client.menuArguments1[Client.menuOptionsCount] = var4; // L: 8246 + Client.menuArguments2[Client.menuOptionsCount] = var5; // L: 8247 + Client.menuShiftClick[Client.menuOptionsCount] = var6; // L: 8248 + ++Client.menuOptionsCount; // L: 8249 + } + + } + } // L: 8251 } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 57461b9b70..1871f5e00e 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -4,835 +4,190 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jy") +@ObfuscatedName("jz") @Implements("Timer") public class Timer { - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "[Llz;" - ) - @Export("crossSprites") - static Sprite[] crossSprites; - @ObfuscatedName("m") - @ObfuscatedGetter( - longValue = 7552119433294969811L - ) - long field3613; - @ObfuscatedName("o") - @ObfuscatedGetter( - longValue = 6826365957378108595L - ) - long field3612; - @ObfuscatedName("q") - public boolean field3618; - @ObfuscatedName("j") - @ObfuscatedGetter( - longValue = 3366476848742949295L - ) - long field3611; - @ObfuscatedName("p") - @ObfuscatedGetter( - longValue = -6463393078579201841L - ) - long field3617; - @ObfuscatedName("g") - @ObfuscatedGetter( - longValue = 585068566334505215L - ) - long field3609; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = 1658064199 - ) - int field3614; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 936590501 - ) - int field3615; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 656692765 - ) - int field3616; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -538696129 + longValue = -5225543966373226735L ) - int field3610; + long field3597; + @ObfuscatedName("k") + @ObfuscatedGetter( + longValue = 4082684683626742437L + ) + long field3602; + @ObfuscatedName("s") + public boolean field3598; + @ObfuscatedName("t") + @ObfuscatedGetter( + longValue = -551536066132799497L + ) + long field3600; + @ObfuscatedName("i") + @ObfuscatedGetter( + longValue = -5071374217160666521L + ) + long field3601; + @ObfuscatedName("o") + @ObfuscatedGetter( + longValue = 6965498240839128689L + ) + long field3606; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1025178027 + ) + int field3603; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -931396039 + ) + int field3604; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -531975401 + ) + int field3605; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -76474973 + ) + int field3599; public Timer() { - this.field3613 = -1L; - this.field3612 = -1L; - this.field3618 = false; - this.field3611 = 0L; - this.field3617 = 0L; - this.field3609 = 0L; - this.field3614 = 0; - this.field3615 = 0; - this.field3616 = 0; - this.field3610 = 0; + this.field3597 = -1L; // L: 7 + this.field3602 = -1L; // L: 8 + this.field3598 = false; // L: 9 + this.field3600 = 0L; // L: 10 + this.field3601 = 0L; // L: 11 + this.field3606 = 0L; // L: 12 + this.field3603 = 0; // L: 13 + this.field3604 = 0; // L: 14 + this.field3605 = 0; // L: 15 + this.field3599 = 0; // L: 16 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1434550274" + garbageValue = "1776227441" ) - public void method5162() { - this.field3613 = MilliClock.currentTimeMillis(); - } + public void method5106() { + this.field3597 = PacketWriter.currentTimeMillis(); // L: 19 + } // L: 20 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "2001375296" + ) + public void method5098() { + if (-1L != this.field3597) { // L: 23 + this.field3601 = PacketWriter.currentTimeMillis() - this.field3597; // L: 24 + this.field3597 = -1L; // L: 25 + } + + } // L: 27 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1052633329" + ) + public void method5110(int var1) { + this.field3602 = PacketWriter.currentTimeMillis(); // L: 30 + this.field3603 = var1; // L: 31 + } // L: 32 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "683776298" + ) + public void method5100() { + if (-1L != this.field3602) { // L: 35 + this.field3600 = PacketWriter.currentTimeMillis() - this.field3602; // L: 36 + this.field3602 = -1L; // L: 37 + } + + ++this.field3605; // L: 39 + this.field3598 = true; // L: 40 + } // L: 41 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1997993253" + ) + public void method5101() { + this.field3598 = false; // L: 44 + this.field3604 = 0; // L: 45 + } // L: 46 @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1764633933" + garbageValue = "-729089885" ) - public void method5161() { - if (this.field3613 != -1L) { - this.field3617 = MilliClock.currentTimeMillis() - this.field3613; - this.field3613 = -1L; - } + public void method5099() { + this.method5100(); // L: 49 + } // L: 50 - } - - @ObfuscatedName("q") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "457646537" - ) - public void method5184(int var1) { - this.field3612 = MilliClock.currentTimeMillis(); - this.field3614 = var1; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-15" - ) - public void method5178() { - if (-1L != this.field3612) { - this.field3611 = MilliClock.currentTimeMillis() - this.field3612; - this.field3612 = -1L; - } - - ++this.field3616; - this.field3618 = true; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "535522707" - ) - public void method5165() { - this.field3618 = false; - this.field3615 = 0; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-932156837" - ) - public void method5166() { - this.method5178(); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-152968698" + descriptor = "(Lkf;I)V", + garbageValue = "-1209731041" ) @Export("write") public void write(Buffer var1) { - NetSocket.method3677(var1, this.field3617); - NetSocket.method3677(var1, this.field3611); - NetSocket.method3677(var1, this.field3609); - var1.writeShort(this.field3614); - var1.writeShort(this.field3615); - var1.writeShort(this.field3616); - var1.writeShort(this.field3610); - } + long var2 = this.field3601; // L: 53 + var2 /= 10L; // L: 55 + if (var2 < 0L) { // L: 56 + var2 = 0L; + } else if (var2 > 65535L) { // L: 57 + var2 = 65535L; + } - @ObfuscatedName("fp") + var1.writeShort((int)var2); // L: 58 + long var4 = this.field3600; // L: 60 + var4 /= 10L; // L: 62 + if (var4 < 0L) { // L: 63 + var4 = 0L; + } else if (var4 > 65535L) { // L: 64 + var4 = 65535L; + } + + var1.writeShort((int)var4); // L: 65 + long var6 = this.field3606; // L: 67 + var6 /= 10L; // L: 69 + if (var6 < 0L) { // L: 70 + var6 = 0L; + } else if (var6 > 65535L) { // L: 71 + var6 = 65535L; + } + + var1.writeShort((int)var6); // L: 72 + var1.writeShort(this.field3603); // L: 74 + var1.writeShort(this.field3604); // L: 75 + var1.writeShort(this.field3605); // L: 76 + var1.writeShort(this.field3599); // L: 77 + } // L: 78 + + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-2109175482" + descriptor = "(Ljava/lang/CharSequence;B)I", + garbageValue = "98" ) - @Export("playPcmPlayers") - static final void playPcmPlayers() { - if (class58.pcmPlayer1 != null) { - class58.pcmPlayer1.run(); + @Export("hashString") + public static int hashString(CharSequence var0) { + int var1 = var0.length(); // L: 135 + int var2 = 0; // L: 136 + + for (int var3 = 0; var3 < var1; ++var3) { // L: 137 + var2 = (var2 << 5) - var2 + class227.charToByteCp1252(var0.charAt(var3)); } - if (class2.pcmPlayer0 != null) { - class2.pcmPlayer0.run(); - } - - } - - @ObfuscatedName("gu") - @ObfuscatedSignature( - descriptor = "(Lcc;IIIIIB)V", - garbageValue = "103" - ) - @Export("drawActor2d") - static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) { - if (var0 != null && var0.isVisible()) { - if (var0 instanceof NPC) { - NPCDefinition var6 = ((NPC)var0).definition; - if (var6.transforms != null) { - var6 = var6.transform(); - } - - if (var6 == null) { - return; - } - } - - int var75 = Players.Players_count; - int[] var7 = Players.Players_indices; - byte var8 = 0; - Player var10; - int var93; - if (var1 < var75 && var0.playerCycle == Client.cycle) { - var10 = (Player)var0; - boolean var9; - if (Client.drawPlayerNames == 0) { - var9 = false; - } else { - boolean var78; - if (var10 == class60.localPlayer) { - var78 = (Client.drawPlayerNames & 8) != 0; - var9 = var78; - } else { - var78 = class7.method98(); - boolean var12; - if (!var78) { - var12 = (Client.drawPlayerNames & 1) != 0; - var78 = var12 && var10.isFriend(); - } - - var12 = var78; - if (!var78) { - boolean var80 = (Client.drawPlayerNames & 2) != 0; - var12 = var80 && var10.isClanMember(); - } - - var9 = var12; - } - } - - if (var9) { - Player var11 = (Player)var0; - if (var1 < var75) { - var93 = var0.defaultHeight + 15; - HealthBar.worldToScreen(var0.x, var0.y, var93); - AbstractFont var13 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12); - byte var14 = 9; - var13.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var14, 16777215, 0); - var8 = 18; - } - } - } - - int var89 = -2; - int var15; - int var16; - int var22; - int var23; - if (!var0.healthBars.method5014()) { - DirectByteArrayCopier.method4090(var0, var0.defaultHeight + 15); - - for (HealthBar var90 = (HealthBar)var0.healthBars.last(); var90 != null; var90 = (HealthBar)var0.healthBars.previous()) { - HealthBarUpdate var91 = var90.get(Client.cycle); - if (var91 == null) { - if (var90.isEmpty()) { - var90.remove(); - } - } else { - HealthBarDefinition var76 = var90.definition; - Sprite var94 = var76.getBackSprite(); - Sprite var77 = var76.getFrontSprite(); - var16 = 0; - if (var94 != null && var77 != null) { - if (var76.widthPadding * 2 < var77.subWidth) { - var16 = var76.widthPadding; - } - - var15 = var77.subWidth - var16 * 2; - } else { - var15 = var76.width; - } - - int var17 = 255; - boolean var18 = true; - int var19 = Client.cycle - var91.cycle; - int var20 = var15 * var91.health2 / var76.width; - int var21; - int var97; - if (var91.cycleOffset > var19) { - var21 = var76.field3317 == 0 ? 0 : var76.field3317 * (var19 / var76.field3317); - var22 = var15 * var91.health / var76.width; - var97 = var21 * (var20 - var22) / var91.cycleOffset + var22; - } else { - var97 = var20; - var21 = var76.int5 + var91.cycleOffset - var19; - if (var76.int3 >= 0) { - var17 = (var21 << 8) / (var76.int5 - var76.int3); - } - } - - if (var91.health2 > 0 && var97 < 1) { - var97 = 1; - } - - if (var94 != null && var77 != null) { - if (var15 == var97) { - var97 += var16 * 2; - } else { - var97 += var16; - } - - var21 = var94.subHeight; - var89 += var21; - var22 = var2 + Client.viewportTempX - (var15 >> 1); - var23 = var3 + Client.viewportTempY - var89; - var22 -= var16; - if (var17 >= 0 && var17 < 255) { - var94.drawTransAt(var22, var23, var17); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var97, var23 + var21); - var77.drawTransAt(var22, var23, var17); - } else { - var94.drawTransBgAt(var22, var23); - Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var97 + var22, var21 + var23); - var77.drawTransBgAt(var22, var23); - } - - Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5); - var89 += 2; - } else { - var89 += 5; - if (Client.viewportTempX > -1) { - var21 = var2 + Client.viewportTempX - (var15 >> 1); - var22 = var3 + Client.viewportTempY - var89; - Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var97, 5, 65280); - Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var97, var22, var15 - var97, 5, 16711680); - } - - var89 += 2; - } - } - } - } - - if (var89 == -2) { - var89 += 7; - } - - var89 += var8; - int var99; - if (var1 < var75) { - var10 = (Player)var0; - if (var10.isHidden) { - return; - } - - if (var10.headIconPk != -1 || var10.headIconPrayer != -1) { - DirectByteArrayCopier.method4090(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - if (var10.headIconPk != -1) { - var89 += 25; - CollisionMap.headIconPkSprites[var10.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); - } - - if (var10.headIconPrayer != -1) { - var89 += 25; - KeyHandler.headIconPrayerSprites[var10.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); - } - } - } - - if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) { - DirectByteArrayCopier.method4090(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - var89 += SoundSystem.headIconHintSprites[1].subHeight; - SoundSystem.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var89); - } - } - } else { - NPCDefinition var92 = ((NPC)var0).definition; - if (var92.transforms != null) { - var92 = var92.transform(); - } - - if (var92.headIconPrayer >= 0 && var92.headIconPrayer < KeyHandler.headIconPrayerSprites.length) { - DirectByteArrayCopier.method4090(var0, var0.defaultHeight + 15); - if (Client.viewportTempX > -1) { - KeyHandler.headIconPrayerSprites[var92.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30); - } - } - - if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) { - var99 = var0.defaultHeight + 15; - HealthBar.worldToScreen(var0.x, var0.y, var99); - if (Client.viewportTempX > -1) { - SoundSystem.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28); - } - } - } - - if (var0.overheadText != null && (var1 >= var75 || !var0.field979 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) { - DirectByteArrayCopier.method4090(var0, var0.defaultHeight); - if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) { - Client.overheadTextXOffsets[Client.overheadTextCount] = GrandExchangeOfferNameComparator.fontBold12.stringWidth(var0.overheadText) / 2; - Client.overheadTextAscents[Client.overheadTextCount] = GrandExchangeOfferNameComparator.fontBold12.ascent; - Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX; - Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY; - Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor; - Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect; - Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining; - Client.overheadText[Client.overheadTextCount] = var0.overheadText; - ++Client.overheadTextCount; - } - } - - for (int var79 = 0; var79 < 4; ++var79) { - var99 = var0.hitSplatCycles[var79]; - var93 = var0.hitSplatTypes[var79]; - HitSplatDefinition var95 = null; - int var96 = 0; - HitSplatDefinition var81; - if (var93 >= 0) { - if (var99 <= Client.cycle) { - continue; - } - - var16 = var0.hitSplatTypes[var79]; - var81 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var16); - HitSplatDefinition var82; - if (var81 != null) { - var82 = var81; - } else { - byte[] var84 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var16); - var81 = new HitSplatDefinition(); - if (var84 != null) { - var81.decode(new Buffer(var84)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var81, (long)var16); - var82 = var81; - } - - var95 = var82; - var96 = var82.field3364; - if (var82 != null && var82.transforms != null) { - var95 = var82.transform(); - if (var95 == null) { - var0.hitSplatCycles[var79] = -1; - continue; - } - } - } else if (var99 < 0) { - continue; - } - - var15 = var0.hitSplatTypes2[var79]; - HitSplatDefinition var83 = null; - HitSplatDefinition var100; - if (var15 >= 0) { - var100 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var15); - if (var100 != null) { - var81 = var100; - } else { - byte[] var85 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var15); - var100 = new HitSplatDefinition(); - if (var85 != null) { - var100.decode(new Buffer(var85)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var100, (long)var15); - var81 = var100; - } - - var83 = var81; - if (var81 != null && var81.transforms != null) { - var83 = var81.transform(); - } - } - - if (var99 - var96 <= Client.cycle) { - if (var95 == null) { - var0.hitSplatCycles[var79] = -1; - } else { - DirectByteArrayCopier.method4090(var0, var0.defaultHeight / 2); - if (Client.viewportTempX > -1) { - if (var79 == 1) { - Client.viewportTempY -= 20; - } - - if (var79 == 2) { - Client.viewportTempX -= 15; - Client.viewportTempY -= 10; - } - - if (var79 == 3) { - Client.viewportTempX += 15; - Client.viewportTempY -= 10; - } - - var100 = null; - Sprite var101 = null; - Sprite var86 = null; - Sprite var87 = null; - var22 = 0; - var23 = 0; - int var24 = 0; - int var25 = 0; - int var26 = 0; - int var27 = 0; - int var28 = 0; - int var29 = 0; - Sprite var30 = null; - Sprite var31 = null; - Sprite var32 = null; - Sprite var33 = null; - int var34 = 0; - int var35 = 0; - int var36 = 0; - int var37 = 0; - int var38 = 0; - int var39 = 0; - int var40 = 0; - int var41 = 0; - int var42 = 0; - Sprite var102 = var95.method4755(); - int var43; - if (var102 != null) { - var22 = var102.subWidth; - var43 = var102.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var26 = var102.xOffset; - } - - var101 = var95.method4756(); - if (var101 != null) { - var23 = var101.subWidth; - var43 = var101.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var27 = var101.xOffset; - } - - var86 = var95.method4752(); - if (var86 != null) { - var24 = var86.subWidth; - var43 = var86.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var28 = var86.xOffset; - } - - var87 = var95.method4763(); - if (var87 != null) { - var25 = var87.subWidth; - var43 = var87.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var29 = var87.xOffset; - } - - if (var83 != null) { - var30 = var83.method4755(); - if (var30 != null) { - var34 = var30.subWidth; - var43 = var30.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var38 = var30.xOffset; - } - - var31 = var83.method4756(); - if (var31 != null) { - var35 = var31.subWidth; - var43 = var31.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var39 = var31.xOffset; - } - - var32 = var83.method4752(); - if (var32 != null) { - var36 = var32.subWidth; - var43 = var32.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var40 = var32.xOffset; - } - - var33 = var83.method4763(); - if (var33 != null) { - var37 = var33.subWidth; - var43 = var33.subHeight; - if (var43 > var42) { - var42 = var43; - } - - var41 = var33.xOffset; - } - } - - Font var88 = var95.getFont(); - if (var88 == null) { - var88 = WorldMapLabel.fontPlain11; - } - - Font var44; - if (var83 != null) { - var44 = var83.getFont(); - if (var44 == null) { - var44 = WorldMapLabel.fontPlain11; - } - } else { - var44 = WorldMapLabel.fontPlain11; - } - - String var45 = null; - String var46 = null; - boolean var47 = false; - int var48 = 0; - var45 = var95.getString(var0.hitSplatValues[var79]); - int var98 = var88.stringWidth(var45); - if (var83 != null) { - var46 = var83.getString(var0.hitSplatValues2[var79]); - var48 = var44.stringWidth(var46); - } - - int var49 = 0; - int var50 = 0; - if (var23 > 0) { - if (var86 == null && var87 == null) { - var49 = 1; - } else { - var49 = var98 / var23 + 1; - } - } - - if (var83 != null && var35 > 0) { - if (var32 == null && var33 == null) { - var50 = 1; - } else { - var50 = var48 / var35 + 1; - } - } - - int var51 = 0; - int var52 = var51; - if (var22 > 0) { - var51 += var22; - } - - var51 += 2; - int var53 = var51; - if (var24 > 0) { - var51 += var24; - } - - int var54 = var51; - int var55 = var51; - int var56; - if (var23 > 0) { - var56 = var49 * var23; - var51 += var56; - var55 += (var56 - var98) / 2; - } else { - var51 += var98; - } - - var56 = var51; - if (var25 > 0) { - var51 += var25; - } - - int var57 = 0; - int var58 = 0; - int var59 = 0; - int var60 = 0; - int var61 = 0; - int var62; - if (var83 != null) { - var51 += 2; - var57 = var51; - if (var34 > 0) { - var51 += var34; - } - - var51 += 2; - var58 = var51; - if (var36 > 0) { - var51 += var36; - } - - var59 = var51; - var61 = var51; - if (var35 > 0) { - var62 = var50 * var35; - var51 += var62; - var61 += (var62 - var48) / 2; - } else { - var51 += var48; - } - - var60 = var51; - if (var37 > 0) { - var51 += var37; - } - } - - var62 = var0.hitSplatCycles[var79] - Client.cycle; - int var63 = var95.field3369 - var62 * var95.field3369 / var95.field3364; - int var64 = var62 * var95.field3370 / var95.field3364 + -var95.field3370; - int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1)); - int var66 = var3 + Client.viewportTempY - 12 + var64; - int var67 = var66; - int var68 = var42 + var66; - int var69 = var66 + var95.field3374 + 15; - int var70 = var69 - var88.maxAscent; - int var71 = var69 + var88.maxDescent; - if (var70 < var66) { - var67 = var70; - } - - if (var71 > var68) { - var68 = var71; - } - - int var72 = 0; - int var73; - int var74; - if (var83 != null) { - var72 = var66 + var83.field3374 + 15; - var73 = var72 - var44.maxAscent; - var74 = var72 + var44.maxDescent; - if (var73 < var67) { - ; - } - - if (var74 > var68) { - ; - } - } - - var73 = 255; - if (var95.field3363 >= 0) { - var73 = (var62 << 8) / (var95.field3364 - var95.field3363); - } - - if (var73 >= 0 && var73 < 255) { - if (var102 != null) { - var102.drawTransAt(var52 + var65 - var26, var66, var73); - } - - if (var86 != null) { - var86.drawTransAt(var53 + var65 - var28, var66, var73); - } - - if (var101 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var101.drawTransAt(var74 * var23 + (var65 + var54 - var27), var66, var73); - } - } - - if (var87 != null) { - var87.drawTransAt(var65 + var56 - var29, var66, var73); - } - - var88.drawAlpha(var45, var55 + var65, var69, var95.textColor, 0, var73); - if (var83 != null) { - if (var30 != null) { - var30.drawTransAt(var57 + var65 - var38, var66, var73); - } - - if (var32 != null) { - var32.drawTransAt(var65 + var58 - var40, var66, var73); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransAt(var74 * var35 + (var65 + var59 - var39), var66, var73); - } - } - - if (var33 != null) { - var33.drawTransAt(var60 + var65 - var41, var66, var73); - } - - var44.drawAlpha(var46, var61 + var65, var72, var83.textColor, 0, var73); - } - } else { - if (var102 != null) { - var102.drawTransBgAt(var65 + var52 - var26, var66); - } - - if (var86 != null) { - var86.drawTransBgAt(var53 + var65 - var28, var66); - } - - if (var101 != null) { - for (var74 = 0; var74 < var49; ++var74) { - var101.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66); - } - } - - if (var87 != null) { - var87.drawTransBgAt(var56 + var65 - var29, var66); - } - - var88.draw(var45, var65 + var55, var69, var95.textColor | -16777216, 0); - if (var83 != null) { - if (var30 != null) { - var30.drawTransBgAt(var65 + var57 - var38, var66); - } - - if (var32 != null) { - var32.drawTransBgAt(var58 + var65 - var40, var66); - } - - if (var31 != null) { - for (var74 = 0; var74 < var50; ++var74) { - var31.drawTransBgAt(var35 * var74 + (var59 + var65 - var39), var66); - } - } - - if (var33 != null) { - var33.drawTransBgAt(var65 + var60 - var41, var66); - } - - var44.draw(var46, var61 + var65, var72, var83.textColor | -16777216, 0); - } - } - } - } - } - } - - } + return var2; // L: 138 } } diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java index 8ccdb2c290..da38527951 100644 --- a/runescape-client/src/main/java/TriBool.java +++ b/runescape-client/src/main/java/TriBool.java @@ -1,146 +1,42 @@ -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InvalidClassException; -import java.io.ObjectInputStream; -import java.io.OptionalDataException; -import java.io.StreamCorruptedException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("kf") +@ObfuscatedName("km") @Implements("TriBool") public class TriBool { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkm;" ) @Export("TriBool_unknown") public static final TriBool TriBool_unknown; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkm;" ) @Export("TriBool_true") public static final TriBool TriBool_true; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkf;" + descriptor = "Lkm;" ) @Export("TriBool_false") public static final TriBool TriBool_false; + @ObfuscatedName("lj") + @ObfuscatedSignature( + descriptor = "Lhq;" + ) + @Export("mousedOverWidgetIf1") + static Widget mousedOverWidgetIf1; static { - TriBool_unknown = new TriBool(); - TriBool_true = new TriBool(); - TriBool_false = new TriBool(); + TriBool_unknown = new TriBool(); // L: 4 + TriBool_true = new TriBool(); // L: 5 + TriBool_false = new TriBool(); // L: 6 } TriBool() { - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lkb;B)V", - garbageValue = "-64" - ) - @Export("performReflectionCheck") - public static void performReflectionCheck(PacketBuffer var0) { - ReflectionCheck var1 = (ReflectionCheck)class105.reflectionChecks.last(); - if (var1 != null) { - int var2 = var0.offset; - var0.writeInt(var1.id); - - for (int var3 = 0; var3 < var1.size; ++var3) { - if (var1.creationErrors[var3] != 0) { - var0.writeByte(var1.creationErrors[var3]); - } else { - try { - int var4 = var1.operations[var3]; - Field var5; - int var6; - if (var4 == 0) { - var5 = var1.fields[var3]; - var6 = Reflection.getInt(var5, (Object)null); - var0.writeByte(0); - var0.writeInt(var6); - } else if (var4 == 1) { - var5 = var1.fields[var3]; - Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); - var0.writeByte(0); - } else if (var4 == 2) { - var5 = var1.fields[var3]; - var6 = var5.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - - Method var25; - if (var4 != 3) { - if (var4 == 4) { - var25 = var1.methods[var3]; - var6 = var25.getModifiers(); - var0.writeByte(0); - var0.writeInt(var6); - } - } else { - var25 = var1.methods[var3]; - byte[][] var10 = var1.arguments[var3]; - Object[] var7 = new Object[var10.length]; - - for (int var8 = 0; var8 < var10.length; ++var8) { - ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); - var7[var8] = var9.readObject(); - } - - Object var11 = Reflection.invoke(var25, (Object)null, var7); - if (var11 == null) { - var0.writeByte(0); - } else if (var11 instanceof Number) { - var0.writeByte(1); - var0.writeLong(((Number)var11).longValue()); - } else if (var11 instanceof String) { - var0.writeByte(2); - var0.writeStringCp1252NullTerminated((String)var11); - } else { - var0.writeByte(4); - } - } - } catch (ClassNotFoundException var13) { - var0.writeByte(-10); - } catch (InvalidClassException var14) { - var0.writeByte(-11); - } catch (StreamCorruptedException var15) { - var0.writeByte(-12); - } catch (OptionalDataException var16) { - var0.writeByte(-13); - } catch (IllegalAccessException var17) { - var0.writeByte(-14); - } catch (IllegalArgumentException var18) { - var0.writeByte(-15); - } catch (InvocationTargetException var19) { - var0.writeByte(-16); - } catch (SecurityException var20) { - var0.writeByte(-17); - } catch (IOException var21) { - var0.writeByte(-18); - } catch (NullPointerException var22) { - var0.writeByte(-19); - } catch (Exception var23) { - var0.writeByte(-20); - } catch (Throwable var24) { - var0.writeByte(-21); - } - } - } - - var0.writeCrc(var2); - var1.remove(); - } - } + } // L: 8 } diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java index 508c47f00f..b44e56d60f 100644 --- a/runescape-client/src/main/java/UrlRequest.java +++ b/runescape-client/src/main/java/UrlRequest.java @@ -1,87 +1,45 @@ -import java.awt.Desktop; -import java.awt.Desktop.Action; -import java.net.URI; import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("eb") +@ObfuscatedName("ei") @Implements("UrlRequest") public class UrlRequest { - @ObfuscatedName("m") + @ObfuscatedName("h") + static boolean field1986; + @ObfuscatedName("z") @Export("url") final URL url; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("isDone0") volatile boolean isDone0; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("response0") volatile byte[] response0; UrlRequest(URL var1) { - this.url = var1; - } + this.url = var1; // L: 96 + } // L: 97 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1247069155" + garbageValue = "1064227353" ) @Export("isDone") public boolean isDone() { - return this.isDone0; + return this.isDone0; // L: 100 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)[B", - garbageValue = "1076365281" + garbageValue = "524450632" ) @Export("getResponse") public byte[] getResponse() { - return this.response0; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZI)V", - garbageValue = "-2122321724" - ) - static void method3426(String var0, boolean var1, String var2, boolean var3) { - if (var1) { - if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { - try { - Desktop.getDesktop().browse(new URI(var0)); - return; - } catch (Exception var5) { - } - } - - if (class60.field450.startsWith("win") && !var3) { - FloorUnderlayDefinition.method4608(var0, 0); - return; - } - - if (class60.field450.startsWith("mac")) { - GrandExchangeOfferTotalQuantityComparator.method165(var0, 1, var2); - return; - } - - FloorUnderlayDefinition.method4608(var0, 2); - } else { - FloorUnderlayDefinition.method4608(var0, 3); - } - - } - - @ObfuscatedName("gx") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "60" - ) - static final void method3432(int var0, int var1, int var2, int var3) { - TileItemPile.method2901(); + return this.response0; // L: 104 } } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index e9bb6a7955..fee7da45e0 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -7,272 +7,291 @@ import java.util.LinkedList; import java.util.Queue; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("eh") +@ObfuscatedName("ev") @Implements("UrlRequester") public class UrlRequester implements Runnable { - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 735302127 - ) - @Export("Interpreter_intStackSize") - static int Interpreter_intStackSize; - @ObfuscatedName("gk") + @ObfuscatedName("dc") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Liw;" ) - @Export("redHintArrowSprite") - static Sprite redHintArrowSprite; - @ObfuscatedName("m") + @Export("archive9") + static Archive archive9; + @ObfuscatedName("z") @Export("thread") final Thread thread; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("isClosed") volatile boolean isClosed; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("requests") Queue requests; public UrlRequester() { - this.requests = new LinkedList(); - this.thread = new Thread(this); - this.thread.setPriority(1); - this.thread.start(); - } + this.requests = new LinkedList(); // L: 15 + this.thread = new Thread(this); // L: 18 + this.thread.setPriority(1); // L: 19 + this.thread.start(); // L: 20 + } // L: 21 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/net/URL;I)Leb;", - garbageValue = "1883643384" + descriptor = "(Ljava/net/URL;I)Lei;", + garbageValue = "-8401642" ) @Export("request") public UrlRequest request(URL var1) { - UrlRequest var2 = new UrlRequest(var1); - synchronized(this) { - this.requests.add(var2); - this.notify(); - return var2; + UrlRequest var2 = new UrlRequest(var1); // L: 71 + synchronized(this) { // L: 72 + this.requests.add(var2); // L: 73 + this.notify(); // L: 74 + return var2; // L: 76 } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "1" + descriptor = "(I)V", + garbageValue = "-210243346" ) @Export("close") public void close() { - this.isClosed = true; + this.isClosed = true; // L: 80 try { - synchronized(this) { - this.notify(); - } + synchronized(this) { // L: 82 + this.notify(); // L: 83 + } // L: 84 - this.thread.join(); - } catch (InterruptedException var4) { + this.thread.join(); // L: 85 + } catch (InterruptedException var4) { // L: 87 } - } + } // L: 88 public void run() { - while (!this.isClosed) { + while (!this.isClosed) { // L: 24 try { UrlRequest var1; - synchronized(this) { - var1 = (UrlRequest)this.requests.poll(); - if (var1 == null) { + synchronized(this) { // L: 27 + var1 = (UrlRequest)this.requests.poll(); // L: 28 + if (var1 == null) { // L: 29 try { - this.wait(); - } catch (InterruptedException var13) { + this.wait(); // L: 31 + } catch (InterruptedException var13) { // L: 33 } continue; } } - DataInputStream var2 = null; - URLConnection var3 = null; + DataInputStream var2 = null; // L: 37 + URLConnection var3 = null; // L: 38 try { - var3 = var1.url.openConnection(); - var3.setConnectTimeout(5000); - var3.setReadTimeout(5000); - var3.setUseCaches(false); - var3.setRequestProperty("Connection", "close"); - int var7 = var3.getContentLength(); - if (var7 >= 0) { - byte[] var5 = new byte[var7]; - var2 = new DataInputStream(var3.getInputStream()); - var2.readFully(var5); - var1.response0 = var5; + var3 = var1.url.openConnection(); // L: 40 + var3.setConnectTimeout(5000); // L: 41 + var3.setReadTimeout(5000); // L: 42 + var3.setUseCaches(false); // L: 43 + var3.setRequestProperty("Connection", "close"); // L: 44 + int var7 = var3.getContentLength(); // L: 45 + if (var7 >= 0) { // L: 46 + byte[] var5 = new byte[var7]; // L: 47 + var2 = new DataInputStream(var3.getInputStream()); // L: 48 + var2.readFully(var5); // L: 49 + var1.response0 = var5; // L: 50 } - var1.isDone0 = true; - } catch (IOException var14) { - var1.isDone0 = true; + var1.isDone0 = true; // L: 52 + } catch (IOException var14) { // L: 54 + var1.isDone0 = true; // L: 55 } finally { - if (var2 != null) { + if (var2 != null) { // L: 58 var2.close(); } - if (var3 != null && var3 instanceof HttpURLConnection) { - ((HttpURLConnection)var3).disconnect(); + if (var3 != null && var3 instanceof HttpURLConnection) { // L: 59 + ((HttpURLConnection)var3).disconnect(); // L: 60 } } - } catch (Exception var17) { - class197.RunException_sendStackTrace((String)null, var17); + } catch (Exception var17) { // L: 64 + Decimator.RunException_sendStackTrace((String)null, var17); // L: 65 } } - } + } // L: 68 - @ObfuscatedName("ao") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ILcs;ZB)I", - garbageValue = "23" + descriptor = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-516919063" ) - static int method3424(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.CLIENTCLOCK) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.cycle; - return 1; + @Export("setLoginResponseString") + static void setLoginResponseString(String var0, String var1, String var2) { + Login.Login_response1 = var0; // L: 1456 + Login.Login_response2 = var1; // L: 1457 + Login.Login_response3 = var2; // L: 1458 + } // L: 1459 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "1482184938" + ) + static int method3419(int var0, Script var1, boolean var2) { + boolean var3 = true; // L: 772 + Widget var4; + if (var0 >= 2000) { // L: 774 + var0 -= 1000; // L: 775 + var4 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 776 + var3 = false; // L: 777 } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { - Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = HealthBarDefinition.method4673(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_GETNUM) { - Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = UserComparator6.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_TOTAL) { - Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = ArchiveLoader.method1212(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = class247.getInvDefinition(var3).size; - return 1; - } else if (var0 == ScriptOpcodes.STAT) { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_BASE) { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_XP) { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; + var4 = var2 ? Canvas.field438 : class3.field12; // L: 779 + } + + int var11; + if (var0 == ScriptOpcodes.CC_SETOP) { // L: 780 + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 781 + if (var11 >= 0 && var11 <= 9) { // L: 782 + var4.setAction(var11, Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]); // L: 786 + return 1; // L: 787 } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { - var3 = TileItemPile.Client_plane; - var4 = (class60.localPlayer.x >> 7) + class182.baseX; - var5 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = HealthBarDefinition.method4673(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { - Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = UserComparator6.ItemContainer_getCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { - Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = ArchiveLoader.method1212(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.staffModLevel; + --Varps.Interpreter_stringStackSize; // L: 783 + return 1; // L: 784 + } + } else { + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { // L: 789 + Interpreter.Interpreter_intStackSize -= 2; // L: 790 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 791 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 792 + var4.parent = SecureRandomCallable.getWidgetChild(var11, var6); // L: 793 + return 1; // L: 794 + } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { // L: 796 + var4.isScrollBar = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 797 + return 1; // L: 798 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { // L: 800 + var4.dragZoneSize = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 801 + return 1; // L: 802 + } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { // L: 804 + var4.dragThreshold = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 805 + return 1; // L: 806 + } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { // L: 808 + var4.dataText = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 809 + return 1; // L: 810 + } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { // L: 812 + var4.spellActionName = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 813 + return 1; // L: 814 + } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { // L: 816 + var4.actions = null; // L: 817 + return 1; // L: 818 + } else if (var0 == 1308) { // L: 820 + var4.prioritizeMenuEntry = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 821 + return 1; // L: 822 + } else if (var0 == 1309) { // L: 824 + --Interpreter.Interpreter_intStackSize; // L: 825 + return 1; // L: 826 + } else { + int var7; + byte[] var8; + if (var0 != ScriptOpcodes.CC_SETOPKEY) { // L: 828 + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { // L: 858 + Interpreter.Interpreter_intStackSize -= 2; // L: 859 + var5 = 10; // L: 860 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 861 + byte[] var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 862 + NetSocket.Widget_setKey(var4, var5, var8, var9); // L: 863 + return 1; // L: 864 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { // L: 866 + Interpreter.Interpreter_intStackSize -= 3; // L: 867 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 868 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 869 + var7 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 870 + if (var11 >= 0 && var11 <= 9) { // L: 871 + MouseHandler.Widget_setKeyRate(var4, var11, var6, var7); // L: 874 + return 1; // L: 875 + } else { + throw new RuntimeException(); // L: 872 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { // L: 877 + var5 = 10; // L: 878 + var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 879 + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 880 + MouseHandler.Widget_setKeyRate(var4, var5, var6, var7); // L: 881 + return 1; // L: 882 + } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { // L: 884 + --Interpreter.Interpreter_intStackSize; // L: 885 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] - 1; // L: 886 + if (var11 >= 0 && var11 <= 9) { // L: 887 + class60.Widget_setKeyIgnoreHeld(var4, var11); // L: 890 + return 1; // L: 891 + } else { + throw new RuntimeException(); // L: 888 + } + } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { // L: 893 + var5 = 10; // L: 894 + class60.Widget_setKeyIgnoreHeld(var4, var5); // L: 895 + return 1; // L: 896 } else { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0; + return 2; // L: 898 } - - return 1; - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == ScriptOpcodes.MAP_WORLD) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == ScriptOpcodes.MOVECOORD) { - Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++Interpreter_intStackSize - 1] = var3; - return 1; } else { - return 2; + byte[] var10 = null; // L: 829 + var8 = null; // L: 830 + if (var3) { // L: 831 + Interpreter.Interpreter_intStackSize -= 10; // L: 832 + + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize] >= 0; var7 += 2) { // L: 834 835 + } + + if (var7 > 0) { // L: 837 + var10 = new byte[var7 / 2]; // L: 838 + var8 = new byte[var7 / 2]; // L: 839 + + for (var7 -= 2; var7 >= 0; var7 -= 2) { // L: 840 + var10[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize]; // L: 841 + var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + Interpreter.Interpreter_intStackSize + 1]; // L: 842 + } + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 847 + var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]}; // L: 848 + var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]}; // L: 849 + } + + var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] - 1; // L: 851 + if (var7 >= 0 && var7 <= 9) { // L: 852 + NetSocket.Widget_setKey(var4, var7, var10, var8); // L: 855 + return 1; // L: 856 + } else { + throw new RuntimeException(); // L: 853 + } } } } } - @ObfuscatedName("ia") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(S)I", - garbageValue = "-5481" + descriptor = "(II)Lef;", + garbageValue = "-1165420128" ) - static final int method3421() { - return Client.menuOptionsCount - 1; + @Export("getFrames") + static Frames getFrames(int var0) { + Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); // L: 181 + if (var1 != null) { // L: 182 + return var1; + } else { + var1 = ArchiveDiskActionHandler.method4337(SequenceDefinition.SequenceDefinition_animationsArchive, GrandExchangeOfferAgeComparator.SequenceDefinition_skeletonsArchive, var0, false); // L: 183 + if (var1 != null) { // L: 184 + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } + + return var1; // L: 185 + } } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 77a5178392..30743ef863 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -3,143 +3,104 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jf") +@ObfuscatedName("jc") @Implements("User") public class User implements Comparable { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lku;" ) @Export("username") Username username; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lkq;" + descriptor = "Lku;" ) @Export("previousUsername") Username previousUsername; User() { - } + } // L: 7 - @ObfuscatedName("e") + @ObfuscatedName("ae") @ObfuscatedSignature( - descriptor = "(I)Lkq;", - garbageValue = "352262046" + descriptor = "(I)Lku;", + garbageValue = "-53975348" ) @Export("getUsername") public Username getUsername() { - return this.username; + return this.username; // L: 10 } - @ObfuscatedName("l") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(B)Ljava/lang/String;", - garbageValue = "111" + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-2094298107" ) @Export("getName") public String getName() { - return this.username == null ? "" : this.username.getName(); + return this.username == null ? "" : this.username.getName(); // L: 14 15 } - @ObfuscatedName("t") + @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-461021692" + garbageValue = "2114724515" ) @Export("getPreviousName") public String getPreviousName() { - return this.previousUsername == null ? "" : this.previousUsername.getName(); + return this.previousUsername == null ? "" : this.previousUsername.getName(); // L: 19 20 } - @ObfuscatedName("x") + @ObfuscatedName("aa") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;I)V", - garbageValue = "-1982838307" + descriptor = "(Lku;Lku;I)V", + garbageValue = "-1201574407" ) @Export("set") void set(Username var1, Username var2) { - if (var1 == null) { + if (var1 == null) { // L: 24 throw new NullPointerException(); } else { - this.username = var1; - this.previousUsername = var2; + this.username = var1; // L: 25 + this.previousUsername = var2; // L: 26 } - } + } // L: 27 - @ObfuscatedName("ah") + @ObfuscatedName("ar") @ObfuscatedSignature( - descriptor = "(Ljf;I)I", - garbageValue = "334051838" + descriptor = "(Ljc;I)I", + garbageValue = "-243007320" ) @Export("compareTo_user") public int compareTo_user(User var1) { - return this.username.compareToTyped(var1.username); + return this.username.compareToTyped(var1.username); // L: 30 } public int compareTo(Object var1) { - return this.compareTo_user((User)var1); + return this.compareTo_user((User)var1); // L: 34 } - @ObfuscatedName("m") + @ObfuscatedName("hu") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "406400151" + descriptor = "(IIIII)V", + garbageValue = "793231569" ) - static void method5228() { - if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { - KeyHandler.KeyHandler_keyCodes[186] = 57; - KeyHandler.KeyHandler_keyCodes[187] = 27; - KeyHandler.KeyHandler_keyCodes[188] = 71; - KeyHandler.KeyHandler_keyCodes[189] = 26; - KeyHandler.KeyHandler_keyCodes[190] = 72; - KeyHandler.KeyHandler_keyCodes[191] = 73; - KeyHandler.KeyHandler_keyCodes[192] = 58; - KeyHandler.KeyHandler_keyCodes[219] = 42; - KeyHandler.KeyHandler_keyCodes[220] = 74; - KeyHandler.KeyHandler_keyCodes[221] = 43; - KeyHandler.KeyHandler_keyCodes[222] = 59; - KeyHandler.KeyHandler_keyCodes[223] = 28; - } else { - KeyHandler.KeyHandler_keyCodes[44] = 71; - KeyHandler.KeyHandler_keyCodes[45] = 26; - KeyHandler.KeyHandler_keyCodes[46] = 72; - KeyHandler.KeyHandler_keyCodes[47] = 73; - KeyHandler.KeyHandler_keyCodes[59] = 57; - KeyHandler.KeyHandler_keyCodes[61] = 27; - KeyHandler.KeyHandler_keyCodes[91] = 42; - KeyHandler.KeyHandler_keyCodes[92] = 74; - KeyHandler.KeyHandler_keyCodes[93] = 43; - KeyHandler.KeyHandler_keyCodes[192] = 28; - KeyHandler.KeyHandler_keyCodes[222] = 58; - KeyHandler.KeyHandler_keyCodes[520] = 59; + @Export("selectSpell") + static void selectSpell(int var0, int var1, int var2, int var3) { + Widget var4 = SecureRandomCallable.getWidgetChild(var0, var1); // L: 8100 + if (var4 != null && var4.onTargetEnter != null) { // L: 8101 + ScriptEvent var5 = new ScriptEvent(); // L: 8102 + var5.widget = var4; // L: 8103 + var5.args = var4.onTargetEnter; // L: 8104 + Script.runScriptEvent(var5); // L: 8105 } - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-519092714" - ) - @Export("ByteArrayPool_release") - public static synchronized void ByteArrayPool_release(byte[] var0) { - if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) { - ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0; - } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) { - ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0; - } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) { - ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0; - } else { - if (Fonts.ByteArrayPool_arrays != null) { - for (int var1 = 0; var1 < ParamDefinition.ByteArrayPool_alternativeSizes.length; ++var1) { - if (var0.length == ParamDefinition.ByteArrayPool_alternativeSizes[var1] && VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var1] < Fonts.ByteArrayPool_arrays[var1].length) { - Fonts.ByteArrayPool_arrays[var1][VarbitDefinition.ByteArrayPool_altSizeArrayCounts[var1]++] = var0; - return; - } - } - } - - } - } + Client.field834 = var3; // L: 8107 + Client.isSpellSelected = true; // L: 8108 + class232.selectedSpellWidget = var0; // L: 8109 + Client.selectedSpellChildIndex = var1; // L: 8110 + UserComparator8.selectedSpellFlags = var2; // L: 8111 + class52.invalidateWidget(var4); // L: 8112 + } // L: 8113 } diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java index f403f6d0ac..57cc5a01d2 100644 --- a/runescape-client/src/main/java/UserComparator1.java +++ b/runescape-client/src/main/java/UserComparator1.java @@ -1,35 +1,170 @@ +import java.io.IOException; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("la") +@ObfuscatedName("lt") @Implements("UserComparator1") public class UserComparator1 implements Comparator { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator1(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljf;Ljf;I)I", - garbageValue = "1065681362" + descriptor = "(Ljc;Ljc;B)I", + garbageValue = "57" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { - return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); + return this.reversed ? var1.compareTo_user(var2) : var2.compareTo_user(var1); // L: 14 } public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); + return this.compare_bridged((User)var1, (User)var2); // L: 18 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 22 } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lic;Lic;ZII)V", + garbageValue = "1091425537" + ) + static void method6041(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { + if (Login.clearLoginScreen) { // L: 124 + if (var3 == 4) { // L: 125 + Login.loginIndex = 4; // L: 126 + } + + } else { + Login.loginIndex = var3; // L: 130 + Rasterizer2D.Rasterizer2D_clear(); // L: 131 + byte[] var4 = var0.takeFileByNames("title.jpg", ""); // L: 132 + UserComparator2.leftTitleSprite = MouseHandler.convertJpgToSprite(var4); // L: 133 + Login.rightTitleSprite = UserComparator2.leftTitleSprite.mirrorHorizontally(); // L: 134 + if ((Client.worldProperties & 536870912) != 0) { // L: 135 + AbstractByteArrayCopier.logoSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); + } else if ((Client.worldProperties & 1073741824) != 0) { // L: 136 + AbstractByteArrayCopier.logoSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); + } else { + AbstractByteArrayCopier.logoSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); // L: 137 + } + + class296.titleboxSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); // L: 138 + ModelData0.titlebuttonSprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); // L: 139 + int var6 = var1.getGroupId("runes"); // L: 142 + int var7 = var1.getFileId(var6, ""); // L: 143 + IndexedSprite[] var5 = UserComparator5.method3515(var1, var6, var7); // L: 144 + GrandExchangeOfferTotalQuantityComparator.runesSprite = var5; // L: 146 + var7 = var1.getGroupId("title_mute"); // L: 149 + int var8 = var1.getFileId(var7, ""); // L: 150 + IndexedSprite[] var10 = UserComparator5.method3515(var1, var7, var8); // L: 151 + ClientPreferences.title_muteSprite = var10; // L: 153 + class227.options_buttons_0Sprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); // L: 154 + PlayerType.field3134 = class234.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); // L: 155 + MusicPatchNode2.options_buttons_2Sprite = class234.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); // L: 156 + Login.field1221 = class234.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); // L: 157 + GrandExchangeOfferNameComparator.field114 = class227.options_buttons_0Sprite.subWidth; // L: 158 + ReflectionCheck.field1364 = class227.options_buttons_0Sprite.subHeight; // L: 159 + Varcs.loginScreenRunesAnimation = new LoginScreenAnimation(GrandExchangeOfferTotalQuantityComparator.runesSprite); // L: 160 + if (var2) { // L: 161 + Login.Login_username = ""; // L: 162 + Login.Login_password = ""; // L: 163 + } + + LoginScreenAnimation.field1070 = 0; // L: 165 + WorldMapLabelSize.otp = ""; // L: 166 + Login.field1223 = true; // L: 167 + Login.worldSelectOpen = false; // L: 168 + if (!Tile.clientPreferences.titleMusicDisabled) { // L: 169 + Archive var11 = CollisionMap.archive6; // L: 170 + var8 = var11.getGroupId("scape main"); // L: 172 + int var9 = var11.getFileId(var8, ""); // L: 173 + class206.musicPlayerStatus = 1; // L: 175 + class204.musicTrackArchive = var11; // L: 176 + BuddyRankComparator.musicTrackGroupId = var8; // L: 177 + class206.musicTrackFileId = var9; // L: 178 + Tiles.musicTrackVolume = 255; // L: 179 + class206.musicTrackBoolean = false; // L: 180 + FaceNormal.pcmSampleLength = 2; // L: 181 + } else { + class58.method915(2); // L: 185 + } + + if (NetCache.NetCache_socket != null) { // L: 187 + try { + Buffer var15 = new Buffer(4); // L: 189 + var15.writeByte(3); // L: 190 + var15.writeMedium(0); // L: 191 + NetCache.NetCache_socket.write(var15.array, 0, 4); // L: 192 + } catch (IOException var14) { + try { + NetCache.NetCache_socket.close(); // L: 196 + } catch (Exception var13) { // L: 198 + } + + ++NetCache.NetCache_ioExceptions; // L: 199 + NetCache.NetCache_socket = null; // L: 200 + } + } + + Login.clearLoginScreen = true; // L: 203 + Login.xPadding = (FloorDecoration.canvasWidth - 765) / 2; // L: 204 + Login.loginBoxX = Login.xPadding + 202; // L: 205 + IsaacCipher.loginBoxCenter = Login.loginBoxX + 180; // L: 206 + UserComparator2.leftTitleSprite.drawAt(Login.xPadding, 0); // L: 207 + Login.rightTitleSprite.drawAt(Login.xPadding + 382, 0); // L: 208 + AbstractByteArrayCopier.logoSprite.drawAt(Login.xPadding + 382 - AbstractByteArrayCopier.logoSprite.subWidth / 2, 18); // L: 209 + } + } // L: 128 210 + + @ObfuscatedName("hh") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-660550270" + ) + static final void method6040() { + int var0 = ChatChannel.menuX; // L: 7018 + int var1 = Client.menuY; // L: 7019 + int var2 = DevicePcmPlayerProvider.menuWidth; // L: 7020 + int var3 = WorldMapManager.menuHeight; // L: 7021 + int var4 = 6116423; // L: 7022 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); // L: 7023 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); // L: 7024 + Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); // L: 7025 + class4.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); // L: 7026 + int var5 = MouseHandler.MouseHandler_x; // L: 7027 + int var6 = MouseHandler.MouseHandler_y; // L: 7028 + + for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { // L: 7029 + int var8 = var1 + (Client.menuOptionsCount - 1 - var7) * 15 + 31; // L: 7030 + int var9 = 16777215; // L: 7031 + if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { // L: 7032 + var9 = 16776960; + } + + Font var10 = class4.fontBold12; // L: 7033 + String var11; + if (var7 < 0) { // L: 7036 + var11 = ""; // L: 7037 + } else if (Client.menuTargets[var7].length() > 0) { // L: 7040 + var11 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; + } else { + var11 = Client.menuActions[var7]; // L: 7041 + } + + var10.draw(var11, var0 + 3, var8, var9, 0); // L: 7043 + } + + HealthBarUpdate.method1817(ChatChannel.menuX, Client.menuY, DevicePcmPlayerProvider.menuWidth, WorldMapManager.menuHeight); // L: 7045 + } // L: 7046 } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 04dc525b8f..6cbd603008 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -1,37 +1,32 @@ -import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fq") +@ObfuscatedName("fk") @Implements("UserComparator10") public class UserComparator10 extends AbstractUserComparator { - @ObfuscatedName("ef") - @ObfuscatedSignature( - descriptor = "Llq;" - ) - @Export("spriteIds") - static GraphicsDefaults spriteIds; - @ObfuscatedName("m") + @ObfuscatedName("ei") + static int[] field2017; + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator10(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;I)I", - garbageValue = "-227570330" + descriptor = "(Lko;Lko;B)I", + garbageValue = "37" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world && var2.world == Client.worldId) { - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 16 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 18 } } @@ -39,38 +34,18 @@ public class UserComparator10 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("ks") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-856816613" + descriptor = "(III)I", + garbageValue = "1641862640" ) - static void method3522(String var0) { - Client.field871 = var0; - - try { - String var1 = WorldMapSectionType.client.getParameter(Integer.toString(18)); - String var2 = WorldMapSectionType.client.getParameter(Integer.toString(13)); - String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; - if (var0.length() == 0) { - var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; - } else { - String var4 = var3 + "; Expires="; - long var6 = MilliClock.currentTimeMillis() + 94608000000L; - Calendar.Calendar_calendar.setTime(new Date(var6)); - int var8 = Calendar.Calendar_calendar.get(7); - int var9 = Calendar.Calendar_calendar.get(5); - int var10 = Calendar.Calendar_calendar.get(2); - int var11 = Calendar.Calendar_calendar.get(1); - int var12 = Calendar.Calendar_calendar.get(11); - int var13 = Calendar.Calendar_calendar.get(12); - int var14 = Calendar.Calendar_calendar.get(13); - String var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT"; - var3 = var4 + var5 + "; Max-Age=" + 94608000L; - } - - class56.method919(WorldMapSectionType.client, "document.cookie=\"" + var3 + "\""); - } catch (Throwable var15) { + @Export("ItemContainer_getCount") + static int ItemContainer_getCount(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 21 + if (var2 == null) { // L: 22 + return 0; + } else { + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; // L: 23 24 } - } } diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java index e8bef692c8..b2e6005a61 100644 --- a/runescape-client/src/main/java/UserComparator2.java +++ b/runescape-client/src/main/java/UserComparator2.java @@ -1,153 +1,44 @@ -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.Comparator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.Reflection; -@ObfuscatedName("lt") +@ObfuscatedName("lg") @Implements("UserComparator2") public class UserComparator2 implements Comparator { - @ObfuscatedName("m") + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Llp;" + ) + @Export("leftTitleSprite") + static Sprite leftTitleSprite; + @ObfuscatedName("p") + @Export("userHomeDirectory") + static String userHomeDirectory; + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator2(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljf;Ljf;I)I", - garbageValue = "1905433483" + descriptor = "(Ljc;Ljc;I)I", + garbageValue = "-512542775" ) @Export("compare_bridged") int compare_bridged(User var1, User var2) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); - } - - public int compare(Object var1, Object var2) { - return this.compare_bridged((User)var1, (User)var2); + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14 } public boolean equals(Object var1) { - return super.equals(var1); + return super.equals(var1); // L: 22 } - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "1240194067" - ) - @Export("readReflectionCheck") - public static void readReflectionCheck(Buffer var0, int var1) { - ReflectionCheck var2 = new ReflectionCheck(); - var2.size = var0.readUnsignedByte(); - var2.id = var0.readInt(); - var2.operations = new int[var2.size]; - var2.creationErrors = new int[var2.size]; - var2.fields = new Field[var2.size]; - var2.intReplaceValues = new int[var2.size]; - var2.methods = new Method[var2.size]; - var2.arguments = new byte[var2.size][][]; - - for (int var3 = 0; var3 < var2.size; ++var3) { - try { - int var4 = var0.readUnsignedByte(); - String var5; - String var6; - int var7; - if (var4 != 0 && var4 != 1 && var4 != 2) { - if (var4 == 3 || var4 == 4) { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = var0.readUnsignedByte(); - String[] var8 = new String[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var8[var9] = var0.readStringCp1252NullTerminated(); - } - - String var20 = var0.readStringCp1252NullTerminated(); - byte[][] var10 = new byte[var7][]; - int var12; - if (var4 == 3) { - for (int var11 = 0; var11 < var7; ++var11) { - var12 = var0.readInt(); - var10[var11] = new byte[var12]; - var0.readBytes(var10[var11], 0, var12); - } - } - - var2.operations[var3] = var4; - Class[] var21 = new Class[var7]; - - for (var12 = 0; var12 < var7; ++var12) { - var21[var12] = ByteArrayPool.loadClassFromDescriptor(var8[var12]); - } - - Class var22 = ByteArrayPool.loadClassFromDescriptor(var20); - if (ByteArrayPool.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - Method[] var13 = ByteArrayPool.loadClassFromDescriptor(var5).getDeclaredMethods(); - Method[] var14 = var13; - - for (int var15 = 0; var15 < var14.length; ++var15) { - Method var16 = var14[var15]; - if (Reflection.getMethodName(var16).equals(var6)) { - Class[] var17 = Reflection.getParameterTypes(var16); - if (var17.length == var21.length) { - boolean var18 = true; - - for (int var19 = 0; var19 < var21.length; ++var19) { - if (var21[var19] != var17[var19]) { - var18 = false; - break; - } - } - - if (var18 && var22 == var16.getReturnType()) { - var2.methods[var3] = var16; - } - } - } - } - - var2.arguments[var3] = var10; - } - } else { - var5 = var0.readStringCp1252NullTerminated(); - var6 = var0.readStringCp1252NullTerminated(); - var7 = 0; - if (var4 == 1) { - var7 = var0.readInt(); - } - - var2.operations[var3] = var4; - var2.intReplaceValues[var3] = var7; - if (ByteArrayPool.loadClassFromDescriptor(var5).getClassLoader() == null) { - throw new SecurityException(); - } - - var2.fields[var3] = Reflection.findField(ByteArrayPool.loadClassFromDescriptor(var5), var6); - } - } catch (ClassNotFoundException var24) { - var2.creationErrors[var3] = -1; - } catch (SecurityException var25) { - var2.creationErrors[var3] = -2; - } catch (NullPointerException var26) { - var2.creationErrors[var3] = -3; - } catch (Exception var27) { - var2.creationErrors[var3] = -4; - } catch (Throwable var28) { - var2.creationErrors[var3] = -5; - } - } - - class105.reflectionChecks.addFirst(var2); + public int compare(Object var1, Object var2) { + return this.compare_bridged((User)var1, (User)var2); // L: 18 } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index 6b408903f2..95dd43cf44 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -1,182 +1,34 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fy") +@ObfuscatedName("fc") @Implements("UserComparator3") public class UserComparator3 extends AbstractUserComparator { - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 822744565 - ) - static int field2009; - @ObfuscatedName("gj") - @ObfuscatedSignature( - descriptor = "Lem;" - ) - @Export("scene") - static Scene scene; - @ObfuscatedName("jf") - @ObfuscatedSignature( - descriptor = "Ldu;" - ) - @Export("textureProvider") - static TextureProvider textureProvider; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator3(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;I)I", - garbageValue = "1287219897" + descriptor = "(Lko;Lko;B)I", + garbageValue = "-39" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var2.world != var1.world) { - return this.reversed ? var1.world - var2.world : var2.world - var1.world; + if (var2.world != var1.world) { // L: 14 + return this.reversed ? var1.world - var2.world : var2.world - var1.world; // L: 15 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 17 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(CB)B", - garbageValue = "-48" - ) - @Export("charToByteCp1252") - public static byte charToByteCp1252(char var0) { - byte var1; - if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { - var1 = (byte)var0; - } else if (var0 == 8364) { - var1 = -128; - } else if (var0 == 8218) { - var1 = -126; - } else if (var0 == 402) { - var1 = -125; - } else if (var0 == 8222) { - var1 = -124; - } else if (var0 == 8230) { - var1 = -123; - } else if (var0 == 8224) { - var1 = -122; - } else if (var0 == 8225) { - var1 = -121; - } else if (var0 == 710) { - var1 = -120; - } else if (var0 == 8240) { - var1 = -119; - } else if (var0 == 352) { - var1 = -118; - } else if (var0 == 8249) { - var1 = -117; - } else if (var0 == 338) { - var1 = -116; - } else if (var0 == 381) { - var1 = -114; - } else if (var0 == 8216) { - var1 = -111; - } else if (var0 == 8217) { - var1 = -110; - } else if (var0 == 8220) { - var1 = -109; - } else if (var0 == 8221) { - var1 = -108; - } else if (var0 == 8226) { - var1 = -107; - } else if (var0 == 8211) { - var1 = -106; - } else if (var0 == 8212) { - var1 = -105; - } else if (var0 == 732) { - var1 = -104; - } else if (var0 == 8482) { - var1 = -103; - } else if (var0 == 353) { - var1 = -102; - } else if (var0 == 8250) { - var1 = -101; - } else if (var0 == 339) { - var1 = -100; - } else if (var0 == 382) { - var1 = -98; - } else if (var0 == 376) { - var1 = -97; - } else { - var1 = 63; - } - - return var1; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;ZLko;S)V", - garbageValue = "22791" - ) - public static void method3548(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { - VarcInt.ItemDefinition_archive = var0; - ItemDefinition.ItemDefinition_modelArchive = var1; - SoundCache.ItemDefinition_inMembersWorld = var2; - HitSplatDefinition.ItemDefinition_fileCount = VarcInt.ItemDefinition_archive.getGroupFileCount(10); - class234.ItemDefinition_fontPlain11 = var3; - } - - @ObfuscatedName("if") - @ObfuscatedSignature( - descriptor = "(Lhd;IIZS)V", - garbageValue = "1700" - ) - @Export("alignWidgetSize") - static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) { - int var4 = var0.width; - int var5 = var0.height; - if (var0.widthAlignment == 0) { - var0.width = var0.rawWidth; - } else if (var0.widthAlignment == 1) { - var0.width = var1 - var0.rawWidth; - } else if (var0.widthAlignment == 2) { - var0.width = var0.rawWidth * var1 >> 14; - } - - if (var0.heightAlignment == 0) { - var0.height = var0.rawHeight; - } else if (var0.heightAlignment == 1) { - var0.height = var2 - var0.rawHeight; - } else if (var0.heightAlignment == 2) { - var0.height = var2 * var0.rawHeight >> 14; - } - - if (var0.widthAlignment == 4) { - var0.width = var0.field2741 * var0.height / var0.field2641; - } - - if (var0.heightAlignment == 4) { - var0.height = var0.width * var0.field2641 / var0.field2741; - } - - if (var0.contentType == 1337) { - Client.viewportWidget = var0; - } - - if (var3 && var0.onResize != null && (var4 != var0.width || var5 != var0.height)) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var0; - var6.args = var0.onResize; - Client.scriptEvents.addFirst(var6); - } - + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 } } diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java index 8a31c9b855..b2c1dd6167 100644 --- a/runescape-client/src/main/java/UserComparator4.java +++ b/runescape-client/src/main/java/UserComparator4.java @@ -4,147 +4,40 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fc") +@ObfuscatedName("fs") @Implements("UserComparator4") public class UserComparator4 implements Comparator { - @ObfuscatedName("m") + @ObfuscatedName("f") + static String[] field2005; + @ObfuscatedName("fu") + @ObfuscatedSignature( + descriptor = "Lev;" + ) + @Export("urlRequester") + static UrlRequester urlRequester; + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator4(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;I)I", - garbageValue = "-1314738925" + descriptor = "(Lko;Lko;I)I", + garbageValue = "1508747808" ) @Export("compare_bridged") int compare_bridged(Buddy var1, Buddy var2) { - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 14 } public int compare(Object var1, Object var2) { - return this.compare_bridged((Buddy)var1, (Buddy)var2); + return this.compare_bridged((Buddy)var1, (Buddy)var2); // L: 18 } public boolean equals(Object var1) { - return super.equals(var1); - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lgn;Llb;I)Lgj;", - garbageValue = "527815306" - ) - @Export("getPacketBufferNode") - public static PacketBufferNode getPacketBufferNode(ClientPacket var0, IsaacCipher var1) { - PacketBufferNode var2; - if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { - var2 = new PacketBufferNode(); - } else { - var2 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; - } - - var2.clientPacket = var0; - var2.clientPacketLength = var0.length; - if (var2.clientPacketLength == -1) { - var2.packetBuffer = new PacketBuffer(260); - } else if (var2.clientPacketLength == -2) { - var2.packetBuffer = new PacketBuffer(10000); - } else if (var2.clientPacketLength <= 18) { - var2.packetBuffer = new PacketBuffer(20); - } else if (var2.clientPacketLength <= 98) { - var2.packetBuffer = new PacketBuffer(100); - } else { - var2.packetBuffer = new PacketBuffer(260); - } - - var2.packetBuffer.setIsaacCipher(var1); - var2.packetBuffer.writeByteIsaac(var2.clientPacket.id); - var2.index = 0; - return var2; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;Lic;Lic;B)V", - garbageValue = "-47" - ) - public static void method3495(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) { - Widget.Widget_archive = var0; - SecureRandomCallable.Widget_modelsArchive = var1; - class349.Widget_spritesArchive = var2; - WorldMapLabel.Widget_fontsArchive = var3; - Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; - UserComparator6.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-2121734057" - ) - @Export("loadInterface") - public static boolean loadInterface(int var0) { - if (UserComparator6.Widget_loadedInterfaces[var0]) { - return true; - } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { - return false; - } else { - int var1 = Widget.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - UserComparator6.Widget_loadedInterfaces[var0] = true; - return true; - } else { - if (Widget.Widget_interfaceComponents[var0] == null) { - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } - - for (int var2 = 0; var2 < var1; ++var2) { - if (Widget.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } - } - } - - UserComparator6.Widget_loadedInterfaces[var0] = true; - return true; - } - } - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1503044626" - ) - @Export("runWidgetOnLoadListener") - static void runWidgetOnLoadListener(int var0) { - if (var0 != -1) { - if (loadInterface(var0)) { - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3.onLoad != null) { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onLoad; - WorldMapLabel.runScript(var4, 5000000); - } - } - - } - } + return super.equals(var1); // L: 22 } } diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java index 4c7e8bad7e..d276631f69 100644 --- a/runescape-client/src/main/java/UserComparator5.java +++ b/runescape-client/src/main/java/UserComparator5.java @@ -3,102 +3,63 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fx") +@ObfuscatedName("fb") @Implements("UserComparator5") public class UserComparator5 extends AbstractUserComparator { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator5(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;B)I", - garbageValue = "0" + descriptor = "(Lko;Lko;B)I", + garbageValue = "46" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0) { - if (var2.world == 0) { + if (var1.world != 0) { // L: 14 + if (var2.world == 0) { // L: 15 return this.reversed ? -1 : 1; } } else if (var2.world != 0) { - return this.reversed ? 1 : -1; + return this.reversed ? 1 : -1; // L: 18 } - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 20 } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 24 } - @ObfuscatedName("q") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;IB)Ljava/lang/String;", - garbageValue = "2" + descriptor = "(Lic;IIB)[Lls;", + garbageValue = "20" ) - static String method3534(Buffer var0, int var1) { - try { - int var2 = var0.readUShortSmart(); - if (var2 > var1) { - var2 = var1; - } - - byte[] var3 = new byte[var2]; - var0.offset += class219.huffman.decompress(var0.array, var0.offset, var3, 0, var2); - String var4 = MouseRecorder.decodeStringCp1252(var3, 0, var2); - return var4; - } catch (Exception var6) { - return "Cabbage"; + public static IndexedSprite[] method3515(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 25 + boolean var3; + if (var4 == null) { // L: 26 + var3 = false; // L: 27 + } else { + Occluder.SpriteBuffer_decode(var4); // L: 30 + var3 = true; // L: 31 } + + return !var3 ? null : class307.method5558(); // L: 33 34 } - @ObfuscatedName("in") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIIIIS)V", - garbageValue = "-4011" + descriptor = "(I)[Lgd;", + garbageValue = "-755062190" ) - static final void method3540(int var0, int var1, int var2, int var3, int var4, int var5) { - int var6 = var2 - var0; - int var7 = var3 - var1; - int var8 = var6 >= 0 ? var6 : -var6; - int var9 = var7 >= 0 ? var7 : -var7; - int var10 = var8; - if (var8 < var9) { - var10 = var9; - } - - if (var10 != 0) { - int var11 = (var6 << 16) / var10; - int var12 = (var7 << 16) / var10; - if (var12 <= var11) { - var11 = -var11; - } else { - var12 = -var12; - } - - int var13 = var5 * var12 >> 17; - int var14 = var5 * var12 + 1 >> 17; - int var15 = var5 * var11 >> 17; - int var16 = var5 * var11 + 1 >> 17; - var0 -= Rasterizer2D.Rasterizer2D_xClipStart; - var1 -= Rasterizer2D.Rasterizer2D_yClipStart; - int var17 = var0 + var13; - int var18 = var0 - var14; - int var19 = var0 + var6 - var14; - int var20 = var0 + var13 + var6; - int var21 = var15 + var1; - int var22 = var1 - var16; - int var23 = var7 + var1 - var16; - int var24 = var7 + var15 + var1; - Rasterizer3D.method3144(var17, var18, var19); - Rasterizer3D.method3124(var21, var22, var23, var17, var18, var19, var4); - Rasterizer3D.method3144(var17, var19, var20); - Rasterizer3D.method3124(var21, var23, var24, var17, var19, var20, var4); - } + public static class194[] method3518() { + return new class194[]{class194.field2371, class194.field2362, class194.field2363, class194.field2370, class194.field2365, class194.field2366, class194.field2364, class194.field2368, class194.field2361, class194.field2367}; // L: 17 } } diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index 9589c52a68..cc2b1e6a81 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -3,30 +3,21 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fo") +@ObfuscatedName("fg") @Implements("UserComparator6") public class UserComparator6 extends AbstractUserComparator { - @ObfuscatedName("u") - @Export("Widget_loadedInterfaces") - static boolean[] Widget_loadedInterfaces; - @ObfuscatedName("gp") - @ObfuscatedSignature( - descriptor = "[Llh;" - ) - @Export("mapSceneSprites") - static IndexedSprite[] mapSceneSprites; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator6(boolean var1) { - this.reversed = var1; + this.reversed = var1; // L: 10 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;S)I", - garbageValue = "2600" + descriptor = "(Lko;Lko;I)I", + garbageValue = "1525327475" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { @@ -41,30 +32,42 @@ public class UserComparator6 extends AbstractUserComparator { return this.compareBuddy((Buddy)var1, (Buddy)var2); } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-59" + descriptor = "([Ljava/lang/CharSequence;IIB)Ljava/lang/String;", + garbageValue = "38" ) - @Export("ItemContainer_getCount") - static int ItemContainer_getCount(int var0, int var1) { - ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var2 == null) { - return 0; + public static String method3535(CharSequence[] var0, int var1, int var2) { + if (var2 == 0) { // L: 11 + return ""; + } else if (var2 == 1) { // L: 12 + CharSequence var10 = var0[var1]; // L: 13 + return var10 == null ? "null" : var10.toString(); // L: 14 15 } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; - } - } + int var3 = var2 + var1; // L: 17 + int var4 = 0; // L: 18 - @ObfuscatedName("gf") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "0" - ) - static void method3564() { - if (Client.renderSelf) { - class9.addPlayerToScene(class60.localPlayer, false); - } + for (int var5 = var1; var5 < var3; ++var5) { // L: 19 + CharSequence var9 = var0[var5]; // L: 20 + if (var9 == null) { // L: 21 + var4 += 4; + } else { + var4 += var9.length(); // L: 22 + } + } + StringBuilder var8 = new StringBuilder(var4); // L: 24 + + for (int var6 = var1; var6 < var3; ++var6) { // L: 25 + CharSequence var7 = var0[var6]; // L: 26 + if (var7 == null) { // L: 27 + var8.append("null"); + } else { + var8.append(var7); // L: 28 + } + } + + return var8.toString(); // L: 30 + } } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index e72f7c948c..6b4410d485 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -1,118 +1,206 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fk") +@ObfuscatedName("fe") @Implements("UserComparator7") public class UserComparator7 extends AbstractUserComparator { - @ObfuscatedName("c") - @ObfuscatedGetter( - intValue = -221140543 - ) - static int field2003; - @ObfuscatedName("dv") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive6") - static Archive archive6; @ObfuscatedName("m") + public static short[][] field2021; + @ObfuscatedName("dj") + @ObfuscatedSignature( + descriptor = "Lfl;" + ) + @Export("js5SocketTask") + static Task js5SocketTask; + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator7(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;B)I", - garbageValue = "-76" + descriptor = "(Lko;Lko;I)I", + garbageValue = "1614336230" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (var1.world != 0 && var2.world != 0) { - return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; + if (var1.world != 0 && var2.world != 0) { // L: 14 + return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; // L: 15 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 17 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 21 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "([BS)Lcy;", + garbageValue = "-15973" + ) + @Export("newScript") + static Script newScript(byte[] var0) { + Script var1 = new Script(); // L: 111 + Buffer var2 = new Buffer(var0); // L: 112 + var2.offset = var2.array.length - 2; // L: 113 + int var3 = var2.readUnsignedShort(); // L: 114 + int var4 = var2.array.length - 2 - var3 - 12; // L: 115 + var2.offset = var4; // L: 116 + int var5 = var2.readInt(); // L: 117 + var1.localIntCount = var2.readUnsignedShort(); // L: 118 + var1.localStringCount = var2.readUnsignedShort(); // L: 119 + var1.intArgumentCount = var2.readUnsignedShort(); // L: 120 + var1.stringArgumentCount = var2.readUnsignedShort(); // L: 121 + int var6 = var2.readUnsignedByte(); // L: 122 + int var7; + int var8; + if (var6 > 0) { // L: 123 + var1.switches = var1.newIterableNodeHashTable(var6); // L: 124 + + for (var7 = 0; var7 < var6; ++var7) { // L: 125 + var8 = var2.readUnsignedShort(); // L: 126 + IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? class297.method5378(var8) : 1); // L: 127 + var1.switches[var7] = var9; // L: 128 + + while (var8-- > 0) { // L: 129 + int var10 = var2.readInt(); // L: 130 + int var11 = var2.readInt(); // L: 131 + var9.put(new IntegerNode(var11), (long)var10); // L: 132 + } + } + } + + var2.offset = 0; // L: 136 + var2.readStringCp1252NullTerminatedOrNull(); // L: 137 + var1.opcodes = new int[var5]; // L: 138 + var1.intOperands = new int[var5]; // L: 139 + var1.stringOperands = new String[var5]; // L: 140 + + for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { // L: 141 142 147 + var8 = var2.readUnsignedShort(); // L: 143 + if (var8 == 3) { // L: 144 + var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); + } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { // L: 145 + var1.intOperands[var7] = var2.readInt(); + } else { + var1.intOperands[var7] = var2.readUnsignedByte(); // L: 146 + } + } + + return var1; // L: 149 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Z", - garbageValue = "-71116023" + descriptor = "(Ljava/lang/CharSequence;IZI)I", + garbageValue = "-1793488116" ) - @Export("isNumber") - public static boolean isNumber(CharSequence var0) { - boolean var2 = false; - boolean var3 = false; - int var4 = 0; - int var5 = var0.length(); - int var6 = 0; + @Export("parseIntCustomRadix") + static int parseIntCustomRadix(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 75 + boolean var3 = false; // L: 76 + boolean var4 = false; // L: 77 + int var5 = 0; // L: 78 + int var6 = var0.length(); // L: 79 - boolean var1; - while (true) { - if (var6 >= var5) { - var1 = var3; - break; - } - - label84: { - char var7 = var0.charAt(var6); - if (var6 == 0) { - if (var7 == '-') { - var2 = true; - break label84; + for (int var7 = 0; var7 < var6; ++var7) { // L: 80 + char var8 = var0.charAt(var7); // L: 81 + if (var7 == 0) { // L: 82 + if (var8 == '-') { // L: 83 + var3 = true; // L: 84 + continue; } - if (var7 == '+') { - break label84; + if (var8 == '+') { // L: 87 + continue; } } - int var9; - if (var7 >= '0' && var7 <= '9') { - var9 = var7 - '0'; - } else if (var7 >= 'A' && var7 <= 'Z') { - var9 = var7 - '7'; + int var10; + if (var8 >= '0' && var8 <= '9') { // L: 89 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { // L: 90 + var10 = var8 - '7'; } else { - if (var7 < 'a' || var7 > 'z') { - var1 = false; - break; + if (var8 < 'a' || var8 > 'z') { // L: 91 + throw new NumberFormatException(); // L: 92 } - var9 = var7 - 'W'; + var10 = var8 - 'W'; } - if (var9 >= 10) { - var1 = false; - break; + if (var10 >= var1) { // L: 93 + throw new NumberFormatException(); } - if (var2) { - var9 = -var9; + if (var3) { // L: 94 + var10 = -var10; } - int var8 = var9 + var4 * 10; - if (var4 != var8 / 10) { - var1 = false; - break; + int var9 = var10 + var5 * var1; // L: 95 + if (var9 / var1 != var5) { // L: 96 + throw new NumberFormatException(); } - var4 = var8; - var3 = true; + var5 = var9; // L: 97 + var4 = true; // L: 98 } - ++var6; + if (!var4) { // L: 100 + throw new NumberFormatException(); + } else { + return var5; // L: 101 + } + } else { + throw new IllegalArgumentException("" + var1); } + } - return var1; + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(ILcy;ZB)I", + garbageValue = "54" + ) + static int method3513(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3124 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class39.getWindowedMode(); // L: 3125 + return 1; // L: 3126 + } else { + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3128 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3129 + if (var3 == 1 || var3 == 2) { // L: 3130 + FontName.setWindowedMode(var3); + } + + return 1; // L: 3131 + } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3133 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Tile.clientPreferences.windowMode; // L: 3134 + return 1; // L: 3135 + } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3137 + if (var0 == 5310) { // L: 3145 + --Interpreter.Interpreter_intStackSize; // L: 3146 + return 1; // L: 3147 + } else { + return 2; // L: 3149 + } + } else { + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3138 + if (var3 == 1 || var3 == 2) { // L: 3139 + Tile.clientPreferences.windowMode = var3; // L: 3140 + WorldMapData_1.savePreferences(); // L: 3141 + } + + return 1; // L: 3143 + } + } } } diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java index b2037d5c5a..2385546c1a 100644 --- a/runescape-client/src/main/java/UserComparator8.java +++ b/runescape-client/src/main/java/UserComparator8.java @@ -1,54 +1,172 @@ +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("fp") +@ObfuscatedName("fz") @Implements("UserComparator8") public class UserComparator8 extends AbstractUserComparator { - @ObfuscatedName("q") + @ObfuscatedName("ml") @ObfuscatedGetter( - intValue = 682159937 + intValue = 1924820265 ) - @Export("SpriteBuffer_spriteHeight") - static int SpriteBuffer_spriteHeight; - @ObfuscatedName("m") + @Export("selectedSpellFlags") + static int selectedSpellFlags; + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator8(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;B)I", - garbageValue = "101" + descriptor = "(Lko;Lko;I)I", + garbageValue = "2134639094" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world) { + if (Client.worldId == var1.world) { // L: 15 if (var2.world != Client.worldId) { - return this.reversed ? -1 : 1; + return this.reversed ? -1 : 1; // L: 16 } } else if (var2.world == Client.worldId) { - return this.reversed ? 1 : -1; + return this.reversed ? 1 : -1; // L: 19 } - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 21 } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 25 } - @ObfuscatedName("m") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lic;B)V", - garbageValue = "-79" + descriptor = "(I)V", + garbageValue = "-346223119" ) - public static void method3520(AbstractArchive var0) { - class349.EnumDefinition_archive = var0; - } + static void method3497() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 59 + + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 60 + var1.clearIsFromIgnored(); // L: 62 + } + + } // L: 65 + + @ObfuscatedName("hr") + @ObfuscatedSignature( + descriptor = "(IIIILjava/lang/String;I)V", + garbageValue = "5447361" + ) + @Export("widgetDefaultMenuAction") + static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { + Widget var5 = SecureRandomCallable.getWidgetChild(var1, var2); // L: 8137 + if (var5 != null) { // L: 8138 + if (var5.onOp != null) { // L: 8139 + ScriptEvent var6 = new ScriptEvent(); // L: 8140 + var6.widget = var5; // L: 8141 + var6.opIndex = var0; // L: 8142 + var6.targetName = var4; // L: 8143 + var6.args = var5.onOp; // L: 8144 + Script.runScriptEvent(var6); // L: 8145 + } + + boolean var8 = true; // L: 8147 + if (var5.contentType > 0) { // L: 8148 + var8 = class4.method60(var5); + } + + if (var8) { // L: 8149 + if (StudioGame.method4230(WorldMapIcon_0.getWidgetFlags(var5), var0 - 1)) { // L: 8150 + PacketBufferNode var7; + if (var0 == 1) { // L: 8153 + var7 = Client.getPacketBufferNode(ClientPacket.field2253, Client.packetWriter.isaacCipher); // L: 8155 + var7.packetBuffer.writeInt(var1); // L: 8156 + var7.packetBuffer.writeShort(var2); // L: 8157 + var7.packetBuffer.writeShort(var3); // L: 8158 + Client.packetWriter.addNode(var7); // L: 8159 + } + + if (var0 == 2) { // L: 8161 + var7 = Client.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); // L: 8163 + var7.packetBuffer.writeInt(var1); // L: 8164 + var7.packetBuffer.writeShort(var2); // L: 8165 + var7.packetBuffer.writeShort(var3); // L: 8166 + Client.packetWriter.addNode(var7); // L: 8167 + } + + if (var0 == 3) { // L: 8169 + var7 = Client.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); // L: 8171 + var7.packetBuffer.writeInt(var1); // L: 8172 + var7.packetBuffer.writeShort(var2); // L: 8173 + var7.packetBuffer.writeShort(var3); // L: 8174 + Client.packetWriter.addNode(var7); // L: 8175 + } + + if (var0 == 4) { // L: 8177 + var7 = Client.getPacketBufferNode(ClientPacket.field2255, Client.packetWriter.isaacCipher); // L: 8179 + var7.packetBuffer.writeInt(var1); // L: 8180 + var7.packetBuffer.writeShort(var2); // L: 8181 + var7.packetBuffer.writeShort(var3); // L: 8182 + Client.packetWriter.addNode(var7); // L: 8183 + } + + if (var0 == 5) { // L: 8185 + var7 = Client.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); // L: 8187 + var7.packetBuffer.writeInt(var1); // L: 8188 + var7.packetBuffer.writeShort(var2); // L: 8189 + var7.packetBuffer.writeShort(var3); // L: 8190 + Client.packetWriter.addNode(var7); // L: 8191 + } + + if (var0 == 6) { // L: 8193 + var7 = Client.getPacketBufferNode(ClientPacket.field2330, Client.packetWriter.isaacCipher); // L: 8195 + var7.packetBuffer.writeInt(var1); // L: 8196 + var7.packetBuffer.writeShort(var2); // L: 8197 + var7.packetBuffer.writeShort(var3); // L: 8198 + Client.packetWriter.addNode(var7); // L: 8199 + } + + if (var0 == 7) { // L: 8201 + var7 = Client.getPacketBufferNode(ClientPacket.field2247, Client.packetWriter.isaacCipher); // L: 8203 + var7.packetBuffer.writeInt(var1); // L: 8204 + var7.packetBuffer.writeShort(var2); // L: 8205 + var7.packetBuffer.writeShort(var3); // L: 8206 + Client.packetWriter.addNode(var7); // L: 8207 + } + + if (var0 == 8) { // L: 8209 + var7 = Client.getPacketBufferNode(ClientPacket.field2286, Client.packetWriter.isaacCipher); // L: 8211 + var7.packetBuffer.writeInt(var1); // L: 8212 + var7.packetBuffer.writeShort(var2); // L: 8213 + var7.packetBuffer.writeShort(var3); // L: 8214 + Client.packetWriter.addNode(var7); // L: 8215 + } + + if (var0 == 9) { // L: 8217 + var7 = Client.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); // L: 8219 + var7.packetBuffer.writeInt(var1); // L: 8220 + var7.packetBuffer.writeShort(var2); // L: 8221 + var7.packetBuffer.writeShort(var3); // L: 8222 + Client.packetWriter.addNode(var7); // L: 8223 + } + + if (var0 == 10) { // L: 8225 + var7 = Client.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); // L: 8227 + var7.packetBuffer.writeInt(var1); // L: 8228 + var7.packetBuffer.writeShort(var2); // L: 8229 + var7.packetBuffer.writeShort(var3); // L: 8230 + Client.packetWriter.addNode(var7); // L: 8231 + } + + } + } + } + } // L: 8151 8233 } diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 57fd3ef26f..7dfd6a3586 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -1,100 +1,71 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ft") +@ObfuscatedName("fv") @Implements("UserComparator9") public class UserComparator9 extends AbstractUserComparator { - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lkn;" + @ObfuscatedName("rn") + @ObfuscatedGetter( + intValue = 1726851723 ) - @Export("NetCache_reference") - public static Buffer NetCache_reference; - @ObfuscatedName("bw") - @ObfuscatedSignature( - descriptor = "Lgz;" - ) - @Export("clientLanguage") - static Language clientLanguage; - @ObfuscatedName("m") + static int field2013; + @ObfuscatedName("z") @Export("reversed") final boolean reversed; public UserComparator9(boolean var1) { - this.reversed = var1; - } + this.reversed = var1; // L: 11 + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkx;Lkx;I)I", - garbageValue = "239506152" + descriptor = "(Lko;Lko;B)I", + garbageValue = "6" ) @Export("compareBuddy") int compareBuddy(Buddy var1, Buddy var2) { - if (Client.worldId == var1.world && var2.world == Client.worldId) { - return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); + if (Client.worldId == var1.world && var2.world == Client.worldId) { // L: 15 + return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 16 } else { - return this.compareUser(var1, var2); + return this.compareUser(var1, var2); // L: 18 } } public int compare(Object var1, Object var2) { - return this.compareBuddy((Buddy)var1, (Buddy)var2); + return this.compareBuddy((Buddy)var1, (Buddy)var2); // L: 22 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)[Lgx;", - garbageValue = "-1951189301" + descriptor = "(Lic;Lic;ZLkr;I)V", + garbageValue = "-766510730" ) - static LoginPacket[] method3512() { - return new LoginPacket[]{LoginPacket.field2346, LoginPacket.field2347, LoginPacket.field2345, LoginPacket.field2350, LoginPacket.field2352, LoginPacket.field2348}; - } + public static void method3487(AbstractArchive var0, AbstractArchive var1, boolean var2, Font var3) { + class231.ItemDefinition_archive = var0; // L: 84 + ItemDefinition.ItemDefinition_modelArchive = var1; // L: 85 + ItemDefinition.ItemDefinition_inMembersWorld = var2; // L: 86 + class227.ItemDefinition_fileCount = class231.ItemDefinition_archive.getGroupFileCount(10); // L: 87 + ScriptEvent.ItemDefinition_fontPlain11 = var3; // L: 88 + } // L: 89 @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "17173130" - ) - public static void method3509() { - if (MouseHandler.MouseHandler_instance != null) { - synchronized(MouseHandler.MouseHandler_instance) { - MouseHandler.MouseHandler_instance = null; - } - } - + @Export("Entity_unpackID") + public static int Entity_unpackID(long var0) { + return (int)(var0 >>> 17 & 4294967295L); // L: 76 } - @ObfuscatedName("o") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lic;IIIZB)V", - garbageValue = "18" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "-773772836" ) - public static void method3513(AbstractArchive var0, int var1, int var2, int var3, boolean var4) { - class206.field2439 = 1; - Huffman.musicTrackArchive = var0; - class206.musicTrackGroupId = var1; - MilliClock.musicTrackFileId = var2; - class206.musicTrackVolume = var3; - class336.musicTrackBoolean = var4; - class206.field2442 = 10000; - } - - @ObfuscatedName("fx") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "41" - ) - @Export("playSong") - static void playSong(int var0) { - if (var0 == -1 && !Client.field743) { - class89.method2161(); - } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field743) { - MenuAction.playMusicTrack(2, UserComparator7.archive6, var0, 0, Client.musicVolume, false); - } - - Client.currentTrackGroupId = var0; - } + static final void method3492(String var0) { + PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2315, Client.packetWriter.isaacCipher); // L: 134 + var1.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var0)); // L: 135 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 136 + Client.packetWriter.addNode(var1); // L: 137 + } // L: 138 } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index f2839382f5..16341b8deb 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -7,58 +7,58 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ku") +@ObfuscatedName("ka") @Implements("UserList") public abstract class UserList { - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -233955523 + intValue = 2008774827 ) @Export("capacity") final int capacity; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 2126526035 + intValue = -1305401637 ) @Export("size") int size; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[Ljf;" + descriptor = "[Ljc;" ) @Export("array") User[] array; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("usernamesMap") HashMap usernamesMap; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("previousUsernamesMap") HashMap previousUsernamesMap; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("comparator") Comparator comparator; UserList(int var1) { - this.size = 0; - this.comparator = null; - this.capacity = var1; - this.array = this.newTypedArray(var1); - this.usernamesMap = new HashMap(var1 / 8); - this.previousUsernamesMap = new HashMap(var1 / 8); - } + this.size = 0; // L: 9 + this.comparator = null; // L: 13 + this.capacity = var1; // L: 16 + this.array = this.newTypedArray(var1); // L: 17 + this.usernamesMap = new HashMap(var1 / 8); // L: 18 + this.previousUsernamesMap = new HashMap(var1 / 8); // L: 19 + } // L: 20 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Ljf;", - garbageValue = "551595115" + descriptor = "(B)Ljc;", + garbageValue = "35" ) @Export("newInstance") abstract User newInstance(); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)[Ljf;", - garbageValue = "1959965595" + descriptor = "(IB)[Ljc;", + garbageValue = "-19" ) @Export("newTypedArray") abstract User[] newTypedArray(int var1); @@ -66,343 +66,285 @@ public abstract class UserList { @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-830188441" + garbageValue = "1831744514" ) @Export("clear") public void clear() { - this.size = 0; - Arrays.fill(this.array, (Object)null); - this.usernamesMap.clear(); - this.previousUsernamesMap.clear(); - } + this.size = 0; // L: 23 + Arrays.fill(this.array, (Object)null); // L: 24 + this.usernamesMap.clear(); // L: 25 + this.previousUsernamesMap.clear(); // L: 26 + } // L: 27 - @ObfuscatedName("y") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-729089769" + garbageValue = "-1512383935" ) @Export("getSize") public int getSize() { - return this.size; + return this.size; // L: 30 } - @ObfuscatedName("c") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-38" + descriptor = "(I)Z", + garbageValue = "-886251053" ) @Export("isFull") public boolean isFull() { - return this.size == this.capacity; + return this.size == this.capacity; // L: 34 } - @ObfuscatedName("h") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lkq;I)Z", - garbageValue = "-1632091525" + descriptor = "(Lku;I)Z", + garbageValue = "-311304829" ) @Export("contains") public boolean contains(Username var1) { - if (!var1.hasCleanName()) { + if (!var1.hasCleanName()) { // L: 38 return false; } else { - return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); + return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); // L: 39 40 } } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Lkq;I)Ljf;", - garbageValue = "-1715419579" - ) - @Export("getByUsername") - public User getByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); - return var2 != null ? var2 : this.getByPreviousUsername(var1); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lkq;I)Ljf;", - garbageValue = "181197805" - ) - @Export("getByCurrentUsername") - User getByCurrentUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); - } - @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lkq;I)Ljf;", - garbageValue = "-1953560186" + descriptor = "(Lku;I)Ljc;", + garbageValue = "1710477064" + ) + @Export("getByUsername") + public User getByUsername(Username var1) { + User var2 = this.getByCurrentUsername(var1); // L: 44 + return var2 != null ? var2 : this.getByPreviousUsername(var1); // L: 45 46 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Lku;I)Ljc;", + garbageValue = "-1895174831" + ) + @Export("getByCurrentUsername") + User getByCurrentUsername(Username var1) { + return !var1.hasCleanName() ? null : (User)this.usernamesMap.get(var1); // L: 50 51 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(Lku;I)Ljc;", + garbageValue = "835389393" ) @Export("getByPreviousUsername") User getByPreviousUsername(Username var1) { - return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); + return !var1.hasCleanName() ? null : (User)this.previousUsernamesMap.get(var1); // L: 55 56 } - @ObfuscatedName("e") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(Lkq;I)Z", - garbageValue = "-1728392725" + descriptor = "(Lku;I)Z", + garbageValue = "759347580" ) @Export("removeByUsername") public final boolean removeByUsername(Username var1) { - User var2 = this.getByCurrentUsername(var1); - if (var2 == null) { + User var2 = this.getByCurrentUsername(var1); // L: 60 + if (var2 == null) { // L: 61 return false; } else { - this.remove(var2); - return true; + this.remove(var2); // L: 62 + return true; // L: 63 } } - @ObfuscatedName("l") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Ljf;I)V", - garbageValue = "1431327027" + descriptor = "(Ljc;I)V", + garbageValue = "-2147483648" ) @Export("remove") final void remove(User var1) { - int var2 = this.indexOf(var1); - if (var2 != -1) { - this.arrayRemove(var2); - this.mapRemove(var1); + int var2 = this.indexOf(var1); // L: 67 + if (var2 != -1) { // L: 68 + this.arrayRemove(var2); // L: 69 + this.mapRemove(var1); // L: 70 } - } + } // L: 71 - @ObfuscatedName("t") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lkq;I)Ljf;", - garbageValue = "1944275129" + descriptor = "(Lku;I)Ljc;", + garbageValue = "-213135493" ) @Export("addLastNoPreviousUsername") User addLastNoPreviousUsername(Username var1) { - return this.addLast(var1, (Username)null); + return this.addLast(var1, (Username)null); // L: 74 } - @ObfuscatedName("x") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lkq;Lkq;B)Ljf;", - garbageValue = "-18" + descriptor = "(Lku;Lku;I)Ljc;", + garbageValue = "-230668555" ) @Export("addLast") User addLast(Username var1, Username var2) { - if (this.getByCurrentUsername(var1) != null) { + if (this.getByCurrentUsername(var1) != null) { // L: 78 throw new IllegalStateException(); } else { User var3 = this.newInstance(); var3.set(var1, var2); - this.arrayAddLast(var3); - this.mapPut(var3); - return var3; + this.arrayAddLast(var3); // L: 81 + this.mapPut(var3); // L: 82 + return var3; // L: 83 } } - @ObfuscatedName("ah") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(II)Ljf;", - garbageValue = "421321691" + descriptor = "(II)Ljc;", + garbageValue = "1213282055" ) @Export("get") public final User get(int var1) { - if (var1 >= 0 && var1 < this.size) { + if (var1 >= 0 && var1 < this.size) { // L: 87 return this.array[var1]; } else { - throw new ArrayIndexOutOfBoundsException(var1); + throw new ArrayIndexOutOfBoundsException(var1); // L: 88 } } - @ObfuscatedName("ai") + @ObfuscatedName("p") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1382907285" + garbageValue = "-2116233502" ) @Export("sort") public final void sort() { - if (this.comparator == null) { - Arrays.sort(this.array, 0, this.size); + if (this.comparator == null) { // L: 92 + Arrays.sort(this.array, 0, this.size); // L: 93 } else { - Arrays.sort(this.array, 0, this.size, this.comparator); + Arrays.sort(this.array, 0, this.size, this.comparator); // L: 96 } - } + } // L: 98 - @ObfuscatedName("ao") + @ObfuscatedName("b") @ObfuscatedSignature( - descriptor = "(Ljf;Lkq;Lkq;B)V", - garbageValue = "30" + descriptor = "(Ljc;Lku;Lku;B)V", + garbageValue = "5" ) @Export("changeName") final void changeName(User var1, Username var2, Username var3) { - this.mapRemove(var1); - var1.set(var2, var3); - this.mapPut(var1); - } + this.mapRemove(var1); // L: 101 + var1.set(var2, var3); // L: 102 + this.mapPut(var1); // L: 103 + } // L: 104 - @ObfuscatedName("ae") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(Ljf;I)I", - garbageValue = "-473551805" + descriptor = "(Ljc;I)I", + garbageValue = "-1151090294" ) @Export("indexOf") final int indexOf(User var1) { - for (int var2 = 0; var2 < this.size; ++var2) { - if (this.array[var2] == var1) { + for (int var2 = 0; var2 < this.size; ++var2) { // L: 107 + if (this.array[var2] == var1) { // L: 108 return var2; } } - return -1; + return -1; // L: 110 } - @ObfuscatedName("ax") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(Ljf;S)V", - garbageValue = "28740" + descriptor = "(Ljc;I)V", + garbageValue = "1797104499" ) @Export("mapRemove") final void mapRemove(User var1) { - if (this.usernamesMap.remove(var1.username) == null) { + if (this.usernamesMap.remove(var1.username) == null) { // L: 114 throw new IllegalStateException(); } else { if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); + this.previousUsernamesMap.remove(var1.previousUsername); // L: 115 } } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Ljf;B)V", - garbageValue = "-110" - ) - @Export("arrayAddLast") - final void arrayAddLast(User var1) { - this.array[++this.size - 1] = var1; - } + } // L: 116 @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(Ljf;I)V", - garbageValue = "-810709212" + descriptor = "(Ljc;I)V", + garbageValue = "-909101676" + ) + @Export("arrayAddLast") + final void arrayAddLast(User var1) { + this.array[++this.size - 1] = var1; // L: 119 + } // L: 120 + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(Ljc;B)V", + garbageValue = "44" ) @Export("mapPut") final void mapPut(User var1) { - this.usernamesMap.put(var1.username, var1); - if (var1.previousUsername != null) { - User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); - if (var2 != null && var2 != var1) { - var2.previousUsername = null; + this.usernamesMap.put(var1.username, var1); // L: 123 + if (var1.previousUsername != null) { // L: 124 + User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1); // L: 125 + if (var2 != null && var2 != var1) { // L: 126 + var2.previousUsername = null; // L: 127 } } - } + } // L: 130 - @ObfuscatedName("am") + @ObfuscatedName("ao") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1444172767" + descriptor = "(IB)V", + garbageValue = "7" ) @Export("arrayRemove") final void arrayRemove(int var1) { - --this.size; - if (var1 < this.size) { - System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); + --this.size; // L: 133 + if (var1 < this.size) { // L: 134 + System.arraycopy(this.array, var1 + 1, this.array, var1, this.size - var1); // L: 135 } - } + } // L: 137 - @ObfuscatedName("ak") + @ObfuscatedName("ae") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "594179920" + garbageValue = "-50074451" ) @Export("removeComparator") public final void removeComparator() { - this.comparator = null; - } + this.comparator = null; // L: 143 + } // L: 144 - @ObfuscatedName("ad") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(Ljava/util/Comparator;B)V", - garbageValue = "-90" + descriptor = "(Ljava/util/Comparator;I)V", + garbageValue = "-2021425176" ) @Export("addComparator") public final void addComparator(Comparator var1) { - if (this.comparator == null) { - this.comparator = var1; - } else if (this.comparator instanceof AbstractUserComparator) { - ((AbstractUserComparator)this.comparator).addComparator(var1); + if (this.comparator == null) { // L: 147 + this.comparator = var1; // L: 148 + } else if (this.comparator instanceof AbstractUserComparator) { // L: 150 + ((AbstractUserComparator)this.comparator).addComparator(var1); // L: 151 } - } + } // L: 153 - @ObfuscatedName("hj") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1614220910" + descriptor = "(CI)C", + garbageValue = "-641844714" ) - static final void method5333() { - PacketBuffer var0 = Client.packetWriter.packetBuffer; - var0.importIndex(); - int var1 = var0.readBits(8); - int var2; - if (var1 < Client.npcCount) { - for (var2 = var1; var2 < Client.npcCount; ++var2) { - Client.field907[++Client.field687 - 1] = Client.npcIndices[var2]; - } - } - - if (var1 > Client.npcCount) { - throw new RuntimeException(""); - } else { - Client.npcCount = 0; - - for (var2 = 0; var2 < var1; ++var2) { - int var3 = Client.npcIndices[var2]; - NPC var4 = Client.npcs[var3]; - int var5 = var0.readBits(1); - if (var5 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - } else { - int var6 = var0.readBits(2); - if (var6 == 0) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - Client.field719[++Client.field718 - 1] = var3; - } else { - int var7; - int var8; - if (var6 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method2150(var7, (byte)1); - var8 = var0.readBits(1); - if (var8 == 1) { - Client.field719[++Client.field718 - 1] = var3; - } - } else if (var6 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method2150(var7, (byte)2); - var8 = var0.readBits(3); - var4.method2150(var8, (byte)2); - int var9 = var0.readBits(1); - if (var9 == 1) { - Client.field719[++Client.field718 - 1] = var3; - } - } else if (var6 == 3) { - Client.field907[++Client.field687 - 1] = var3; - } - } - } - } - - } + static char method5199(char var0) { + return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; // L: 79 80 } } diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index 21e4b130e1..f31ca44cdc 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -3,91 +3,150 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kq") +@ObfuscatedName("ku") @Implements("Username") public class Username implements Comparable { - @ObfuscatedName("m") + @ObfuscatedName("t") + @Export("SpriteBuffer_xOffsets") + static int[] SpriteBuffer_xOffsets; + @ObfuscatedName("z") @Export("name") String name; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("cleanName") String cleanName; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lmo;)V" + descriptor = "(Ljava/lang/String;Lmu;)V" ) public Username(String var1, LoginType var2) { - this.name = var1; - this.cleanName = class280.method5160(var1, var2); - } + this.name = var1; // L: 11 + String var4; + if (var1 == null) { // L: 15 + var4 = null; // L: 16 + } else { + int var5 = 0; // L: 19 - @ObfuscatedName("m") + int var6; + boolean var7; + char var8; + for (var6 = var1.length(); var5 < var6; ++var5) { // L: 20 23 + var8 = var1.charAt(var5); // L: 25 + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 27 + if (!var7) { // L: 29 + break; + } + } + + while (var6 > var5) { // L: 37 + var8 = var1.charAt(var6 - 1); // L: 39 + var7 = var8 == 160 || var8 == ' ' || var8 == '_' || var8 == '-'; // L: 41 + if (!var7) { // L: 43 + break; + } + + --var6; // L: 47 + } + + int var13 = var6 - var5; // L: 49 + if (var13 >= 1 && var13 <= GrandExchangeOfferUnitPriceComparator.method211(var2)) { // L: 50 + StringBuilder var12 = new StringBuilder(var13); // L: 54 + + for (int var9 = var5; var9 < var6; ++var9) { // L: 55 + char var10 = var1.charAt(var9); // L: 56 + if (WorldMapSprite.method496(var10)) { // L: 57 + char var11 = class307.method5555(var10); // L: 58 + if (var11 != 0) { // L: 59 + var12.append(var11); // L: 60 + } + } + } + + if (var12.length() == 0) { // L: 62 + var4 = null; // L: 63 + } else { + var4 = var12.toString(); // L: 66 + } + } else { + var4 = null; // L: 51 + } + } + + this.cleanName = var4; // L: 68 + } // L: 69 + + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(I)Ljava/lang/String;", - garbageValue = "-633298311" + garbageValue = "-2006682850" ) @Export("getName") public String getName() { - return this.name; + return this.name; // L: 72 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(B)Z", - garbageValue = "0" + garbageValue = "2" ) @Export("hasCleanName") public boolean hasCleanName() { - return this.cleanName != null; + return this.cleanName != null; // L: 76 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkq;I)I", - garbageValue = "820506062" + descriptor = "(Lku;I)I", + garbageValue = "-354391485" ) @Export("compareToTyped") public int compareToTyped(Username var1) { - if (this.cleanName == null) { - return var1.cleanName == null ? 0 : 1; + if (this.cleanName == null) { // L: 100 + return var1.cleanName == null ? 0 : 1; // L: 101 102 } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); // L: 104 105 } } public boolean equals(Object var1) { - if (var1 instanceof Username) { - Username var2 = (Username)var1; - if (this.cleanName == null) { + if (var1 instanceof Username) { // L: 80 + Username var2 = (Username)var1; // L: 81 + if (this.cleanName == null) { // L: 82 return var2.cleanName == null; - } else if (var2.cleanName == null) { + } else if (var2.cleanName == null) { // L: 83 return false; } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); // L: 84 85 } } else { - return false; + return false; // L: 87 } } public int hashCode() { - return this.cleanName == null ? 0 : this.cleanName.hashCode(); + return this.cleanName == null ? 0 : this.cleanName.hashCode(); // L: 91 92 } public String toString() { - return this.getName(); + return this.getName(); // L: 96 } public int compareTo(Object var1) { - return this.compareToTyped((Username)var1); + return this.compareToTyped((Username)var1); // L: 109 } - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II)I", - garbageValue = "-794040320" + descriptor = "(Llq;IIB)I", + garbageValue = "29" ) - public static int method5398(CharSequence var0, int var1) { - return SecureRandomFuture.parseIntCustomRadix(var0, var1, true); + static int method5309(IterableNodeHashTable var0, int var1, int var2) { + if (var0 == null) { // L: 33 + return var2; + } else { + IntegerNode var3 = (IntegerNode)var0.get((long)var1); // L: 34 + return var3 == null ? var2 : var3.integer; // L: 35 36 + } } } diff --git a/runescape-client/src/main/java/Usernamed.java b/runescape-client/src/main/java/Usernamed.java index c77a481a2b..c4293f621c 100644 --- a/runescape-client/src/main/java/Usernamed.java +++ b/runescape-client/src/main/java/Usernamed.java @@ -6,10 +6,10 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("kp") @Implements("Usernamed") public interface Usernamed { - @ObfuscatedName("kr") + @ObfuscatedName("ks") @ObfuscatedSignature( - descriptor = "(B)Lkq;", - garbageValue = "-76" + descriptor = "(I)Lku;", + garbageValue = "1348007061" ) @Export("username") Username username(); diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 1a8df41045..9aa3eaa5e9 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -1,135 +1,113 @@ +import java.applet.Applet; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iv") +@ObfuscatedName("iy") @Implements("VarbitDefinition") public class VarbitDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("VarbitDefinition_archive") public static AbstractArchive VarbitDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("VarbitDefinition_cached") - public static EvictingDualNodeHashTable VarbitDefinition_cached; - @ObfuscatedName("u") - @Export("ByteArrayPool_altSizeArrayCounts") - static int[] ByteArrayPool_altSizeArrayCounts; - @ObfuscatedName("q") + static EvictingDualNodeHashTable VarbitDefinition_cached; + @ObfuscatedName("hf") + @ObfuscatedSignature( + descriptor = "[Llp;" + ) + @Export("mapMarkerSprites") + static Sprite[] mapMarkerSprites; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -85877297 + intValue = -416955877 ) @Export("baseVar") public int baseVar; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -392632623 + intValue = -740697079 ) @Export("startBit") public int startBit; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 196486925 + intValue = -427959509 ) @Export("endBit") public int endBit; static { - VarbitDefinition_cached = new EvictingDualNodeHashTable(64); + VarbitDefinition_cached = new EvictingDualNodeHashTable(64); // L: 11 } - @ObfuscatedName("m") + VarbitDefinition() { + } + + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1405036764" + descriptor = "(Lkf;I)V", + garbageValue = "2006870580" ) @Export("decode") - public void decode(Buffer var1) { + void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 30 + if (var2 == 0) { // L: 31 + return; // L: 34 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 32 } } - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "692433347" + descriptor = "(Lkf;II)V", + garbageValue = "1701572620" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.baseVar = var1.readUnsignedShort(); - this.startBit = var1.readUnsignedByte(); - this.endBit = var1.readUnsignedByte(); + if (var2 == 1) { // L: 37 + this.baseVar = var1.readUnsignedShort(); // L: 38 + this.startBit = var1.readUnsignedByte(); // L: 39 + this.endBit = var1.readUnsignedByte(); // L: 40 } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(I)[Lis;", - garbageValue = "-2057939908" - ) - @Export("PlayerType_values") - public static PlayerType[] PlayerType_values() { - return new PlayerType[]{PlayerType.PlayerType_ultimateIronman, PlayerType.PlayerType_jagexModerator, PlayerType.PlayerType_hardcoreIronman, PlayerType.PlayerType_ironman, PlayerType.PlayerType_normal, PlayerType.PlayerType_playerModerator}; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Lii;", - garbageValue = "-266354668" - ) - @Export("getParamDefinition") - public static ParamDefinition getParamDefinition(int var0) { - ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = class198.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); - return var1; - } - } + } // L: 43 @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIII)I", - garbageValue = "828959828" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", + garbageValue = "1125902282" ) - static final int method4696(int var0, int var1, int var2) { - int var3 = var0 / var2; - int var4 = var0 & var2 - 1; - int var5 = var1 / var2; - int var6 = var1 & var2 - 1; - int var7 = Messages.method2350(var3, var5); - int var8 = Messages.method2350(var3 + 1, var5); - int var9 = Messages.method2350(var3, var5 + 1); - int var10 = Messages.method2350(var3 + 1, var5 + 1); - int var12 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; - int var11 = ((65536 - var12) * var7 >> 16) + (var12 * var8 >> 16); - int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var4 * 1024 / var2] >> 1; - int var13 = ((65536 - var14) * var9 >> 16) + (var14 * var10 >> 16); - int var16 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; - int var15 = ((65536 - var16) * var11 >> 16) + (var16 * var13 >> 16); - return var15; + public static void method4593(Applet var0, String var1) { + class60.applet = var0; // L: 22 + if (var1 != null) { // L: 23 + class60.field451 = var1; + } + + } // L: 24 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(III)I", + garbageValue = "-852003243" + ) + static int method4596(int var0, int var1) { + ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 14 + if (var2 == null) { // L: 15 + return -1; + } else { + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; // L: 16 17 + } } } diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java index 0264696051..d37fdf94e2 100644 --- a/runescape-client/src/main/java/VarcInt.java +++ b/runescape-client/src/main/java/VarcInt.java @@ -3,88 +3,58 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iu") +@ObfuscatedName("ib") @Implements("VarcInt") public class VarcInt extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("VarcInt_archive") public static AbstractArchive VarcInt_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("VarcInt_cached") - public static EvictingDualNodeHashTable VarcInt_cached; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - @Export("ItemDefinition_archive") - static AbstractArchive ItemDefinition_archive; - @ObfuscatedName("eu") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive18") - static Archive archive18; - @ObfuscatedName("q") + static EvictingDualNodeHashTable VarcInt_cached; + @ObfuscatedName("s") @Export("persist") public boolean persist; static { - VarcInt_cached = new EvictingDualNodeHashTable(64); + VarcInt_cached = new EvictingDualNodeHashTable(64); // L: 11 } - public VarcInt() { - this.persist = false; - } + VarcInt() { + this.persist = false; // L: 12 + } // L: 14 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "121" + descriptor = "(Lkf;B)V", + garbageValue = "69" ) - public void method4573(Buffer var1) { + void method4488(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 28 + if (var2 == 0) { // L: 29 + return; // L: 32 } - this.method4569(var1, var2); + this.method4489(var1, var2); // L: 30 } } - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "1038318542" + descriptor = "(Lkf;IB)V", + garbageValue = "-62" ) - void method4569(Buffer var1, int var2) { - if (var2 == 2) { - this.persist = true; + void method4489(Buffer var1, int var2) { + if (var2 == 2) { // L: 35 + this.persist = true; // L: 36 } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(Ldf;I)V", - garbageValue = "1745274917" - ) - @Export("PcmStream_disable") - static final void PcmStream_disable(PcmStream var0) { - var0.active = false; - if (var0.sound != null) { - var0.sound.position = 0; - } - - for (PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) { - PcmStream_disable(var1); - } - - } + } // L: 39 } diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 60ba1e79b9..77bd4a028f 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -9,391 +9,364 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cy") +@ObfuscatedName("co") @Implements("Varcs") public class Varcs { - @ObfuscatedName("b") - @ObfuscatedGetter( - intValue = -1058708955 - ) - @Export("canvasWidth") - public static int canvasWidth; @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lcv;" + ) + @Export("loginScreenRunesAnimation") + static LoginScreenAnimation loginScreenRunesAnimation; + @ObfuscatedName("he") + @ObfuscatedSignature( + descriptor = "[Llp;" + ) + @Export("headIconHintSprites") + static Sprite[] headIconHintSprites; + @ObfuscatedName("s") @Export("intsPersistence") boolean[] intsPersistence; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("map") Map map; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("strings") String[] strings; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("unwrittenChanges") boolean unwrittenChanges; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - longValue = -7654666675170575125L + longValue = 9168454196616585073L ) - long field1291; + long field1295; Varcs() { - this.unwrittenChanges = false; - int var1 = Clock.archive2.getGroupFileCount(19); - this.map = new HashMap(); - this.intsPersistence = new boolean[var1]; + this.unwrittenChanges = false; // L: 22 + int var1 = NetFileRequest.archive2.getGroupFileCount(19); // L: 26 + this.map = new HashMap(); // L: 27 + this.intsPersistence = new boolean[var1]; // L: 28 int var2; - for (var2 = 0; var2 < var1; ++var2) { - VarcInt var4 = (VarcInt)VarcInt.VarcInt_cached.get((long)var2); - VarcInt var3; - if (var4 != null) { - var3 = var4; - } else { - byte[] var5 = VarcInt.VarcInt_archive.takeFile(19, var2); - var4 = new VarcInt(); - if (var5 != null) { - var4.method4573(new Buffer(var5)); - } - - VarcInt.VarcInt_cached.put(var4, (long)var2); - var3 = var4; - } - - this.intsPersistence[var2] = var3.persist; + for (var2 = 0; var2 < var1; ++var2) { // L: 29 + VarcInt var3 = Script.method2324(var2); // L: 30 + this.intsPersistence[var2] = var3.persist; // L: 31 } - var2 = 0; - if (Clock.archive2.method4452(15)) { - var2 = Clock.archive2.getGroupFileCount(15); + var2 = 0; // L: 33 + if (NetFileRequest.archive2.method4350(15)) { // L: 34 + var2 = NetFileRequest.archive2.getGroupFileCount(15); // L: 35 } - this.strings = new String[var2]; - this.read(); - } + this.strings = new String[var2]; // L: 37 + this.read(); // L: 38 + } // L: 39 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(III)V", - garbageValue = "-1324015283" + garbageValue = "-500127476" ) @Export("setInt") void setInt(int var1, int var2) { - this.map.put(var1, var2); + this.map.put(var1, var2); // L: 42 if (this.intsPersistence[var1]) { - this.unwrittenChanges = true; + this.unwrittenChanges = true; // L: 43 } - } + } // L: 44 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(IB)I", - garbageValue = "16" + garbageValue = "-31" ) @Export("getInt") int getInt(int var1) { - Object var2 = this.map.get(var1); - return var2 instanceof Integer ? (Integer)var2 : -1; + Object var2 = this.map.get(var1); // L: 47 + return var2 instanceof Integer ? (Integer)var2 : -1; // L: 48 49 51 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "105969632" + garbageValue = "-1549127087" ) @Export("setString") void setString(int var1, String var2) { - this.map.put(var1, var2); - } + this.map.put(var1, var2); // L: 55 + } // L: 56 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "-1642204852" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "95" ) @Export("getString") String getString(int var1) { - Object var2 = this.map.get(var1); - return var2 instanceof String ? (String)var2 : ""; + Object var2 = this.map.get(var1); // L: 59 + return var2 instanceof String ? (String)var2 : ""; // L: 60 61 63 } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;B)V", - garbageValue = "14" + descriptor = "(ILjava/lang/String;I)V", + garbageValue = "1427019178" ) @Export("setStringOld") void setStringOld(int var1, String var2) { - this.strings[var1] = var2; - } + this.strings[var1] = var2; // L: 67 + } // L: 68 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "658470799" + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "106" ) @Export("getStringOld") String getStringOld(int var1) { - return this.strings[var1]; + return this.strings[var1]; // L: 71 } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-943211657" + descriptor = "(B)V", + garbageValue = "-69" ) @Export("clearTransient") void clearTransient() { int var1; - for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { - if (!this.intsPersistence[var1]) { - this.map.remove(var1); + for (var1 = 0; var1 < this.intsPersistence.length; ++var1) { // L: 75 + if (!this.intsPersistence[var1]) { // L: 76 + this.map.remove(var1); // L: 77 } } - for (var1 = 0; var1 < this.strings.length; ++var1) { - this.strings[var1] = null; + for (var1 = 0; var1 < this.strings.length; ++var1) { // L: 80 + this.strings[var1] = null; // L: 81 } - } + } // L: 83 - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(ZI)Lmy;", - garbageValue = "-297386898" + garbageValue = "-850108574" ) @Export("getPreferencesFile") AccessFile getPreferencesFile(boolean var1) { - return GameShell.getPreferencesFile("2", GrandExchangeOfferWorldComparator.field54.name, var1); + return class2.getPreferencesFile("2", Tiles.field532.name, var1); // L: 86 } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1923811872" + descriptor = "(B)V", + garbageValue = "67" ) @Export("write") void write() { - AccessFile var1 = this.getPreferencesFile(true); + AccessFile var1 = this.getPreferencesFile(true); // L: 90 try { - int var2 = 3; - int var3 = 0; - Iterator var4 = this.map.entrySet().iterator(); + int var2 = 3; // L: 92 + int var3 = 0; // L: 93 + Iterator var4 = this.map.entrySet().iterator(); // L: 94 while (var4.hasNext()) { - Entry var5 = (Entry)var4.next(); - int var6 = (Integer)var5.getKey(); - if (this.intsPersistence[var6]) { - Object var7 = var5.getValue(); - var2 += 3; - if (var7 instanceof Integer) { + Entry var5 = (Entry)var4.next(); // L: 95 + int var6 = (Integer)var5.getKey(); // L: 97 + if (this.intsPersistence[var6]) { // L: 98 + Object var7 = var5.getValue(); // L: 99 + var2 += 3; // L: 100 + if (var7 instanceof Integer) { // L: 101 var2 += 4; } else if (var7 instanceof String) { - var2 += DynamicObject.stringCp1252NullTerminatedByteSize((String)var7); + var2 += Decimator.stringCp1252NullTerminatedByteSize((String)var7); // L: 102 } - ++var3; + ++var3; // L: 103 } } - Buffer var33 = new Buffer(var2); - var33.writeByte(2); - var33.writeShort(var3); - Iterator var34 = this.map.entrySet().iterator(); + Buffer var27 = new Buffer(var2); // L: 107 + var27.writeByte(2); // L: 108 + var27.writeShort(var3); // L: 109 + Iterator var28 = this.map.entrySet().iterator(); // L: 110 - label183: + label148: while (true) { - Entry var21; - int var22; + Entry var16; + int var17; do { - if (!var34.hasNext()) { - var1.write(var33.array, 0, var33.offset); - break label183; + if (!var28.hasNext()) { + var1.write(var27.array, 0, var27.offset); // L: 140 + break label148; } - var21 = (Entry)var34.next(); - var22 = (Integer)var21.getKey(); - } while(!this.intsPersistence[var22]); + var16 = (Entry)var28.next(); // L: 111 + var17 = (Integer)var16.getKey(); // L: 113 + } while(!this.intsPersistence[var17]); // L: 114 - var33.writeShort(var22); - Object var8 = var21.getValue(); - Class var10 = var8.getClass(); - class3[] var11 = new class3[]{class3.field9, class3.field8, class3.field10}; - class3[] var12 = var11; - int var13 = 0; + var27.writeShort(var17); // L: 115 + Object var8 = var16.getValue(); // L: 116 + Class var10 = var8.getClass(); // L: 118 + class3[] var11 = class3.method47(); // L: 121 + int var12 = 0; class3 var9; - class3 var14; while (true) { - if (var13 >= var12.length) { - var9 = null; + if (var12 >= var11.length) { + var9 = null; // L: 132 break; } - var14 = var12[var13]; - if (var10 == var14.field12) { - var9 = var14; - break; + class3 var13 = var11[var12]; // L: 123 + if (var10 == var13.field17) { // L: 125 + var9 = var13; // L: 126 + break; // L: 127 } - ++var13; + ++var12; // L: 122 } - var33.writeByte(var9.field15); - Class var23 = var8.getClass(); - class3[] var15 = new class3[]{class3.field9, class3.field8, class3.field10}; - class3[] var16 = var15; - int var17 = 0; - - while (true) { - if (var17 >= var16.length) { - var14 = null; - break; - } - - class3 var18 = var16[var17]; - if (var23 == var18.field12) { - var14 = var18; - break; - } - - ++var17; - } - - if (var14 == null) { - throw new IllegalArgumentException(); - } - - class0 var35 = var14.field13; - var35.vmethod59(var8, var33); + var27.writeByte(var9.field16); // L: 135 + class3.method43(var8, var27); // L: 136 } - } catch (Exception var31) { + } catch (Exception var25) { // L: 142 } finally { try { - var1.close(); - } catch (Exception var30) { + var1.close(); // L: 145 + } catch (Exception var24) { // L: 147 } } - this.unwrittenChanges = false; - this.field1291 = MilliClock.currentTimeMillis(); - } + this.unwrittenChanges = false; // L: 149 + this.field1295 = PacketWriter.currentTimeMillis(); // L: 150 + } // L: 151 - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(B)V", - garbageValue = "-50" + garbageValue = "2" ) @Export("read") void read() { - AccessFile var1 = this.getPreferencesFile(false); + AccessFile var1 = this.getPreferencesFile(false); // L: 154 - label230: { + label223: { try { - byte[] var2 = new byte[(int)var1.length()]; + byte[] var2 = new byte[(int)var1.length()]; // L: 156 int var4; - for (int var3 = 0; var3 < var2.length; var3 += var4) { - var4 = var1.read(var2, var3, var2.length - var3); - if (var4 == -1) { + for (int var3 = 0; var3 < var2.length; var3 += var4) { // L: 157 158 161 + var4 = var1.read(var2, var3, var2.length - var3); // L: 159 + if (var4 == -1) { // L: 160 throw new EOFException(); } } - Buffer var15 = new Buffer(var2); - if (var15.array.length - var15.offset >= 1) { - int var16 = var15.readUnsignedByte(); - if (var16 >= 0 && var16 <= 2) { - int var7; - int var8; - int var9; - int var17; - if (var16 >= 2) { - var17 = var15.readUnsignedShort(); - var7 = 0; - - while (true) { - if (var7 >= var17) { - break label230; - } - - var8 = var15.readUnsignedShort(); - var9 = var15.readUnsignedByte(); - class3[] var10 = new class3[]{class3.field9, class3.field8, class3.field10}; - class3 var11 = (class3)FaceNormal.findEnumerated(var10, var9); - Object var12 = var11.method40(var15); - if (this.intsPersistence[var8]) { - this.map.put(var8, var12); - } - - ++var7; - } - } else { - var17 = var15.readUnsignedShort(); - - for (var7 = 0; var7 < var17; ++var7) { - var8 = var15.readUnsignedShort(); - var9 = var15.readInt(); - if (this.intsPersistence[var8]) { - this.map.put(var8, var9); - } - } - - var7 = var15.readUnsignedShort(); - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label230; - } - - var15.readUnsignedShort(); - var15.readStringCp1252NullTerminated(); - ++var8; - } - } - } - + Buffer var14 = new Buffer(var2); // L: 163 + if (var14.array.length - var14.offset < 1) { // L: 164 return; } - } catch (Exception var26) { - break label230; + + int var15 = var14.readUnsignedByte(); // L: 165 + if (var15 >= 0 && var15 <= 2) { // L: 166 + int var7; + int var8; + int var9; + int var16; + if (var15 >= 2) { // L: 167 + var16 = var14.readUnsignedShort(); // L: 168 + var7 = 0; + + while (true) { + if (var7 >= var16) { + break label223; + } + + var8 = var14.readUnsignedShort(); // L: 170 + var9 = var14.readUnsignedByte(); // L: 171 + class3 var10 = (class3)TextureProvider.findEnumerated(class3.method47(), var9); // L: 172 + Object var11 = var10.method46(var14); // L: 173 + if (this.intsPersistence[var8]) { // L: 174 + this.map.put(var8, var11); // L: 175 + } + + ++var7; // L: 169 + } + } else { + var16 = var14.readUnsignedShort(); // L: 180 + + for (var7 = 0; var7 < var16; ++var7) { // L: 181 + var8 = var14.readUnsignedShort(); // L: 182 + var9 = var14.readInt(); // L: 183 + if (this.intsPersistence[var8]) { // L: 184 + this.map.put(var8, var9); // L: 185 + } + } + + var7 = var14.readUnsignedShort(); // L: 188 + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label223; + } + + var14.readUnsignedShort(); // L: 190 + var14.readStringCp1252NullTerminated(); // L: 191 + ++var8; // L: 189 + } + } + } + } catch (Exception var25) { // L: 195 + break label223; } finally { try { - var1.close(); - } catch (Exception var25) { + var1.close(); // L: 198 + } catch (Exception var24) { } } - return; + return; // L: 200 } - this.unwrittenChanges = false; - } + this.unwrittenChanges = false; // L: 202 + } // L: 203 - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "999745813" + descriptor = "(B)V", + garbageValue = "89" ) @Export("tryWrite") void tryWrite() { - if (this.unwrittenChanges && this.field1291 < MilliClock.currentTimeMillis() - 60000L) { - this.write(); + if (this.unwrittenChanges && this.field1295 < PacketWriter.currentTimeMillis() - 60000L) { // L: 206 + this.write(); // L: 207 } - } + } // L: 209 - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "0" + descriptor = "(I)Z", + garbageValue = "-1436880111" ) @Export("hasUnwrittenChanges") boolean hasUnwrittenChanges() { - return this.unwrittenChanges; + return this.unwrittenChanges; // L: 212 } + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lic;I)V", + garbageValue = "-1997146185" + ) + public static void method2257(AbstractArchive var0) { + FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0; // L: 19 + } // L: 20 } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index c2e5590a0b..b28121371c 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -4,69 +4,200 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("iy") +@ObfuscatedName("ik") @Implements("VarpDefinition") public class VarpDefinition extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("VarpDefinition_archive") static AbstractArchive VarpDefinition_archive; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 359147415 + intValue = 1332454231 ) @Export("VarpDefinition_fileCount") public static int VarpDefinition_fileCount; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("VarpDefinition_cached") static EvictingDualNodeHashTable VarpDefinition_cached; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1217664323 + intValue = -955851785 ) @Export("type") public int type; static { - VarpDefinition_cached = new EvictingDualNodeHashTable(64); + VarpDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12 } VarpDefinition() { - this.type = 0; - } + this.type = 0; // L: 13 + } // L: 15 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "319289372" + descriptor = "(Lkf;I)V", + garbageValue = "1437653896" ) @Export("decode") void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 34 + if (var2 == 0) { // L: 35 + return; // L: 38 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 36 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "1792997667" + descriptor = "(Lkf;IS)V", + garbageValue = "24454" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 5) { + if (var2 == 5) { // L: 41 this.type = var1.readUnsignedShort(); } - } + } // L: 43 + + @ObfuscatedName("gs") + @ObfuscatedSignature( + descriptor = "(Lbf;ZI)V", + garbageValue = "-1746985052" + ) + @Export("addPlayerToScene") + static void addPlayerToScene(Player var0, boolean var1) { + if (var0 != null && var0.isVisible() && !var0.isHidden) { // L: 4260 + var0.isUnanimated = false; // L: 4261 + if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { // L: 4262 4263 + var0.isUnanimated = true; + } + + int var2 = var0.x >> 7; // L: 4265 + int var3 = var0.y >> 7; // L: 4266 + if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { // L: 4267 + long var4 = class227.calculateTag(0, 0, 0, false, var0.index); // L: 4268 + if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { // L: 4269 + var0.isUnanimated = false; // L: 4270 + var0.tileHeight = ArchiveLoader.getTileHeight(var0.x, var0.y, Huffman.Client_plane); // L: 4271 + var0.playerCycle = Client.cycle; // L: 4272 + ScriptEvent.scene.addNullableObject(Huffman.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field649, var0.field635, var0.field651, var0.field643); // L: 4273 + } else { + if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { // L: 4276 + if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { // L: 4277 + return; + } + + Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; // L: 4278 + } + + var0.tileHeight = ArchiveLoader.getTileHeight(var0.x, var0.y, Huffman.Client_plane); // L: 4280 + var0.playerCycle = Client.cycle; // L: 4281 + ScriptEvent.scene.drawEntity(Huffman.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); // L: 4282 + } + } + } + + } // L: 4286 + + @ObfuscatedName("if") + @ObfuscatedSignature( + descriptor = "(Lbf;IIII)V", + garbageValue = "-1811983965" + ) + @Export("addPlayerToMenu") + static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) { + if (WorldMapLabelSize.localPlayer != var0) { // L: 8564 + if (Client.menuOptionsCount < 400) { // L: 8565 + String var4; + int var7; + if (var0.skillLevel == 0) { // L: 8567 + String var5 = var0.actions[0] + var0.username + var0.actions[1]; // L: 8568 + var7 = var0.combatLevel; // L: 8570 + int var8 = WorldMapLabelSize.localPlayer.combatLevel; // L: 8571 + int var9 = var8 - var7; // L: 8573 + String var6; + if (var9 < -9) { // L: 8574 + var6 = WorldMapAreaData.colorStartTag(16711680); // L: 8575 + } else if (var9 < -6) { // L: 8578 + var6 = WorldMapAreaData.colorStartTag(16723968); // L: 8579 + } else if (var9 < -3) { // L: 8582 + var6 = WorldMapAreaData.colorStartTag(16740352); // L: 8583 + } else if (var9 < 0) { // L: 8586 + var6 = WorldMapAreaData.colorStartTag(16756736); // L: 8587 + } else if (var9 > 9) { // L: 8590 + var6 = WorldMapAreaData.colorStartTag(65280); // L: 8591 + } else if (var9 > 6) { // L: 8594 + var6 = WorldMapAreaData.colorStartTag(4259584); // L: 8595 + } else if (var9 > 3) { // L: 8598 + var6 = WorldMapAreaData.colorStartTag(8453888); // L: 8599 + } else if (var9 > 0) { // L: 8602 + var6 = WorldMapAreaData.colorStartTag(12648192); // L: 8603 + } else { + var6 = WorldMapAreaData.colorStartTag(16776960); // L: 8606 + } + + var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2]; // L: 8608 + } else { + var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2]; // L: 8610 + } + + int var10; + if (Client.isItemSelected == 1) { // L: 8611 + StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16777215) + var4, 14, var1, var2, var3); // L: 8612 + } else if (Client.isSpellSelected) { // L: 8615 + if ((UserComparator8.selectedSpellFlags & 8) == 8) { // L: 8616 + StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16777215) + var4, 15, var1, var2, var3); // L: 8617 + } + } else { + for (var10 = 7; var10 >= 0; --var10) { // L: 8622 + if (Client.playerMenuActions[var10] != null) { // L: 8623 + short var11 = 0; // L: 8624 + if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) { // L: 8625 + if (AttackOption.AttackOption_hidden == Client.playerAttackOption) { // L: 8626 + continue; + } + + if (Client.playerAttackOption == AttackOption.AttackOption_alwaysRightClick || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > WorldMapLabelSize.localPlayer.combatLevel) { // L: 8627 + var11 = 2000; // L: 8628 + } + + if (WorldMapLabelSize.localPlayer.team != 0 && var0.team != 0) { // L: 8630 + if (var0.team == WorldMapLabelSize.localPlayer.team) { // L: 8631 + var11 = 2000; + } else { + var11 = 0; // L: 8632 + } + } + } else if (Client.playerOptionsPriorities[var10]) { // L: 8635 + var11 = 2000; + } + + boolean var12 = false; // L: 8636 + var7 = Client.playerMenuOpcodes[var10] + var11; // L: 8637 + StructDefinition.insertMenuItemNoShift(Client.playerMenuActions[var10], WorldMapAreaData.colorStartTag(16777215) + var4, var7, var1, var2, var3); // L: 8638 + } + } + } + + for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) { // L: 8643 + if (Client.menuOpcodes[var10] == 23) { // L: 8644 + Client.menuTargets[var10] = WorldMapAreaData.colorStartTag(16777215) + var4; // L: 8645 + break; + } + } + + } + } + } // L: 8649 } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index d54c6b5b2f..df0f0a42ae 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -1,41 +1,211 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ht") +@ObfuscatedName("hv") @Implements("Varps") public class Varps { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("Varps_masks") static int[] Varps_masks; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("Varps_temp") public static int[] Varps_temp; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("Varps_main") public static int[] Varps_main; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1581164719 + ) + @Export("Interpreter_stringStackSize") + static int Interpreter_stringStackSize; static { - Varps_masks = new int[32]; - int var0 = 2; + Varps_masks = new int[32]; // L: 6 + int var0 = 2; // L: 9 - for (int var1 = 0; var1 < 32; ++var1) { - Varps_masks[var1] = var0 - 1; - var0 += var0; + for (int var1 = 0; var1 < 32; ++var1) { // L: 10 + Varps_masks[var1] = var0 - 1; // L: 11 + var0 += var0; // L: 12 } - Varps_temp = new int[4000]; - Varps_main = new int[4000]; + Varps_temp = new int[4000]; // L: 16 + Varps_main = new int[4000]; // L: 17 } + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Liw;IIIBZI)V", + garbageValue = "-1882336793" + ) + @Export("requestNetFile") + static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { + long var6 = (long)((var1 << 16) + var2); // L: 271 + NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); // L: 272 + if (var8 == null) { // L: 273 + var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); // L: 274 + if (var8 == null) { // L: 275 + var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); // L: 276 + if (var8 != null) { // L: 277 + if (var5) { // L: 278 + var8.removeDual(); // L: 279 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 280 + --NetCache.NetCache_pendingWritesCount; // L: 281 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 282 + } + + } else { + if (!var5) { // L: 286 + var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); // L: 287 + if (var8 != null) { // L: 288 + return; + } + } + + var8 = new NetFileRequest(); // L: 290 + var8.archive = var0; // L: 291 + var8.crc = var3; // L: 292 + var8.padding = var4; // L: 293 + if (var5) { // L: 294 + NetCache.NetCache_pendingPriorityWrites.put(var8, var6); // L: 295 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 296 + } else { + NetCache.NetCache_pendingWritesQueue.addFirst(var8); // L: 299 + NetCache.NetCache_pendingWrites.put(var8, var6); // L: 300 + ++NetCache.NetCache_pendingWritesCount; // L: 301 + } + + } + } + } + } // L: 284 303 + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(CB)Z", - garbageValue = "72" + descriptor = "(I)V", + garbageValue = "-1116846800" ) - @Export("isAlphaNumeric") - public static boolean isAlphaNumeric(char var0) { - return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; - } + public static void method4066() { + WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 157 + } // L: 158 + + @ObfuscatedName("gn") + @ObfuscatedSignature( + descriptor = "(IIZB)V", + garbageValue = "0" + ) + static final void method4067(int var0, int var1, boolean var2) { + if (!var2 || var0 != class52.field396 || SpotAnimationDefinition.field3261 != var1) { // L: 5077 + class52.field396 = var0; // L: 5080 + SpotAnimationDefinition.field3261 = var1; // L: 5081 + CollisionMap.updateGameState(25); // L: 5082 + Actor.drawLoadingMessage("Loading - please wait.", true); // L: 5083 + int var3 = WorldMapManager.baseX; // L: 5084 + int var4 = WorldMapLabel.baseY; // L: 5085 + WorldMapManager.baseX = (var0 - 6) * 8; // L: 5086 + WorldMapLabel.baseY = (var1 - 6) * 8; // L: 5087 + int var5 = WorldMapManager.baseX - var3; // L: 5088 + int var6 = WorldMapLabel.baseY - var4; // L: 5089 + var3 = WorldMapManager.baseX; // L: 5090 + var4 = WorldMapLabel.baseY; // L: 5091 + + int var7; + int var9; + int[] var10000; + for (var7 = 0; var7 < 32768; ++var7) { // L: 5092 + NPC var19 = Client.npcs[var7]; // L: 5093 + if (var19 != null) { // L: 5094 + for (var9 = 0; var9 < 10; ++var9) { // L: 5095 + var10000 = var19.pathX; // L: 5096 + var10000[var9] -= var5; + var10000 = var19.pathY; // L: 5097 + var10000[var9] -= var6; + } + + var19.x -= var5 * 128; // L: 5099 + var19.y -= var6 * 128; // L: 5100 + } + } + + for (var7 = 0; var7 < 2048; ++var7) { // L: 5103 + Player var22 = Client.players[var7]; // L: 5104 + if (var22 != null) { // L: 5105 + for (var9 = 0; var9 < 10; ++var9) { // L: 5106 + var10000 = var22.pathX; // L: 5107 + var10000[var9] -= var5; + var10000 = var22.pathY; // L: 5108 + var10000[var9] -= var6; + } + + var22.x -= var5 * 128; // L: 5110 + var22.y -= var6 * 128; // L: 5111 + } + } + + byte var20 = 0; // L: 5114 + byte var8 = 104; // L: 5115 + byte var21 = 1; // L: 5116 + if (var5 < 0) { // L: 5117 + var20 = 103; // L: 5118 + var8 = -1; // L: 5119 + var21 = -1; // L: 5120 + } + + byte var10 = 0; // L: 5122 + byte var11 = 104; // L: 5123 + byte var12 = 1; // L: 5124 + if (var6 < 0) { // L: 5125 + var10 = 103; // L: 5126 + var11 = -1; // L: 5127 + var12 = -1; // L: 5128 + } + + int var14; + for (int var13 = var20; var13 != var8; var13 += var21) { // L: 5130 + for (var14 = var10; var11 != var14; var14 += var12) { // L: 5131 + int var15 = var5 + var13; // L: 5132 + int var16 = var14 + var6; // L: 5133 + + for (int var17 = 0; var17 < 4; ++var17) { // L: 5134 + if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) { + Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16]; // L: 5135 + } else { + Client.groundItems[var17][var13][var14] = null; // L: 5136 + } + } + } + } + + for (PendingSpawn var18 = (PendingSpawn)Client.pendingSpawns.last(); var18 != null; var18 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 5140 5141 5145 + var18.x -= var5; // L: 5142 + var18.y -= var6; // L: 5143 + if (var18.x < 0 || var18.y < 0 || var18.x >= 104 || var18.y >= 104) { // L: 5144 + var18.remove(); + } + } + + if (Client.destinationX != 0) { // L: 5147 + Client.destinationX -= var5; // L: 5148 + Client.destinationY -= var6; // L: 5149 + } + + Client.soundEffectCount = 0; // L: 5151 + Client.isCameraLocked = false; // L: 5152 + VertexNormal.cameraX -= var5 << 7; // L: 5153 + AbstractWorldMapData.cameraZ -= var6 << 7; // L: 5154 + GrandExchangeOfferWorldComparator.oculusOrbFocalPointX -= var5 << 7; // L: 5155 + MouseHandler.oculusOrbFocalPointY -= var6 << 7; // L: 5156 + Client.field902 = -1; // L: 5157 + Client.graphicsObjects.clear(); // L: 5158 + Client.projectiles.clear(); // L: 5159 + + for (var14 = 0; var14 < 4; ++var14) { // L: 5160 + Client.collisionMaps[var14].clear(); + } + + } + } // L: 5078 5161 } diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java index db689b75bd..521a78fbc8 100644 --- a/runescape-client/src/main/java/VertexNormal.java +++ b/runescape-client/src/main/java/VertexNormal.java @@ -4,50 +4,50 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("et") +@ObfuscatedName("eg") @Implements("VertexNormal") public class VertexNormal { + @ObfuscatedName("hg") + @ObfuscatedGetter( + intValue = 1417653903 + ) + @Export("cameraX") + static int cameraX; @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "Leb;" - ) - @Export("World_request") - static UrlRequest World_request; - @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 923161949 - ) - @Export("x") - int x; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 126098109 - ) - @Export("y") - int y; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -662882065 - ) - @Export("z") - int z; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1696865585 + intValue = -213210241 ) @Export("magnitude") int magnitude; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = 525564355 + ) + @Export("x") + int x; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -1643627841 + ) + @Export("y") + int y; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1440997727 + ) + @Export("z") + int z; VertexNormal() { - } + } // L: 9 @ObfuscatedSignature( - descriptor = "(Let;)V" + descriptor = "(Leg;)V" ) VertexNormal(VertexNormal var1) { - this.x = var1.x; - this.y = var1.y; - this.z = var1.z; - this.magnitude = var1.magnitude; - } + this.x = var1.x; // L: 12 + this.y = var1.y; // L: 13 + this.z = var1.z; // L: 14 + this.magnitude = var1.magnitude; // L: 15 + } // L: 16 } diff --git a/runescape-client/src/main/java/VerticalAlignment.java b/runescape-client/src/main/java/VerticalAlignment.java index 4a929d0d64..68fe73b2f7 100644 --- a/runescape-client/src/main/java/VerticalAlignment.java +++ b/runescape-client/src/main/java/VerticalAlignment.java @@ -1,132 +1,60 @@ -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("if") +@ObfuscatedName("it") @Implements("VerticalAlignment") public enum VerticalAlignment implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lif;" + descriptor = "Lit;" ) - field3226(2, 0), - @ObfuscatedName("o") + field3221(1, 0), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lif;" + descriptor = "Lit;" ) @Export("VerticalAlignment_centered") - VerticalAlignment_centered(1, 1), - @ObfuscatedName("q") + VerticalAlignment_centered(0, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lif;" + descriptor = "Lit;" ) - field3230(0, 2); + field3225(2, 2); - @ObfuscatedName("j") + @ObfuscatedName("jh") + @ObfuscatedSignature( + descriptor = "Lhq;" + ) + @Export("hoveredItemContainer") + static Widget hoveredItemContainer; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -296657291 + intValue = -1300403611 ) @Export("value") public final int value; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1007871837 + intValue = -496509631 ) @Export("id") final int id; VerticalAlignment(int var3, int var4) { - this.value = var3; - this.id = var4; - } + this.value = var3; // L: 14 + this.id = var4; // L: 15 + } // L: 16 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(III)Lcs;", - garbageValue = "1496312280" - ) - static Script method4517(int var0, int var1) { - Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); - if (var2 != null) { - return var2; - } else { - String var3 = String.valueOf(var0); - int var4 = Message.archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } else { - byte[] var5 = Message.archive12.takeFileFlat(var4); - if (var5 != null) { - if (var5.length <= 1) { - return null; - } - - var2 = WorldMapAreaData.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; - } - } - - return null; - } - } - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "735302127" - ) - @Export("getGcDuration") - protected static int getGcDuration() { - int var0 = 0; - if (MusicPatchPcmStream.garbageCollector == null || !MusicPatchPcmStream.garbageCollector.isValid()) { - try { - Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); - - while (var1.hasNext()) { - GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); - if (var2.isValid()) { - MusicPatchPcmStream.garbageCollector = var2; - GameShell.garbageCollectorLastCheckTimeMs = -1L; - GameShell.garbageCollectorLastCollectionTime = -1L; - } - } - } catch (Throwable var11) { - } - } - - if (MusicPatchPcmStream.garbageCollector != null) { - long var9 = MilliClock.currentTimeMillis(); - long var3 = MusicPatchPcmStream.garbageCollector.getCollectionTime(); - if (GameShell.garbageCollectorLastCollectionTime != -1L) { - long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; - long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; - if (var7 != 0L) { - var0 = (int)(100L * var5 / var7); - } - } - - GameShell.garbageCollectorLastCollectionTime = var3; - GameShell.garbageCollectorLastCheckTimeMs = var9; - } - - return var0; + return this.id; // L: 19 } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index 1e20fc7040..a92c403e9c 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -3,97 +3,138 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import netscape.javascript.JSObject; -@ObfuscatedName("ei") +@ObfuscatedName("ep") @Implements("ViewportMouse") public class ViewportMouse { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("ViewportMouse_isInViewport") - public static boolean ViewportMouse_isInViewport; - @ObfuscatedName("o") + static boolean ViewportMouse_isInViewport; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1395390715 + intValue = -1355902097 ) @Export("ViewportMouse_x") - public static int ViewportMouse_x; - @ObfuscatedName("q") + static int ViewportMouse_x; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 70898143 + intValue = -1743017163 ) @Export("ViewportMouse_y") - public static int ViewportMouse_y; - @ObfuscatedName("j") + static int ViewportMouse_y; + @ObfuscatedName("t") @Export("ViewportMouse_false0") - public static boolean ViewportMouse_false0; - @ObfuscatedName("p") + static boolean ViewportMouse_false0; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1666776935 + intValue = -1199867819 + ) + static int field1768; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = -1371000863 + ) + static int field1769; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = 1954448985 ) static int field1770; - @ObfuscatedName("u") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -94383227 + intValue = 91913629 ) static int field1771; @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -272779311 - ) - static int field1775; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 1341524287 - ) - static int field1773; - @ObfuscatedName("h") - @ObfuscatedGetter( - intValue = 2037239641 + intValue = 1953465913 ) @Export("ViewportMouse_entityCount") public static int ViewportMouse_entityCount; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("ViewportMouse_entityTags") public static long[] ViewportMouse_entityTags; static { - ViewportMouse_isInViewport = false; - ViewportMouse_x = 0; - ViewportMouse_y = 0; - ViewportMouse_false0 = false; - ViewportMouse_entityCount = 0; - ViewportMouse_entityTags = new long[1000]; + ViewportMouse_isInViewport = false; // L: 4 + ViewportMouse_x = 0; // L: 5 + ViewportMouse_y = 0; // L: 6 + ViewportMouse_false0 = false; // L: 7 + ViewportMouse_entityCount = 0; // L: 17 + ViewportMouse_entityTags = new long[1000]; // L: 18 } - @ObfuscatedName("m") + @ObfuscatedName("ey") @ObfuscatedSignature( - descriptor = "(IIB)I", - garbageValue = "-104" + descriptor = "(Liw;Ljava/lang/String;B)V", + garbageValue = "-71" ) - public static int method3091(int var0, int var1) { - return (var0 << 8) + var1; - } + static void method3082(Archive var0, String var1) { + ArchiveLoader var2 = new ArchiveLoader(var0, var1); // L: 1421 + Client.archiveLoaders.add(var2); // L: 1422 + Client.field949 += var2.groupCount; // L: 1423 + } // L: 1424 - @ObfuscatedName("q") + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "998588366" + descriptor = "(I)V", + garbageValue = "173237024" ) - public static boolean method3071(char var0) { - if (var0 >= ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) { - return true; - } else { - if (var0 != 0) { - char[] var1 = class297.cp1252AsciiExtension; + @Export("logOut") + static final void logOut() { + Client.packetWriter.close(); // L: 2485 + Actor.method1805(); // L: 2486 + ScriptEvent.scene.clear(); // L: 2487 - for (int var2 = 0; var2 < var1.length; ++var2) { - char var3 = var1[var2]; - if (var0 == var3) { - return true; - } - } + for (int var0 = 0; var0 < 4; ++var0) { // L: 2488 + Client.collisionMaps[var0].clear(); + } + + System.gc(); // L: 2489 + class58.method915(2); // L: 2490 + Client.currentTrackGroupId = -1; // L: 2491 + Client.field704 = false; // L: 2492 + + for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 2494 + if (var1.stream1 != null) { // L: 2495 + Players.pcmStreamMixer.removeSubStream(var1.stream1); // L: 2496 + var1.stream1 = null; // L: 2497 } - return false; + if (var1.stream2 != null) { // L: 2499 + Players.pcmStreamMixer.removeSubStream(var1.stream2); // L: 2500 + var1.stream2 = null; // L: 2501 + } } - } + + ObjectSound.objectSounds.clear(); // L: 2504 + CollisionMap.updateGameState(10); // L: 2506 + } // L: 2507 + + @ObfuscatedName("kx") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "323383255" + ) + static void method3098(String var0) { + class200.field2403 = var0; // L: 10765 + + try { + String var1 = class2.client.getParameter(Integer.toString(18)); // L: 10767 + String var2 = class2.client.getParameter(Integer.toString(13)); // L: 10768 + String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2; // L: 10769 + if (var0.length() == 0) { // L: 10770 + var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; + } else { + var3 = var3 + "; Expires=" + WorldMapSection1.method650(PacketWriter.currentTimeMillis() + 94608000000L) + "; Max-Age=" + 94608000L; // L: 10771 + } + + Client var4 = class2.client; // L: 10772 + String var5 = "document.cookie=\"" + var3 + "\""; // L: 10773 + JSObject.getWindow(var4).eval(var5); // L: 10776 + } catch (Throwable var6) { // L: 10779 + } + + } // L: 10780 } diff --git a/runescape-client/src/main/java/VorbisCodebook.java b/runescape-client/src/main/java/VorbisCodebook.java index 766326288c..0c3fb506da 100644 --- a/runescape-client/src/main/java/VorbisCodebook.java +++ b/runescape-client/src/main/java/VorbisCodebook.java @@ -2,122 +2,122 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dl") +@ObfuscatedName("db") @Implements("VorbisCodebook") public class VorbisCodebook { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("dimensions") int dimensions; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("entries") int entries; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("lengthMap") int[] lengthMap; - @ObfuscatedName("j") - int[] field1378; - @ObfuscatedName("p") - float[][] field1379; - @ObfuscatedName("g") + @ObfuscatedName("t") + int[] field1372; + @ObfuscatedName("i") + float[][] field1369; + @ObfuscatedName("o") @Export("keys") int[] keys; VorbisCodebook() { - VorbisSample.readBits(24); - this.dimensions = VorbisSample.readBits(16); - this.entries = VorbisSample.readBits(24); - this.lengthMap = new int[this.entries]; - boolean var1 = VorbisSample.readBit() != 0; + VorbisSample.readBits(24); // L: 22 + this.dimensions = VorbisSample.readBits(16); // L: 23 + this.entries = VorbisSample.readBits(24); // L: 24 + this.lengthMap = new int[this.entries]; // L: 25 + boolean var1 = VorbisSample.readBit() != 0; // L: 26 int var2; int var3; int var5; - if (var1) { - var2 = 0; + if (var1) { // L: 27 + var2 = 0; // L: 28 - for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { - int var4 = VorbisSample.readBits(WorldMapSection3.iLog(this.entries - var2)); + for (var3 = VorbisSample.readBits(5) + 1; var2 < this.entries; ++var3) { // L: 29 30 33 + int var4 = VorbisSample.readBits(DevicePcmPlayerProvider.iLog(this.entries - var2)); // L: 31 - for (var5 = 0; var5 < var4; ++var5) { + for (var5 = 0; var5 < var4; ++var5) { // L: 32 this.lengthMap[var2++] = var3; } } } else { - boolean var14 = VorbisSample.readBit() != 0; + boolean var14 = VorbisSample.readBit() != 0; // L: 37 - for (var3 = 0; var3 < this.entries; ++var3) { - if (var14 && VorbisSample.readBit() == 0) { + for (var3 = 0; var3 < this.entries; ++var3) { // L: 38 + if (var14 && VorbisSample.readBit() == 0) { // L: 39 this.lengthMap[var3] = 0; } else { - this.lengthMap[var3] = VorbisSample.readBits(5) + 1; + this.lengthMap[var3] = VorbisSample.readBits(5) + 1; // L: 40 } } } - this.method2467(); - var2 = VorbisSample.readBits(4); - if (var2 > 0) { - float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); - float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); - var5 = VorbisSample.readBits(4) + 1; - boolean var6 = VorbisSample.readBit() != 0; + this.method2430(); // L: 43 + var2 = VorbisSample.readBits(4); // L: 44 + if (var2 > 0) { // L: 45 + float var15 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 46 + float var16 = VorbisSample.float32Unpack(VorbisSample.readBits(32)); // L: 47 + var5 = VorbisSample.readBits(4) + 1; // L: 48 + boolean var6 = VorbisSample.readBit() != 0; // L: 49 int var7; - if (var2 == 1) { + if (var2 == 1) { // L: 51 var7 = mapType1QuantValues(this.entries, this.dimensions); } else { - var7 = this.entries * this.dimensions; + var7 = this.entries * this.dimensions; // L: 52 } - this.field1378 = new int[var7]; + this.field1372 = new int[var7]; // L: 53 int var8; - for (var8 = 0; var8 < var7; ++var8) { - this.field1378[var8] = VorbisSample.readBits(var5); + for (var8 = 0; var8 < var7; ++var8) { // L: 54 + this.field1372[var8] = VorbisSample.readBits(var5); } - this.field1379 = new float[this.entries][this.dimensions]; + this.field1369 = new float[this.entries][this.dimensions]; // L: 55 float var9; int var10; int var11; - if (var2 == 1) { - for (var8 = 0; var8 < this.entries; ++var8) { - var9 = 0.0F; - var10 = 1; + if (var2 == 1) { // L: 56 + for (var8 = 0; var8 < this.entries; ++var8) { // L: 57 + var9 = 0.0F; // L: 58 + var10 = 1; // L: 59 - for (var11 = 0; var11 < this.dimensions; ++var11) { - int var12 = var8 / var10 % var7; - float var13 = (float)this.field1378[var12] * var16 + var15 + var9; - this.field1379[var8][var11] = var13; - if (var6) { + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 60 + int var12 = var8 / var10 % var7; // L: 61 + float var13 = (float)this.field1372[var12] * var16 + var15 + var9; // L: 62 + this.field1369[var8][var11] = var13; // L: 63 + if (var6) { // L: 64 var9 = var13; } - var10 *= var7; + var10 *= var7; // L: 65 } } } else { - for (var8 = 0; var8 < this.entries; ++var8) { - var9 = 0.0F; - var10 = var8 * this.dimensions; + for (var8 = 0; var8 < this.entries; ++var8) { // L: 70 + var9 = 0.0F; // L: 71 + var10 = var8 * this.dimensions; // L: 72 - for (var11 = 0; var11 < this.dimensions; ++var11) { - float var17 = (float)this.field1378[var10] * var16 + var15 + var9; - this.field1379[var8][var11] = var17; - if (var6) { + for (var11 = 0; var11 < this.dimensions; ++var11) { // L: 73 + float var17 = (float)this.field1372[var10] * var16 + var15 + var9; // L: 74 + this.field1369[var8][var11] = var17; // L: 75 + if (var6) { // L: 76 var9 = var17; } - ++var10; + ++var10; // L: 77 } } } } - } + } // L: 82 - @ObfuscatedName("o") - void method2467() { - int[] var1 = new int[this.entries]; - int[] var2 = new int[33]; + @ObfuscatedName("k") + void method2430() { + int[] var1 = new int[this.entries]; // L: 85 + int[] var2 = new int[33]; // L: 87 int var3; int var4; @@ -126,109 +126,109 @@ public class VorbisCodebook { int var7; int var8; int var10; - for (var3 = 0; var3 < this.entries; ++var3) { - var4 = this.lengthMap[var3]; - if (var4 != 0) { - var5 = 1 << 32 - var4; - var6 = var2[var4]; - var1[var3] = var6; - int var9; - if ((var6 & var5) != 0) { - var7 = var2[var4 - 1]; + for (var3 = 0; var3 < this.entries; ++var3) { // L: 88 + var4 = this.lengthMap[var3]; // L: 89 + if (var4 != 0) { // L: 90 + var5 = 1 << 32 - var4; // L: 91 + var6 = var2[var4]; // L: 92 + var1[var3] = var6; // L: 93 + int var12; + if ((var6 & var5) != 0) { // L: 95 + var7 = var2[var4 - 1]; // L: 96 } else { - var7 = var6 | var5; + var7 = var6 | var5; // L: 99 - for (var8 = var4 - 1; var8 >= 1; --var8) { - var9 = var2[var8]; - if (var9 != var6) { + for (var8 = var4 - 1; var8 >= 1; --var8) { // L: 100 + var12 = var2[var8]; // L: 101 + if (var12 != var6) { // L: 102 break; } - var10 = 1 << 32 - var8; - if ((var9 & var10) != 0) { - var2[var8] = var2[var8 - 1]; - break; + var10 = 1 << 32 - var8; // L: 103 + if ((var12 & var10) != 0) { // L: 104 + var2[var8] = var2[var8 - 1]; // L: 105 + break; // L: 106 } - var2[var8] = var9 | var10; + var2[var8] = var12 | var10; // L: 109 } } - var2[var4] = var7; + var2[var4] = var7; // L: 115 - for (var8 = var4 + 1; var8 <= 32; ++var8) { - var9 = var2[var8]; - if (var9 == var6) { + for (var8 = var4 + 1; var8 <= 32; ++var8) { // L: 116 + var12 = var2[var8]; // L: 117 + if (var12 == var6) { // L: 118 var2[var8] = var7; } } } } - this.keys = new int[8]; - int var11 = 0; + this.keys = new int[8]; // L: 122 + int var11 = 0; // L: 123 - for (var3 = 0; var3 < this.entries; ++var3) { - var4 = this.lengthMap[var3]; - if (var4 != 0) { - var5 = var1[var3]; - var6 = 0; + for (var3 = 0; var3 < this.entries; ++var3) { // L: 124 + var4 = this.lengthMap[var3]; // L: 125 + if (var4 != 0) { // L: 126 + var5 = var1[var3]; // L: 127 + var6 = 0; // L: 128 - for (var7 = 0; var7 < var4; ++var7) { - var8 = Integer.MIN_VALUE >>> var7; - if ((var5 & var8) != 0) { - if (this.keys[var6] == 0) { + for (var7 = 0; var7 < var4; ++var7) { // L: 129 + var8 = Integer.MIN_VALUE >>> var7; // L: 130 + if ((var5 & var8) != 0) { // L: 131 + if (this.keys[var6] == 0) { // L: 132 this.keys[var6] = var11; } - var6 = this.keys[var6]; + var6 = this.keys[var6]; // L: 133 } else { - ++var6; + ++var6; // L: 136 } - if (var6 >= this.keys.length) { - int[] var12 = new int[this.keys.length * 2]; + if (var6 >= this.keys.length) { // L: 138 + int[] var9 = new int[this.keys.length * 2]; // L: 139 - for (var10 = 0; var10 < this.keys.length; ++var10) { - var12[var10] = this.keys[var10]; + for (var10 = 0; var10 < this.keys.length; ++var10) { // L: 140 + var9[var10] = this.keys[var10]; } - this.keys = var12; + this.keys = var9; // L: 141 } - var8 >>>= 1; + var8 >>>= 1; // L: 143 } - this.keys[var6] = ~var3; - if (var6 >= var11) { + this.keys[var6] = ~var3; // L: 145 + if (var6 >= var11) { // L: 146 var11 = var6 + 1; } } } - } + } // L: 148 - @ObfuscatedName("q") - int method2461() { + @ObfuscatedName("s") + int method2432() { int var1; - for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { + for (var1 = 0; this.keys[var1] >= 0; var1 = VorbisSample.readBit() != 0 ? this.keys[var1] : var1 + 1) { // L: 151 152 } - return ~this.keys[var1]; + return ~this.keys[var1]; // L: 153 } - @ObfuscatedName("j") - float[] method2465() { - return this.field1379[this.method2461()]; + @ObfuscatedName("t") + float[] method2440() { + return this.field1369[this.method2432()]; // L: 157 } - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("mapType1QuantValues") static int mapType1QuantValues(int var0, int var1) { int var2; - for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; class22.method227(var2, var1) > var0; --var2) { + for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; Client.method1789(var2, var1) > var0; --var2) { // L: 16 17 } - return var2; + return var2; // L: 18 } } diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 1f0ea5fdb5..4ada4ddb57 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -2,321 +2,321 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dc") +@ObfuscatedName("da") @Implements("VorbisFloor") public class VorbisFloor { - @ObfuscatedName("m") - static final int[] field1433; - @ObfuscatedName("o") + @ObfuscatedName("z") + static final int[] field1422; + @ObfuscatedName("k") @Export("VorbisFloor_decibelStatics") static final float[] VorbisFloor_decibelStatics; - @ObfuscatedName("z") - static int[] field1424; - @ObfuscatedName("w") - static int[] field1434; - @ObfuscatedName("y") - static boolean[] field1435; - @ObfuscatedName("q") - int[] field1426; - @ObfuscatedName("j") + @ObfuscatedName("m") + static int[] field1418; + @ObfuscatedName("n") + static int[] field1428; + @ObfuscatedName("d") + static boolean[] field1425; + @ObfuscatedName("s") + int[] field1420; + @ObfuscatedName("t") @Export("multiplier") int multiplier; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("partitionClassList") int[] partitionClassList; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("classDimensions") int[] classDimensions; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("classSubClasses") int[] classSubClasses; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("classMasterbooks") int[] classMasterbooks; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("subclassBooks") int[][] subclassBooks; static { - field1433 = new int[]{256, 128, 86, 64}; - VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; + field1422 = new int[]{256, 128, 86, 64}; // L: 8 + VorbisFloor_decibelStatics = new float[]{1.0649863E-7F, 1.1341951E-7F, 1.2079015E-7F, 1.2863978E-7F, 1.369995E-7F, 1.459025E-7F, 1.5538409E-7F, 1.6548181E-7F, 1.7623574E-7F, 1.8768856E-7F, 1.998856E-7F, 2.128753E-7F, 2.2670913E-7F, 2.4144197E-7F, 2.5713223E-7F, 2.7384212E-7F, 2.9163792E-7F, 3.1059022E-7F, 3.307741E-7F, 3.5226967E-7F, 3.7516213E-7F, 3.995423E-7F, 4.255068E-7F, 4.5315863E-7F, 4.8260745E-7F, 5.1397E-7F, 5.4737063E-7F, 5.829419E-7F, 6.208247E-7F, 6.611694E-7F, 7.041359E-7F, 7.4989464E-7F, 7.98627E-7F, 8.505263E-7F, 9.057983E-7F, 9.646621E-7F, 1.0273513E-6F, 1.0941144E-6F, 1.1652161E-6F, 1.2409384E-6F, 1.3215816E-6F, 1.4074654E-6F, 1.4989305E-6F, 1.5963394E-6F, 1.7000785E-6F, 1.8105592E-6F, 1.9282195E-6F, 2.053526E-6F, 2.1869757E-6F, 2.3290977E-6F, 2.4804558E-6F, 2.6416496E-6F, 2.813319E-6F, 2.9961443E-6F, 3.1908505E-6F, 3.39821E-6F, 3.619045E-6F, 3.8542307E-6F, 4.1047006E-6F, 4.371447E-6F, 4.6555283E-6F, 4.958071E-6F, 5.280274E-6F, 5.623416E-6F, 5.988857E-6F, 6.3780467E-6F, 6.7925284E-6F, 7.2339453E-6F, 7.704048E-6F, 8.2047E-6F, 8.737888E-6F, 9.305725E-6F, 9.910464E-6F, 1.0554501E-5F, 1.1240392E-5F, 1.1970856E-5F, 1.2748789E-5F, 1.3577278E-5F, 1.4459606E-5F, 1.5399271E-5F, 1.6400005E-5F, 1.7465769E-5F, 1.8600793E-5F, 1.9809577E-5F, 2.1096914E-5F, 2.2467912E-5F, 2.3928002E-5F, 2.5482977E-5F, 2.7139005E-5F, 2.890265E-5F, 3.078091E-5F, 3.2781227E-5F, 3.4911533E-5F, 3.718028E-5F, 3.9596467E-5F, 4.2169668E-5F, 4.491009E-5F, 4.7828602E-5F, 5.0936775E-5F, 5.424693E-5F, 5.7772202E-5F, 6.152657E-5F, 6.552491E-5F, 6.9783084E-5F, 7.4317984E-5F, 7.914758E-5F, 8.429104E-5F, 8.976875E-5F, 9.560242E-5F, 1.0181521E-4F, 1.0843174E-4F, 1.1547824E-4F, 1.2298267E-4F, 1.3097477E-4F, 1.3948625E-4F, 1.4855085E-4F, 1.5820454E-4F, 1.6848555E-4F, 1.7943469E-4F, 1.9109536E-4F, 2.0351382E-4F, 2.167393E-4F, 2.3082423E-4F, 2.4582449E-4F, 2.6179955E-4F, 2.7881275E-4F, 2.9693157E-4F, 3.1622787E-4F, 3.3677815E-4F, 3.5866388E-4F, 3.8197188E-4F, 4.0679457E-4F, 4.3323037E-4F, 4.613841E-4F, 4.913675E-4F, 5.2329927E-4F, 5.573062E-4F, 5.935231E-4F, 6.320936E-4F, 6.731706E-4F, 7.16917E-4F, 7.635063E-4F, 8.1312325E-4F, 8.6596457E-4F, 9.2223985E-4F, 9.821722E-4F, 0.0010459992F, 0.0011139743F, 0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F, 0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F, 0.0019632196F, 0.0020908006F, 0.0022266726F, 0.0023713743F, 0.0025254795F, 0.0026895993F, 0.0028643848F, 0.0030505287F, 0.003248769F, 0.0034598925F, 0.0036847359F, 0.0039241905F, 0.0041792067F, 0.004450795F, 0.004740033F, 0.005048067F, 0.0053761187F, 0.005725489F, 0.0060975635F, 0.0064938175F, 0.0069158226F, 0.0073652514F, 0.007843887F, 0.008353627F, 0.008896492F, 0.009474637F, 0.010090352F, 0.01074608F, 0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F, 0.014722068F, 0.015678791F, 0.016697686F, 0.017782796F, 0.018938422F, 0.020169148F, 0.021479854F, 0.022875736F, 0.02436233F, 0.025945531F, 0.027631618F, 0.029427277F, 0.031339627F, 0.03337625F, 0.035545226F, 0.037855156F, 0.0403152F, 0.042935107F, 0.045725275F, 0.048696756F, 0.05186135F, 0.05523159F, 0.05882085F, 0.062643364F, 0.06671428F, 0.07104975F, 0.075666964F, 0.08058423F, 0.08582105F, 0.09139818F, 0.097337745F, 0.1036633F, 0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F, 0.14201812F, 0.15124726F, 0.16107617F, 0.1715438F, 0.18269168F, 0.19456401F, 0.20720787F, 0.22067343F, 0.23501402F, 0.25028655F, 0.26655158F, 0.28387362F, 0.3023213F, 0.32196787F, 0.34289113F, 0.36517414F, 0.3889052F, 0.41417846F, 0.44109413F, 0.4697589F, 0.50028646F, 0.53279793F, 0.5674221F, 0.6042964F, 0.64356697F, 0.6853896F, 0.72993004F, 0.777365F, 0.8278826F, 0.88168305F, 0.9389798F, 1.0F}; // L: 9 } VorbisFloor() { - int var1 = VorbisSample.readBits(16); - if (var1 != 1) { - throw new RuntimeException(); + int var1 = VorbisSample.readBits(16); // L: 108 + if (var1 != 1) { // L: 109 + throw new RuntimeException(); // L: 110 } else { - int var2 = VorbisSample.readBits(5); - int var3 = 0; - this.partitionClassList = new int[var2]; + int var2 = VorbisSample.readBits(5); // L: 112 + int var3 = 0; // L: 113 + this.partitionClassList = new int[var2]; // L: 114 int var4; int var5; - for (var4 = 0; var4 < var2; ++var4) { - var5 = VorbisSample.readBits(4); - this.partitionClassList[var4] = var5; - if (var5 >= var3) { + for (var4 = 0; var4 < var2; ++var4) { // L: 115 + var5 = VorbisSample.readBits(4); // L: 116 + this.partitionClassList[var4] = var5; // L: 117 + if (var5 >= var3) { // L: 118 var3 = var5 + 1; } } - this.classDimensions = new int[var3]; - this.classSubClasses = new int[var3]; - this.classMasterbooks = new int[var3]; - this.subclassBooks = new int[var3][]; + this.classDimensions = new int[var3]; // L: 120 + this.classSubClasses = new int[var3]; // L: 121 + this.classMasterbooks = new int[var3]; // L: 122 + this.subclassBooks = new int[var3][]; // L: 123 int var7; - for (var4 = 0; var4 < var3; ++var4) { - this.classDimensions[var4] = VorbisSample.readBits(3) + 1; - var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); - if (var5 != 0) { + for (var4 = 0; var4 < var3; ++var4) { // L: 124 + this.classDimensions[var4] = VorbisSample.readBits(3) + 1; // L: 125 + var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); // L: 126 + if (var5 != 0) { // L: 127 this.classMasterbooks[var4] = VorbisSample.readBits(8); } - var5 = 1 << var5; - int[] var6 = new int[var5]; - this.subclassBooks[var4] = var6; + var5 = 1 << var5; // L: 128 + int[] var9 = new int[var5]; // L: 129 + this.subclassBooks[var4] = var9; // L: 130 - for (var7 = 0; var7 < var5; ++var7) { - var6[var7] = VorbisSample.readBits(8) - 1; + for (var7 = 0; var7 < var5; ++var7) { // L: 131 + var9[var7] = VorbisSample.readBits(8) - 1; } } - this.multiplier = VorbisSample.readBits(2) + 1; - var4 = VorbisSample.readBits(4); - var5 = 2; + this.multiplier = VorbisSample.readBits(2) + 1; // L: 133 + var4 = VorbisSample.readBits(4); // L: 134 + var5 = 2; // L: 135 - int var9; - for (var9 = 0; var9 < var2; ++var9) { - var5 += this.classDimensions[this.partitionClassList[var9]]; + int var6; + for (var6 = 0; var6 < var2; ++var6) { // L: 136 + var5 += this.classDimensions[this.partitionClassList[var6]]; } - this.field1426 = new int[var5]; - this.field1426[0] = 0; - this.field1426[1] = 1 << var4; - var5 = 2; + this.field1420 = new int[var5]; // L: 137 + this.field1420[0] = 0; // L: 138 + this.field1420[1] = 1 << var4; // L: 139 + var5 = 2; // L: 140 - for (var9 = 0; var9 < var2; ++var9) { - var7 = this.partitionClassList[var9]; + for (var6 = 0; var6 < var2; ++var6) { // L: 141 + var7 = this.partitionClassList[var6]; // L: 142 - for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { - this.field1426[var5++] = VorbisSample.readBits(var4); + for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { // L: 143 + this.field1420[var5++] = VorbisSample.readBits(var4); } } - if (field1424 == null || field1424.length < var5) { - field1424 = new int[var5]; - field1434 = new int[var5]; - field1435 = new boolean[var5]; + if (field1418 == null || field1418.length < var5) { // L: 145 + field1418 = new int[var5]; // L: 146 + field1428 = new int[var5]; // L: 147 + field1425 = new boolean[var5]; // L: 148 } } + } // L: 150 + + @ObfuscatedName("s") + int method2504(int var1, int var2, int var3, int var4, int var5) { + int var6 = var4 - var2; // L: 50 + int var7 = var3 - var1; // L: 51 + int var8 = var6 < 0 ? -var6 : var6; // L: 52 + int var9 = (var5 - var1) * var8; // L: 53 + int var10 = var9 / var7; // L: 54 + return var6 < 0 ? var2 - var10 : var10 + var2; // L: 55 } - @ObfuscatedName("q") - int method2532(int var1, int var2, int var3, int var4, int var5) { - int var6 = var4 - var2; - int var7 = var3 - var1; - int var8 = var6 < 0 ? -var6 : var6; - int var9 = (var5 - var1) * var8; - int var10 = var9 / var7; - return var6 < 0 ? var2 - var10 : var10 + var2; - } - - @ObfuscatedName("j") - void method2533(int var1, int var2, int var3, int var4, float[] var5, int var6) { - int var7 = var4 - var2; - int var8 = var3 - var1; - int var9 = var7 < 0 ? -var7 : var7; - int var10 = var7 / var8; - int var11 = var2; - int var12 = 0; - int var13 = var7 < 0 ? var10 - 1 : var10 + 1; - var9 -= (var10 < 0 ? -var10 : var10) * var8; - var5[var1] *= VorbisFloor_decibelStatics[var2]; - if (var3 > var6) { + @ObfuscatedName("t") + void method2496(int var1, int var2, int var3, int var4, float[] var5, int var6) { + int var7 = var4 - var2; // L: 59 + int var8 = var3 - var1; // L: 60 + int var9 = var7 < 0 ? -var7 : var7; // L: 61 + int var10 = var7 / var8; // L: 62 + int var11 = var2; // L: 63 + int var12 = 0; // L: 64 + int var13 = var7 < 0 ? var10 - 1 : var10 + 1; // L: 65 + var9 -= (var10 < 0 ? -var10 : var10) * var8; // L: 66 + var5[var1] *= VorbisFloor_decibelStatics[var2]; // L: 67 + if (var3 > var6) { // L: 68 var3 = var6; } - for (int var14 = var1 + 1; var14 < var3; ++var14) { - var12 += var9; - if (var12 >= var8) { - var12 -= var8; - var11 += var13; + for (int var14 = var1 + 1; var14 < var3; ++var14) { // L: 69 + var12 += var9; // L: 70 + if (var12 >= var8) { // L: 71 + var12 -= var8; // L: 72 + var11 += var13; // L: 73 } else { - var11 += var10; + var11 += var10; // L: 76 } - var5[var14] *= VorbisFloor_decibelStatics[var11]; + var5[var14] *= VorbisFloor_decibelStatics[var11]; // L: 78 } - } + } // L: 80 - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("VarbisFloor_sort") void VarbisFloor_sort(int var1, int var2) { - if (var1 < var2) { - int var3 = var1; - int var4 = field1424[var1]; - int var5 = field1434[var1]; - boolean var6 = field1435[var1]; + if (var1 < var2) { // L: 83 + int var3 = var1; // L: 84 + int var4 = field1418[var1]; // L: 85 + int var5 = field1428[var1]; // L: 86 + boolean var6 = field1425[var1]; // L: 87 - for (int var7 = var1 + 1; var7 <= var2; ++var7) { - int var8 = field1424[var7]; - if (var8 < var4) { - field1424[var3] = var8; - field1434[var3] = field1434[var7]; - field1435[var3] = field1435[var7]; - ++var3; - field1424[var7] = field1424[var3]; - field1434[var7] = field1434[var3]; - field1435[var7] = field1435[var3]; + for (int var7 = var1 + 1; var7 <= var2; ++var7) { // L: 88 + int var8 = field1418[var7]; // L: 89 + if (var8 < var4) { // L: 90 + field1418[var3] = var8; // L: 91 + field1428[var3] = field1428[var7]; // L: 92 + field1425[var3] = field1425[var7]; // L: 93 + ++var3; // L: 94 + field1418[var7] = field1418[var3]; // L: 95 + field1428[var7] = field1428[var3]; // L: 96 + field1425[var7] = field1425[var3]; // L: 97 } } - field1424[var3] = var4; - field1434[var3] = var5; - field1435[var3] = var6; - this.VarbisFloor_sort(var1, var3 - 1); - this.VarbisFloor_sort(var3 + 1, var2); + field1418[var3] = var4; // L: 100 + field1428[var3] = var5; // L: 101 + field1425[var3] = var6; // L: 102 + this.VarbisFloor_sort(var1, var3 - 1); // L: 103 + this.VarbisFloor_sort(var3 + 1, var2); // L: 104 } - } + } // L: 105 - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("readSubmapFloor") boolean readSubmapFloor() { - boolean var1 = VorbisSample.readBit() != 0; - if (!var1) { + boolean var1 = VorbisSample.readBit() != 0; // L: 153 + if (!var1) { // L: 154 return false; } else { - int var2 = this.field1426.length; + int var2 = this.field1420.length; // L: 155 int var3; - for (var3 = 0; var3 < var2; ++var3) { - field1424[var3] = this.field1426[var3]; + for (var3 = 0; var3 < var2; ++var3) { // L: 156 + field1418[var3] = this.field1420[var3]; } - var3 = field1433[this.multiplier - 1]; - int var4 = WorldMapSection3.iLog(var3 - 1); - field1434[0] = VorbisSample.readBits(var4); - field1434[1] = VorbisSample.readBits(var4); - int var5 = 2; + var3 = field1422[this.multiplier - 1]; // L: 157 + int var4 = DevicePcmPlayerProvider.iLog(var3 - 1); // L: 158 + field1428[0] = VorbisSample.readBits(var4); // L: 159 + field1428[1] = VorbisSample.readBits(var4); // L: 160 + int var5 = 2; // L: 161 - for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { - int var7 = this.partitionClassList[var6]; - int var8 = this.classDimensions[var7]; - int var9 = this.classSubClasses[var7]; - int var10 = (1 << var9) - 1; - int var11 = 0; - if (var9 > 0) { - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2461(); + for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { // L: 162 + int var7 = this.partitionClassList[var6]; // L: 163 + int var8 = this.classDimensions[var7]; // L: 164 + int var9 = this.classSubClasses[var7]; // L: 165 + int var10 = (1 << var9) - 1; // L: 166 + int var11 = 0; // L: 167 + if (var9 > 0) { // L: 168 + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2432(); } - for (int var12 = 0; var12 < var8; ++var12) { - int var13 = this.subclassBooks[var7][var11 & var10]; - var11 >>>= var9; - field1434[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2461() : 0; + for (int var12 = 0; var12 < var8; ++var12) { // L: 169 + int var13 = this.subclassBooks[var7][var11 & var10]; // L: 170 + var11 >>>= var9; // L: 171 + field1428[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2432() : 0; // L: 172 } } - return true; + return true; // L: 175 } } - @ObfuscatedName("n") - void method2536(float[] var1, int var2) { - int var3 = this.field1426.length; - int var4 = field1433[this.multiplier - 1]; - boolean[] var5 = field1435; - field1435[1] = true; - var5[0] = true; + @ObfuscatedName("x") + void method2501(float[] var1, int var2) { + int var3 = this.field1420.length; // L: 179 + int var4 = field1422[this.multiplier - 1]; // L: 180 + boolean[] var5 = field1425; // L: 181 + field1425[1] = true; // L: 182 + var5[0] = true; // L: 183 int var6; int var7; int var8; int var9; int var10; - for (var6 = 2; var6 < var3; ++var6) { - var7 = method2554(field1424, var6); - var8 = method2544(field1424, var6); - var9 = this.method2532(field1424[var7], field1434[var7], field1424[var8], field1434[var8], field1424[var6]); - var10 = field1434[var6]; - int var11 = var4 - var9; - int var13 = (var11 < var9 ? var11 : var9) << 1; - if (var10 != 0) { - boolean[] var14 = field1435; - field1435[var8] = true; - var14[var7] = true; - field1435[var6] = true; - if (var10 >= var13) { - field1434[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; + for (var6 = 2; var6 < var3; ++var6) { // L: 184 + var7 = method2506(field1418, var6); // L: 185 + var8 = method2495(field1418, var6); // L: 186 + var9 = this.method2504(field1418[var7], field1428[var7], field1418[var8], field1428[var8], field1418[var6]); // L: 187 + var10 = field1428[var6]; // L: 188 + int var11 = var4 - var9; // L: 189 + int var13 = (var11 < var9 ? var11 : var9) << 1; // L: 191 + if (var10 != 0) { // L: 192 + boolean[] var14 = field1425; // L: 193 + field1425[var8] = true; // L: 195 + var14[var7] = true; // L: 196 + field1425[var6] = true; // L: 197 + if (var10 >= var13) { // L: 198 + field1428[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1; // L: 199 } else { - field1434[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; + field1428[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9; // L: 202 } } else { - field1435[var6] = false; - field1434[var6] = var9; + field1425[var6] = false; // L: 206 + field1428[var6] = var9; // L: 207 } } - this.VarbisFloor_sort(0, var3 - 1); - var6 = 0; - var7 = field1434[0] * this.multiplier; + this.VarbisFloor_sort(0, var3 - 1); // L: 210 + var6 = 0; // L: 211 + var7 = field1428[0] * this.multiplier; // L: 212 - for (var8 = 1; var8 < var3; ++var8) { - if (field1435[var8]) { - var9 = field1424[var8]; - var10 = field1434[var8] * this.multiplier; - this.method2533(var6, var7, var9, var10, var1, var2); - if (var9 >= var2) { + for (var8 = 1; var8 < var3; ++var8) { // L: 213 + if (field1425[var8]) { // L: 214 + var9 = field1418[var8]; // L: 215 + var10 = field1428[var8] * this.multiplier; // L: 216 + this.method2496(var6, var7, var9, var10, var1, var2); // L: 217 + if (var9 >= var2) { // L: 218 return; } - var6 = var9; - var7 = var10; + var6 = var9; // L: 219 + var7 = var10; // L: 220 } } - float var16 = VorbisFloor_decibelStatics[var7]; + float var16 = VorbisFloor_decibelStatics[var7]; // L: 223 - for (var9 = var6; var9 < var2; ++var9) { + for (var9 = var6; var9 < var2; ++var9) { // L: 224 var1[var9] *= var16; } - } + } // L: 225 - @ObfuscatedName("m") - static int method2554(int[] var0, int var1) { - int var2 = var0[var1]; - int var3 = -1; - int var4 = Integer.MIN_VALUE; + @ObfuscatedName("z") + static int method2506(int[] var0, int var1) { + int var2 = var0[var1]; // L: 22 + int var3 = -1; // L: 23 + int var4 = Integer.MIN_VALUE; // L: 24 - for (int var5 = 0; var5 < var1; ++var5) { - int var6 = var0[var5]; - if (var6 < var2 && var6 > var4) { - var3 = var5; - var4 = var6; + for (int var5 = 0; var5 < var1; ++var5) { // L: 25 + int var6 = var0[var5]; // L: 26 + if (var6 < var2 && var6 > var4) { // L: 27 + var3 = var5; // L: 28 + var4 = var6; // L: 29 } } - return var3; + return var3; // L: 32 } - @ObfuscatedName("o") - static int method2544(int[] var0, int var1) { - int var2 = var0[var1]; - int var3 = -1; - int var4 = Integer.MAX_VALUE; + @ObfuscatedName("k") + static int method2495(int[] var0, int var1) { + int var2 = var0[var1]; // L: 36 + int var3 = -1; // L: 37 + int var4 = Integer.MAX_VALUE; // L: 38 - for (int var5 = 0; var5 < var1; ++var5) { - int var6 = var0[var5]; - if (var6 > var2 && var6 < var4) { - var3 = var5; - var4 = var6; + for (int var5 = 0; var5 < var1; ++var5) { // L: 39 + int var6 = var0[var5]; // L: 40 + if (var6 > var2 && var6 < var4) { // L: 41 + var3 = var5; // L: 42 + var4 = var6; // L: 43 } } - return var3; + return var3; // L: 46 } } diff --git a/runescape-client/src/main/java/VorbisMapping.java b/runescape-client/src/main/java/VorbisMapping.java index d85e468cbc..2f18c2bd5c 100644 --- a/runescape-client/src/main/java/VorbisMapping.java +++ b/runescape-client/src/main/java/VorbisMapping.java @@ -2,42 +2,42 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("dz") +@ObfuscatedName("dn") @Implements("VorbisMapping") public class VorbisMapping { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("submaps") int submaps; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("mappingMux") int mappingMux; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("submapFloor") int[] submapFloor; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("submapResidue") int[] submapResidue; VorbisMapping() { - VorbisSample.readBits(16); - this.submaps = VorbisSample.readBit() != 0 ? VorbisSample.readBits(4) + 1 : 1; - if (VorbisSample.readBit() != 0) { - VorbisSample.readBits(8); + VorbisSample.readBits(16); // L: 12 + this.submaps = VorbisSample.readBit() != 0 ? VorbisSample.readBits(4) + 1 : 1; // L: 13 + if (VorbisSample.readBit() != 0) { // L: 14 + VorbisSample.readBits(8); // L: 15 } - VorbisSample.readBits(2); - if (this.submaps > 1) { - this.mappingMux = VorbisSample.readBits(4); + VorbisSample.readBits(2); // L: 18 + if (this.submaps > 1) { // L: 19 + this.mappingMux = VorbisSample.readBits(4); // L: 20 } - this.submapFloor = new int[this.submaps]; - this.submapResidue = new int[this.submaps]; + this.submapFloor = new int[this.submaps]; // L: 22 + this.submapResidue = new int[this.submaps]; // L: 23 - for (int var1 = 0; var1 < this.submaps; ++var1) { - VorbisSample.readBits(8); - this.submapFloor[var1] = VorbisSample.readBits(8); - this.submapResidue[var1] = VorbisSample.readBits(8); + for (int var1 = 0; var1 < this.submaps; ++var1) { // L: 24 + VorbisSample.readBits(8); // L: 25 + this.submapFloor[var1] = VorbisSample.readBits(8); // L: 26 + this.submapResidue[var1] = VorbisSample.readBits(8); // L: 27 } - } + } // L: 29 } diff --git a/runescape-client/src/main/java/VorbisResidue.java b/runescape-client/src/main/java/VorbisResidue.java index e38170aed8..8d6d22268e 100644 --- a/runescape-client/src/main/java/VorbisResidue.java +++ b/runescape-client/src/main/java/VorbisResidue.java @@ -2,124 +2,124 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("de") +@ObfuscatedName("do") @Implements("VorbisResidue") public class VorbisResidue { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("residueType") int residueType; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("begin") int begin; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("end") int end; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("partitionSize") int partitionSize; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("classifications") int classifications; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("classbook") int classbook; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("cascade") int[] cascade; VorbisResidue() { - this.residueType = VorbisSample.readBits(16); - this.begin = VorbisSample.readBits(24); - this.end = VorbisSample.readBits(24); - this.partitionSize = VorbisSample.readBits(24) + 1; - this.classifications = VorbisSample.readBits(6) + 1; - this.classbook = VorbisSample.readBits(8); - int[] var1 = new int[this.classifications]; + this.residueType = VorbisSample.readBits(16); // L: 15 + this.begin = VorbisSample.readBits(24); // L: 16 + this.end = VorbisSample.readBits(24); // L: 17 + this.partitionSize = VorbisSample.readBits(24) + 1; // L: 18 + this.classifications = VorbisSample.readBits(6) + 1; // L: 19 + this.classbook = VorbisSample.readBits(8); // L: 20 + int[] var1 = new int[this.classifications]; // L: 21 int var2; - for (var2 = 0; var2 < this.classifications; ++var2) { - int var3 = 0; - int var4 = VorbisSample.readBits(3); - boolean var5 = VorbisSample.readBit() != 0; - if (var5) { + for (var2 = 0; var2 < this.classifications; ++var2) { // L: 22 + int var3 = 0; // L: 23 + int var4 = VorbisSample.readBits(3); // L: 24 + boolean var5 = VorbisSample.readBit() != 0; // L: 25 + if (var5) { // L: 26 var3 = VorbisSample.readBits(5); } - var1[var2] = var3 << 3 | var4; + var1[var2] = var3 << 3 | var4; // L: 27 } - this.cascade = new int[this.classifications * 8]; + this.cascade = new int[this.classifications * 8]; // L: 29 - for (var2 = 0; var2 < this.classifications * 8; ++var2) { + for (var2 = 0; var2 < this.classifications * 8; ++var2) { // L: 30 this.cascade[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0 ? VorbisSample.readBits(8) : -1; } - } + } // L: 31 - @ObfuscatedName("m") - void method2652(float[] var1, int var2, boolean var3) { + @ObfuscatedName("z") + void method2616(float[] var1, int var2, boolean var3) { int var4; - for (var4 = 0; var4 < var2; ++var4) { + for (var4 = 0; var4 < var2; ++var4) { // L: 34 var1[var4] = 0.0F; } - if (!var3) { - var4 = VorbisSample.VorbisSample_codebooks[this.classbook].dimensions; - int var5 = this.end - this.begin; - int var6 = var5 / this.partitionSize; - int[] var7 = new int[var6]; + if (!var3) { // L: 35 + var4 = VorbisSample.VorbisSample_codebooks[this.classbook].dimensions; // L: 36 + int var5 = this.end - this.begin; // L: 37 + int var6 = var5 / this.partitionSize; // L: 38 + int[] var7 = new int[var6]; // L: 39 - for (int var8 = 0; var8 < 8; ++var8) { - int var9 = 0; + for (int var8 = 0; var8 < 8; ++var8) { // L: 40 + int var9 = 0; // L: 41 - while (var9 < var6) { + while (var9 < var6) { // L: 42 int var10; int var11; - if (var8 == 0) { - var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2461(); + if (var8 == 0) { // L: 43 + var10 = VorbisSample.VorbisSample_codebooks[this.classbook].method2432(); // L: 45 - for (var11 = var4 - 1; var11 >= 0; --var11) { - if (var9 + var11 < var6) { + for (var11 = var4 - 1; var11 >= 0; --var11) { // L: 46 + if (var9 + var11 < var6) { // L: 47 var7[var9 + var11] = var10 % this.classifications; } - var10 /= this.classifications; + var10 /= this.classifications; // L: 48 } } - for (var10 = 0; var10 < var4; ++var10) { - var11 = var7[var9]; - int var12 = this.cascade[var8 + var11 * 8]; - if (var12 >= 0) { - int var13 = var9 * this.partitionSize + this.begin; - VorbisCodebook var14 = VorbisSample.VorbisSample_codebooks[var12]; + for (var10 = 0; var10 < var4; ++var10) { // L: 52 + var11 = var7[var9]; // L: 54 + int var12 = this.cascade[var8 + var11 * 8]; // L: 55 + if (var12 >= 0) { // L: 56 + int var13 = var9 * this.partitionSize + this.begin; // L: 57 + VorbisCodebook var14 = VorbisSample.VorbisSample_codebooks[var12]; // L: 58 int var15; - if (this.residueType == 0) { - var15 = this.partitionSize / var14.dimensions; + if (this.residueType == 0) { // L: 59 + var15 = this.partitionSize / var14.dimensions; // L: 60 - for (int var16 = 0; var16 < var15; ++var16) { - float[] var17 = var14.method2465(); + for (int var19 = 0; var19 < var15; ++var19) { // L: 61 + float[] var20 = var14.method2440(); // L: 62 - for (int var18 = 0; var18 < var14.dimensions; ++var18) { - var1[var13 + var16 + var18 * var15] += var17[var18]; + for (int var18 = 0; var18 < var14.dimensions; ++var18) { // L: 63 + var1[var13 + var19 + var18 * var15] += var20[var18]; } } } else { - var15 = 0; + var15 = 0; // L: 67 - while (var15 < this.partitionSize) { - float[] var19 = var14.method2465(); + while (var15 < this.partitionSize) { // L: 68 + float[] var16 = var14.method2440(); // L: 69 - for (int var20 = 0; var20 < var14.dimensions; ++var20) { - var1[var13 + var15] += var19[var20]; - ++var15; + for (int var17 = 0; var17 < var14.dimensions; ++var17) { // L: 70 + var1[var13 + var15] += var16[var17]; // L: 71 + ++var15; // L: 72 } } } } - ++var9; - if (var9 >= var6) { + ++var9; // L: 78 + if (var9 >= var6) { // L: 79 break; } } @@ -127,5 +127,5 @@ public class VorbisResidue { } } - } + } // L: 83 } diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index e94b08c00a..198cfff0f6 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -3,645 +3,645 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("di") +@ObfuscatedName("dk") @Implements("VorbisSample") public class VorbisSample extends Node { - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("VorbisSample_bytes") static byte[] VorbisSample_bytes; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("VorbisSample_byteOffset") static int VorbisSample_byteOffset; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("VorbisSample_bitOffset") static int VorbisSample_bitOffset; - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("VorbisSample_blockSize0") static int VorbisSample_blockSize0; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("VorbisSample_blockSize1") static int VorbisSample_blockSize1; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "[Ldl;" + descriptor = "[Ldb;" ) @Export("VorbisSample_codebooks") static VorbisCodebook[] VorbisSample_codebooks; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "[Ldc;" + descriptor = "[Lda;" ) @Export("VorbisSample_floors") static VorbisFloor[] VorbisSample_floors; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "[Lde;" + descriptor = "[Ldo;" ) @Export("VorbisSample_residues") static VorbisResidue[] VorbisSample_residues; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Ldz;" + descriptor = "[Ldn;" ) @Export("VorbisSample_mappings") static VorbisMapping[] VorbisSample_mappings; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("VorbisSample_blockFlags") static boolean[] VorbisSample_blockFlags; - @ObfuscatedName("s") + @ObfuscatedName("f") @Export("VorbisSample_mapping") static int[] VorbisSample_mapping; - @ObfuscatedName("v") - static boolean field1416; - @ObfuscatedName("x") - static float[] field1407; + @ObfuscatedName("y") + static boolean field1410; + @ObfuscatedName("p") + static float[] field1401; @ObfuscatedName("b") - static float[] field1408; - @ObfuscatedName("i") - static float[] field1414; - @ObfuscatedName("f") - static float[] field1410; - @ObfuscatedName("ah") - static float[] field1411; - @ObfuscatedName("ai") - static float[] field1412; + static float[] field1405; + @ObfuscatedName("l") + static float[] field1403; + @ObfuscatedName("e") + static float[] field1384; + @ObfuscatedName("ab") + static float[] field1392; + @ObfuscatedName("ag") + static float[] field1406; @ObfuscatedName("ao") - static float[] field1413; + static float[] field1407; @ObfuscatedName("ae") - static int[] field1402; - @ObfuscatedName("ax") - static int[] field1415; - @ObfuscatedName("m") - byte[][] field1398; - @ObfuscatedName("o") + static int[] field1408; + @ObfuscatedName("an") + static int[] field1409; + @ObfuscatedName("z") + byte[][] field1397; + @ObfuscatedName("k") @Export("sampleRate") int sampleRate; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("sampleCount") int sampleCount; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("start") int start; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("end") int end; - @ObfuscatedName("g") - boolean field1409; - @ObfuscatedName("d") - float[] field1385; - @ObfuscatedName("e") - int field1392; - @ObfuscatedName("l") - int field1405; - @ObfuscatedName("t") - boolean field1406; - @ObfuscatedName("ag") + @ObfuscatedName("o") + boolean field1395; + @ObfuscatedName("v") + float[] field1390; + @ObfuscatedName("j") + int field1394; + @ObfuscatedName("r") + int field1399; + @ObfuscatedName("u") + boolean field1400; + @ObfuscatedName("am") @Export("samples") byte[] samples; - @ObfuscatedName("ab") - int field1417; - @ObfuscatedName("am") - int field1388; + @ObfuscatedName("ap") + int field1383; + @ObfuscatedName("au") + int field1412; static { - field1416 = false; + field1410 = false; // L: 28 } VorbisSample(byte[] var1) { - this.read(var1); - } + this.read(var1); // L: 401 + } // L: 402 - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("read") void read(byte[] var1) { - Buffer var2 = new Buffer(var1); - this.sampleRate = var2.readInt(); - this.sampleCount = var2.readInt(); - this.start = var2.readInt(); - this.end = var2.readInt(); - if (this.end < 0) { - this.end = ~this.end; - this.field1409 = true; + Buffer var2 = new Buffer(var1); // L: 89 + this.sampleRate = var2.readInt(); // L: 90 + this.sampleCount = var2.readInt(); // L: 91 + this.start = var2.readInt(); // L: 92 + this.end = var2.readInt(); // L: 93 + if (this.end < 0) { // L: 94 + this.end = ~this.end; // L: 95 + this.field1395 = true; // L: 96 } - int var3 = var2.readInt(); - this.field1398 = new byte[var3][]; + int var3 = var2.readInt(); // L: 98 + this.field1397 = new byte[var3][]; // L: 99 - for (int var4 = 0; var4 < var3; ++var4) { - int var5 = 0; + for (int var4 = 0; var4 < var3; ++var4) { // L: 100 + int var5 = 0; // L: 101 int var6; do { - var6 = var2.readUnsignedByte(); - var5 += var6; - } while(var6 >= 255); + var6 = var2.readUnsignedByte(); // L: 103 + var5 += var6; // L: 104 + } while(var6 >= 255); // L: 105 - byte[] var7 = new byte[var5]; - var2.readBytes(var7, 0, var5); - this.field1398[var4] = var7; + byte[] var7 = new byte[var5]; // L: 107 + var2.readBytes(var7, 0, var5); // L: 108 + this.field1397[var4] = var7; // L: 109 } - } + } // L: 111 - @ObfuscatedName("n") - float[] method2499(int var1) { - VorbisSample_setData(this.field1398[var1], 0); - readBit(); - int var2 = readBits(WorldMapSection3.iLog(VorbisSample_mapping.length - 1)); - boolean var3 = VorbisSample_blockFlags[var2]; - int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; - boolean var5 = false; - boolean var6 = false; - if (var3) { - var5 = readBit() != 0; - var6 = readBit() != 0; + @ObfuscatedName("x") + float[] method2467(int var1) { + VorbisSample_setData(this.field1397[var1], 0); // L: 182 + readBit(); // L: 183 + int var2 = readBits(DevicePcmPlayerProvider.iLog(VorbisSample_mapping.length - 1)); // L: 184 + boolean var3 = VorbisSample_blockFlags[var2]; // L: 185 + int var4 = var3 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 186 + boolean var5 = false; // L: 187 + boolean var6 = false; // L: 188 + if (var3) { // L: 189 + var5 = readBit() != 0; // L: 190 + var6 = readBit() != 0; // L: 191 } - int var7 = var4 >> 1; + int var7 = var4 >> 1; // L: 193 int var8; int var9; int var10; - if (var3 && !var5) { - var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); - var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); - var10 = VorbisSample_blockSize0 >> 1; + if (var3 && !var5) { // L: 197 + var8 = (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 198 + var9 = (VorbisSample_blockSize0 >> 2) + (var4 >> 2); // L: 199 + var10 = VorbisSample_blockSize0 >> 1; // L: 200 } else { - var8 = 0; - var9 = var7; - var10 = var4 >> 1; + var8 = 0; // L: 203 + var9 = var7; // L: 204 + var10 = var4 >> 1; // L: 205 } int var11; int var12; int var13; - if (var3 && !var6) { - var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); - var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); - var13 = VorbisSample_blockSize0 >> 1; + if (var3 && !var6) { // L: 210 + var11 = var4 - (var4 >> 2) - (VorbisSample_blockSize0 >> 2); // L: 211 + var12 = (VorbisSample_blockSize0 >> 2) + (var4 - (var4 >> 2)); // L: 212 + var13 = VorbisSample_blockSize0 >> 1; // L: 213 } else { - var11 = var7; - var12 = var4; - var13 = var4 >> 1; + var11 = var7; // L: 216 + var12 = var4; // L: 217 + var13 = var4 >> 1; // L: 218 } - VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; - int var16 = var14.mappingMux; - int var17 = var14.submapFloor[var16]; - boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); - boolean var45 = var15; + VorbisMapping var14 = VorbisSample_mappings[VorbisSample_mapping[var2]]; // L: 220 + int var16 = var14.mappingMux; // L: 223 + int var17 = var14.submapFloor[var16]; // L: 224 + boolean var15 = !VorbisSample_floors[var17].readSubmapFloor(); // L: 225 + boolean var45 = var15; // L: 227 - for (var17 = 0; var17 < var14.submaps; ++var17) { - VorbisResidue var18 = VorbisSample_residues[var14.submapResidue[var17]]; - float[] var19 = field1407; - var18.method2652(var19, var4 >> 1, var45); + for (var17 = 0; var17 < var14.submaps; ++var17) { // L: 228 + VorbisResidue var42 = VorbisSample_residues[var14.submapResidue[var17]]; // L: 229 + float[] var44 = field1401; // L: 230 + var42.method2616(var44, var4 >> 1, var45); // L: 231 } - int var40; - if (!var15) { - var17 = var14.mappingMux; - var40 = var14.submapFloor[var17]; - VorbisSample_floors[var40].method2536(field1407, var4 >> 1); + int var18; + if (!var15) { // L: 234 + var17 = var14.mappingMux; // L: 235 + var18 = var14.submapFloor[var17]; // L: 236 + VorbisSample_floors[var18].method2501(field1401, var4 >> 1); // L: 237 } - int var41; - if (var15) { - for (var17 = var4 >> 1; var17 < var4; ++var17) { - field1407[var17] = 0.0F; + int var19; + if (var15) { // L: 240 + for (var17 = var4 >> 1; var17 < var4; ++var17) { // L: 241 + field1401[var17] = 0.0F; } } else { - var17 = var4 >> 1; - var40 = var4 >> 2; - var41 = var4 >> 3; - float[] var20 = field1407; + var17 = var4 >> 1; // L: 244 + var18 = var4 >> 2; // L: 245 + var19 = var4 >> 3; // L: 246 + float[] var20 = field1401; // L: 247 int var21; - for (var21 = 0; var21 < var17; ++var21) { + for (var21 = 0; var21 < var17; ++var21) { // L: 248 var20[var21] *= 0.5F; } - for (var21 = var17; var21 < var4; ++var21) { + for (var21 = var17; var21 < var4; ++var21) { // L: 249 var20[var21] = -var20[var4 - var21 - 1]; } - float[] var44 = var3 ? field1411 : field1408; - float[] var22 = var3 ? field1412 : field1414; - float[] var23 = var3 ? field1413 : field1410; - int[] var24 = var3 ? field1415 : field1402; + float[] var40 = var3 ? field1392 : field1405; // L: 250 + float[] var22 = var3 ? field1406 : field1403; // L: 251 + float[] var23 = var3 ? field1407 : field1384; // L: 252 + int[] var24 = var3 ? field1409 : field1408; // L: 253 int var25; float var26; float var27; float var28; float var29; - for (var25 = 0; var25 < var40; ++var25) { - var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; - var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; - var28 = var44[var25 * 2]; - var29 = var44[var25 * 2 + 1]; - var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; - var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; + for (var25 = 0; var25 < var18; ++var25) { // L: 254 + var26 = var20[var25 * 4] - var20[var4 - var25 * 4 - 1]; // L: 255 + var27 = var20[var25 * 4 + 2] - var20[var4 - var25 * 4 - 3]; // L: 256 + var28 = var40[var25 * 2]; // L: 257 + var29 = var40[var25 * 2 + 1]; // L: 258 + var20[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29; // L: 259 + var20[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28; // L: 260 } float var30; float var31; - for (var25 = 0; var25 < var41; ++var25) { - var26 = var20[var17 + var25 * 4 + 3]; - var27 = var20[var17 + var25 * 4 + 1]; - var28 = var20[var25 * 4 + 3]; - var29 = var20[var25 * 4 + 1]; - var20[var17 + var25 * 4 + 3] = var26 + var28; - var20[var17 + var25 * 4 + 1] = var27 + var29; - var30 = var44[var17 - 4 - var25 * 4]; - var31 = var44[var17 - 3 - var25 * 4]; - var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; - var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; + for (var25 = 0; var25 < var19; ++var25) { // L: 262 + var26 = var20[var17 + var25 * 4 + 3]; // L: 263 + var27 = var20[var17 + var25 * 4 + 1]; // L: 264 + var28 = var20[var25 * 4 + 3]; // L: 265 + var29 = var20[var25 * 4 + 1]; // L: 266 + var20[var17 + var25 * 4 + 3] = var26 + var28; // L: 267 + var20[var17 + var25 * 4 + 1] = var27 + var29; // L: 268 + var30 = var40[var17 - 4 - var25 * 4]; // L: 269 + var31 = var40[var17 - 3 - var25 * 4]; // L: 270 + var20[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31; // L: 271 + var20[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31; // L: 272 } - var25 = WorldMapSection3.iLog(var4 - 1); + var25 = DevicePcmPlayerProvider.iLog(var4 - 1); // L: 274 + int var46; int var47; int var48; int var49; - int var50; - for (var47 = 0; var47 < var25 - 3; ++var47) { - var48 = var4 >> var47 + 2; - var49 = 8 << var47; + for (var46 = 0; var46 < var25 - 3; ++var46) { // L: 275 + var47 = var4 >> var46 + 2; // L: 276 + var48 = 8 << var46; // L: 277 - for (var50 = 0; var50 < 2 << var47; ++var50) { - int var51 = var4 - var48 * var50 * 2; - int var52 = var4 - var48 * (var50 * 2 + 1); + for (var49 = 0; var49 < 2 << var46; ++var49) { // L: 278 + int var50 = var4 - var47 * var49 * 2; // L: 279 + int var51 = var4 - var47 * (var49 * 2 + 1); // L: 280 - for (int var32 = 0; var32 < var4 >> var47 + 4; ++var32) { - int var33 = var32 * 4; - float var34 = var20[var51 - 1 - var33]; - float var35 = var20[var51 - 3 - var33]; - float var36 = var20[var52 - 1 - var33]; - float var37 = var20[var52 - 3 - var33]; - var20[var51 - 1 - var33] = var34 + var36; - var20[var51 - 3 - var33] = var35 + var37; - float var38 = var44[var32 * var49]; - float var39 = var44[var32 * var49 + 1]; - var20[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; - var20[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; + for (int var32 = 0; var32 < var4 >> var46 + 4; ++var32) { // L: 281 + int var33 = var32 * 4; // L: 282 + float var34 = var20[var50 - 1 - var33]; // L: 283 + float var35 = var20[var50 - 3 - var33]; // L: 284 + float var36 = var20[var51 - 1 - var33]; // L: 285 + float var37 = var20[var51 - 3 - var33]; // L: 286 + var20[var50 - 1 - var33] = var34 + var36; // L: 287 + var20[var50 - 3 - var33] = var35 + var37; // L: 288 + float var38 = var40[var32 * var48]; // L: 289 + float var39 = var40[var32 * var48 + 1]; // L: 290 + var20[var51 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39; // L: 291 + var20[var51 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39; // L: 292 } } } - for (var47 = 1; var47 < var41 - 1; ++var47) { - var48 = var24[var47]; - if (var47 < var48) { - var49 = var47 * 8; - var50 = var48 * 8; - var30 = var20[var49 + 1]; - var20[var49 + 1] = var20[var50 + 1]; - var20[var50 + 1] = var30; - var30 = var20[var49 + 3]; - var20[var49 + 3] = var20[var50 + 3]; - var20[var50 + 3] = var30; - var30 = var20[var49 + 5]; - var20[var49 + 5] = var20[var50 + 5]; - var20[var50 + 5] = var30; - var30 = var20[var49 + 7]; - var20[var49 + 7] = var20[var50 + 7]; - var20[var50 + 7] = var30; + for (var46 = 1; var46 < var19 - 1; ++var46) { // L: 296 + var47 = var24[var46]; // L: 297 + if (var46 < var47) { // L: 298 + var48 = var46 * 8; // L: 299 + var49 = var47 * 8; // L: 300 + var30 = var20[var48 + 1]; // L: 302 + var20[var48 + 1] = var20[var49 + 1]; // L: 303 + var20[var49 + 1] = var30; // L: 304 + var30 = var20[var48 + 3]; // L: 305 + var20[var48 + 3] = var20[var49 + 3]; // L: 306 + var20[var49 + 3] = var30; // L: 307 + var30 = var20[var48 + 5]; // L: 308 + var20[var48 + 5] = var20[var49 + 5]; // L: 309 + var20[var49 + 5] = var30; // L: 310 + var30 = var20[var48 + 7]; // L: 311 + var20[var48 + 7] = var20[var49 + 7]; // L: 312 + var20[var49 + 7] = var30; // L: 313 } } - for (var47 = 0; var47 < var17; ++var47) { - var20[var47] = var20[var47 * 2 + 1]; + for (var46 = 0; var46 < var17; ++var46) { // L: 316 + var20[var46] = var20[var46 * 2 + 1]; } - for (var47 = 0; var47 < var41; ++var47) { - var20[var4 - 1 - var47 * 2] = var20[var47 * 4]; - var20[var4 - 2 - var47 * 2] = var20[var47 * 4 + 1]; - var20[var4 - var40 - 1 - var47 * 2] = var20[var47 * 4 + 2]; - var20[var4 - var40 - 2 - var47 * 2] = var20[var47 * 4 + 3]; + for (var46 = 0; var46 < var19; ++var46) { // L: 317 + var20[var4 - 1 - var46 * 2] = var20[var46 * 4]; // L: 318 + var20[var4 - 2 - var46 * 2] = var20[var46 * 4 + 1]; // L: 319 + var20[var4 - var18 - 1 - var46 * 2] = var20[var46 * 4 + 2]; // L: 320 + var20[var4 - var18 - 2 - var46 * 2] = var20[var46 * 4 + 3]; // L: 321 } - for (var47 = 0; var47 < var41; ++var47) { - var27 = var23[var47 * 2]; - var28 = var23[var47 * 2 + 1]; - var29 = var20[var17 + var47 * 2]; - var30 = var20[var17 + var47 * 2 + 1]; - var31 = var20[var4 - 2 - var47 * 2]; - float var53 = var20[var4 - 1 - var47 * 2]; - float var54 = var28 * (var29 - var31) + var27 * (var30 + var53); - var20[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F; - var20[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F; - var54 = var28 * (var30 + var53) - var27 * (var29 - var31); - var20[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F; - var20[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F; + for (var46 = 0; var46 < var19; ++var46) { // L: 323 + var27 = var23[var46 * 2]; // L: 324 + var28 = var23[var46 * 2 + 1]; // L: 325 + var29 = var20[var17 + var46 * 2]; // L: 326 + var30 = var20[var17 + var46 * 2 + 1]; // L: 327 + var31 = var20[var4 - 2 - var46 * 2]; // L: 328 + float var52 = var20[var4 - 1 - var46 * 2]; // L: 329 + float var53 = var28 * (var29 - var31) + var27 * (var30 + var52); // L: 330 + var20[var17 + var46 * 2] = (var29 + var31 + var53) * 0.5F; // L: 331 + var20[var4 - 2 - var46 * 2] = (var29 + var31 - var53) * 0.5F; // L: 332 + var53 = var28 * (var30 + var52) - var27 * (var29 - var31); // L: 333 + var20[var17 + var46 * 2 + 1] = (var30 - var52 + var53) * 0.5F; // L: 334 + var20[var4 - 1 - var46 * 2] = (-var30 + var52 + var53) * 0.5F; // L: 335 } - for (var47 = 0; var47 < var40; ++var47) { - var20[var47] = var20[var17 + var47 * 2] * var22[var47 * 2] + var20[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1]; - var20[var17 - 1 - var47] = var20[var17 + var47 * 2] * var22[var47 * 2 + 1] - var20[var17 + var47 * 2 + 1] * var22[var47 * 2]; + for (var46 = 0; var46 < var18; ++var46) { // L: 337 + var20[var46] = var20[var17 + var46 * 2] * var22[var46 * 2] + var20[var17 + var46 * 2 + 1] * var22[var46 * 2 + 1]; // L: 338 + var20[var17 - 1 - var46] = var20[var17 + var46 * 2] * var22[var46 * 2 + 1] - var20[var17 + var46 * 2 + 1] * var22[var46 * 2]; // L: 339 } - for (var47 = 0; var47 < var40; ++var47) { - var20[var47 + (var4 - var40)] = -var20[var47]; + for (var46 = 0; var46 < var18; ++var46) { // L: 341 + var20[var46 + (var4 - var18)] = -var20[var46]; } - for (var47 = 0; var47 < var40; ++var47) { - var20[var47] = var20[var40 + var47]; + for (var46 = 0; var46 < var18; ++var46) { // L: 342 + var20[var46] = var20[var18 + var46]; } - for (var47 = 0; var47 < var40; ++var47) { - var20[var40 + var47] = -var20[var40 - var47 - 1]; + for (var46 = 0; var46 < var18; ++var46) { // L: 343 + var20[var18 + var46] = -var20[var18 - var46 - 1]; } - for (var47 = 0; var47 < var40; ++var47) { - var20[var17 + var47] = var20[var4 - var47 - 1]; + for (var46 = 0; var46 < var18; ++var46) { // L: 344 + var20[var17 + var46] = var20[var4 - var46 - 1]; } float[] var10000; - for (var47 = var8; var47 < var9; ++var47) { - var27 = (float)Math.sin(((double)(var47 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); - var10000 = field1407; - var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); + for (var46 = var8; var46 < var9; ++var46) { // L: 345 + var27 = (float)Math.sin(((double)(var46 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D); // L: 346 + var10000 = field1401; // L: 347 + var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } - for (var47 = var11; var47 < var12; ++var47) { - var27 = (float)Math.sin(((double)(var47 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); - var10000 = field1407; - var10000[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); + for (var46 = var11; var46 < var12; ++var46) { // L: 349 + var27 = (float)Math.sin(((double)(var46 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D); // L: 350 + var10000 = field1401; // L: 351 + var10000[var46] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27); } } - float[] var42 = null; - if (this.field1392 > 0) { - var40 = var4 + this.field1392 >> 2; - var42 = new float[var40]; + float[] var41 = null; // L: 354 + if (this.field1394 > 0) { // L: 355 + var18 = var4 + this.field1394 >> 2; // L: 356 + var41 = new float[var18]; // L: 357 int var43; - if (!this.field1406) { - for (var41 = 0; var41 < this.field1405; ++var41) { - var43 = var41 + (this.field1392 >> 1); - var42[var41] += this.field1385[var43]; + if (!this.field1400) { // L: 358 + for (var19 = 0; var19 < this.field1399; ++var19) { // L: 359 + var43 = var19 + (this.field1394 >> 1); // L: 360 + var41[var19] += this.field1390[var43]; // L: 361 } } - if (!var15) { - for (var41 = var8; var41 < var4 >> 1; ++var41) { - var43 = var42.length - (var4 >> 1) + var41; - var42[var43] += field1407[var41]; + if (!var15) { // L: 364 + for (var19 = var8; var19 < var4 >> 1; ++var19) { // L: 365 + var43 = var41.length - (var4 >> 1) + var19; // L: 366 + var41[var43] += field1401[var19]; // L: 367 } } } - float[] var46 = this.field1385; - this.field1385 = field1407; - field1407 = var46; - this.field1392 = var4; - this.field1405 = var12 - (var4 >> 1); - this.field1406 = var15; - return var42; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "([I)Ldp;" - ) - @Export("toRawSound") - RawSound toRawSound(int[] var1) { - if (var1 != null && var1[0] <= 0) { - return null; - } else { - if (this.samples == null) { - this.field1392 = 0; - this.field1385 = new float[VorbisSample_blockSize1]; - this.samples = new byte[this.sampleCount]; - this.field1417 = 0; - this.field1388 = 0; - } - - for (; this.field1388 < this.field1398.length; ++this.field1388) { - if (var1 != null && var1[0] <= 0) { - return null; - } - - float[] var2 = this.method2499(this.field1388); - if (var2 != null) { - int var3 = this.field1417; - int var4 = var2.length; - if (var4 > this.sampleCount - var3) { - var4 = this.sampleCount - var3; - } - - for (int var5 = 0; var5 < var4; ++var5) { - int var6 = (int)(128.0F + var2[var5] * 128.0F); - if ((var6 & -256) != 0) { - var6 = ~var6 >> 31; - } - - this.samples[var3++] = (byte)(var6 - 128); - } - - if (var1 != null) { - var1[0] -= var3 - this.field1417; - } - - this.field1417 = var3; - } - } - - this.field1385 = null; - byte[] var7 = this.samples; - this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1409); - } + float[] var54 = this.field1390; // L: 371 + this.field1390 = field1401; // L: 372 + field1401 = var54; // L: 373 + this.field1394 = var4; // L: 374 + this.field1399 = var12 - (var4 >> 1); // L: 375 + this.field1400 = var15; // L: 376 + return var41; // L: 377 } @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "([I)Lde;" + ) + @Export("toRawSound") + RawSound toRawSound(int[] var1) { + if (var1 != null && var1[0] <= 0) { // L: 405 + return null; + } else { + if (this.samples == null) { // L: 406 + this.field1394 = 0; // L: 407 + this.field1390 = new float[VorbisSample_blockSize1]; // L: 408 + this.samples = new byte[this.sampleCount]; // L: 409 + this.field1383 = 0; // L: 410 + this.field1412 = 0; // L: 411 + } + + for (; this.field1412 < this.field1397.length; ++this.field1412) { // L: 413 428 + if (var1 != null && var1[0] <= 0) { // L: 414 + return null; + } + + float[] var2 = this.method2467(this.field1412); // L: 415 + if (var2 != null) { // L: 416 + int var3 = this.field1383; // L: 417 + int var4 = var2.length; // L: 418 + if (var4 > this.sampleCount - var3) { // L: 419 + var4 = this.sampleCount - var3; + } + + for (int var5 = 0; var5 < var4; ++var5) { // L: 420 + int var6 = (int)(128.0F + var2[var5] * 128.0F); // L: 421 + if ((var6 & -256) != 0) { // L: 422 + var6 = ~var6 >> 31; + } + + this.samples[var3++] = (byte)(var6 - 128); // L: 423 + } + + if (var1 != null) { // L: 425 + var1[0] -= var3 - this.field1383; + } + + this.field1383 = var3; // L: 426 + } + } + + this.field1390 = null; // L: 430 + byte[] var7 = this.samples; // L: 431 + this.samples = null; // L: 432 + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1395); // L: 433 + } + } + + @ObfuscatedName("z") @Export("float32Unpack") static float float32Unpack(int var0) { - int var1 = var0 & 2097151; - int var2 = var0 & Integer.MIN_VALUE; - int var3 = (var0 & 2145386496) >> 21; - if (var2 != 0) { + int var1 = var0 & 2097151; // L: 47 + int var2 = var0 & Integer.MIN_VALUE; // L: 48 + int var3 = (var0 & 2145386496) >> 21; // L: 49 + if (var2 != 0) { // L: 50 var1 = -var1; } - return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); + return (float)((double)var1 * Math.pow(2.0D, (double)(var3 - 788))); // L: 51 } - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("VorbisSample_setData") static void VorbisSample_setData(byte[] var0, int var1) { - VorbisSample_bytes = var0; - VorbisSample_byteOffset = var1; - VorbisSample_bitOffset = 0; - } + VorbisSample_bytes = var0; // L: 55 + VorbisSample_byteOffset = var1; // L: 56 + VorbisSample_bitOffset = 0; // L: 57 + } // L: 58 - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("readBit") static int readBit() { - int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; - ++VorbisSample_bitOffset; - VorbisSample_byteOffset += VorbisSample_bitOffset >> 3; - VorbisSample_bitOffset &= 7; - return var0; + int var0 = VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & 1; // L: 61 + ++VorbisSample_bitOffset; // L: 62 + VorbisSample_byteOffset += VorbisSample_bitOffset >> 3; // L: 63 + VorbisSample_bitOffset &= 7; // L: 64 + return var0; // L: 65 } - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("readBits") static int readBits(int var0) { - int var1 = 0; + int var1 = 0; // L: 69 int var2; int var3; - for (var2 = 0; var0 >= 8 - VorbisSample_bitOffset; var0 -= var3) { - var3 = 8 - VorbisSample_bitOffset; - int var4 = (1 << var3) - 1; - var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var4) << var2; - VorbisSample_bitOffset = 0; - ++VorbisSample_byteOffset; - var2 += var3; + for (var2 = 0; var0 >= 8 - VorbisSample_bitOffset; var0 -= var3) { // L: 70 71 78 + var3 = 8 - VorbisSample_bitOffset; // L: 72 + int var4 = (1 << var3) - 1; // L: 73 + var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var4) << var2; // L: 74 + VorbisSample_bitOffset = 0; // L: 75 + ++VorbisSample_byteOffset; // L: 76 + var2 += var3; // L: 77 } - if (var0 > 0) { - var3 = (1 << var0) - 1; - var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var3) << var2; - VorbisSample_bitOffset += var0; + if (var0 > 0) { // L: 80 + var3 = (1 << var0) - 1; // L: 81 + var1 += (VorbisSample_bytes[VorbisSample_byteOffset] >> VorbisSample_bitOffset & var3) << var2; // L: 82 + VorbisSample_bitOffset += var0; // L: 83 } - return var1; + return var1; // L: 85 } - @ObfuscatedName("g") - static void method2508(byte[] var0) { - VorbisSample_setData(var0, 0); - VorbisSample_blockSize0 = 1 << readBits(4); - VorbisSample_blockSize1 = 1 << readBits(4); - field1407 = new float[VorbisSample_blockSize1]; + @ObfuscatedName("o") + static void method2466(byte[] var0) { + VorbisSample_setData(var0, 0); // L: 114 + VorbisSample_blockSize0 = 1 << readBits(4); // L: 115 + VorbisSample_blockSize1 = 1 << readBits(4); // L: 116 + field1401 = new float[VorbisSample_blockSize1]; // L: 117 int var1; int var2; int var3; int var4; int var5; - for (var1 = 0; var1 < 2; ++var1) { - var2 = var1 != 0 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; - var3 = var2 >> 1; - var4 = var2 >> 2; - var5 = var2 >> 3; - float[] var6 = new float[var3]; + for (var1 = 0; var1 < 2; ++var1) { // L: 118 + var2 = var1 != 0 ? VorbisSample_blockSize1 : VorbisSample_blockSize0; // L: 119 + var3 = var2 >> 1; // L: 120 + var4 = var2 >> 2; // L: 121 + var5 = var2 >> 3; // L: 122 + float[] var12 = new float[var3]; // L: 123 - for (int var7 = 0; var7 < var4; ++var7) { - var6[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); - var6[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); + for (int var7 = 0; var7 < var4; ++var7) { // L: 124 + var12[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2); // L: 125 + var12[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2)); // L: 126 } - float[] var12 = new float[var3]; + float[] var13 = new float[var3]; // L: 128 - for (int var8 = 0; var8 < var4; ++var8) { - var12[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); - var12[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); + for (int var8 = 0; var8 < var4; ++var8) { // L: 129 + var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 130 + var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2)); // L: 131 } - float[] var13 = new float[var4]; + float[] var14 = new float[var4]; // L: 133 - for (int var9 = 0; var9 < var5; ++var9) { - var13[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); - var13[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); + for (int var9 = 0; var9 < var5; ++var9) { // L: 134 + var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2); // L: 135 + var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2)); // L: 136 } - int[] var14 = new int[var5]; - int var10 = WorldMapSection3.iLog(var5 - 1); + int[] var15 = new int[var5]; // L: 138 + int var10 = DevicePcmPlayerProvider.iLog(var5 - 1); // L: 139 - for (int var11 = 0; var11 < var5; ++var11) { - var14[var11] = class8.method104(var11, var10); + for (int var11 = 0; var11 < var5; ++var11) { // L: 140 + var15[var11] = GameShell.method996(var11, var10); } - if (var1 != 0) { - field1411 = var6; - field1412 = var12; - field1413 = var13; - field1415 = var14; + if (var1 != 0) { // L: 141 + field1392 = var12; // L: 142 + field1406 = var13; // L: 143 + field1407 = var14; // L: 144 + field1409 = var15; // L: 145 } else { - field1408 = var6; - field1414 = var12; - field1410 = var13; - field1402 = var14; + field1405 = var12; // L: 148 + field1403 = var13; // L: 149 + field1384 = var14; // L: 150 + field1408 = var15; // L: 151 } } - var1 = readBits(8) + 1; - VorbisSample_codebooks = new VorbisCodebook[var1]; + var1 = readBits(8) + 1; // L: 154 + VorbisSample_codebooks = new VorbisCodebook[var1]; // L: 155 - for (var2 = 0; var2 < var1; ++var2) { + for (var2 = 0; var2 < var1; ++var2) { // L: 156 VorbisSample_codebooks[var2] = new VorbisCodebook(); } - var2 = readBits(6) + 1; + var2 = readBits(6) + 1; // L: 158 - for (var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { // L: 159 readBits(16); } - var2 = readBits(6) + 1; - VorbisSample_floors = new VorbisFloor[var2]; + var2 = readBits(6) + 1; // L: 161 + VorbisSample_floors = new VorbisFloor[var2]; // L: 162 - for (var3 = 0; var3 < var2; ++var3) { + for (var3 = 0; var3 < var2; ++var3) { // L: 163 VorbisSample_floors[var3] = new VorbisFloor(); } - var3 = readBits(6) + 1; - VorbisSample_residues = new VorbisResidue[var3]; + var3 = readBits(6) + 1; // L: 164 + VorbisSample_residues = new VorbisResidue[var3]; // L: 165 - for (var4 = 0; var4 < var3; ++var4) { + for (var4 = 0; var4 < var3; ++var4) { // L: 166 VorbisSample_residues[var4] = new VorbisResidue(); } - var4 = readBits(6) + 1; - VorbisSample_mappings = new VorbisMapping[var4]; + var4 = readBits(6) + 1; // L: 167 + VorbisSample_mappings = new VorbisMapping[var4]; // L: 168 - for (var5 = 0; var5 < var4; ++var5) { + for (var5 = 0; var5 < var4; ++var5) { // L: 169 VorbisSample_mappings[var5] = new VorbisMapping(); } - var5 = readBits(6) + 1; - VorbisSample_blockFlags = new boolean[var5]; - VorbisSample_mapping = new int[var5]; + var5 = readBits(6) + 1; // L: 170 + VorbisSample_blockFlags = new boolean[var5]; // L: 171 + VorbisSample_mapping = new int[var5]; // L: 172 - for (int var15 = 0; var15 < var5; ++var15) { - VorbisSample_blockFlags[var15] = readBit() != 0; - readBits(16); - readBits(16); - VorbisSample_mapping[var15] = readBits(8); + for (int var6 = 0; var6 < var5; ++var6) { // L: 173 + VorbisSample_blockFlags[var6] = readBit() != 0; // L: 174 + readBits(16); // L: 175 + readBits(16); // L: 176 + VorbisSample_mapping[var6] = readBits(8); // L: 177 } - } + } // L: 179 - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(Lic;)Z" ) - static boolean method2500(AbstractArchive var0) { - if (!field1416) { - byte[] var1 = var0.takeFile(0, 0); - if (var1 == null) { + static boolean method2468(AbstractArchive var0) { + if (!field1410) { // L: 381 + byte[] var1 = var0.takeFile(0, 0); // L: 382 + if (var1 == null) { // L: 383 return false; } - method2508(var1); - field1416 = true; + method2466(var1); // L: 384 + field1410 = true; // L: 385 } - return true; + return true; // L: 387 } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lic;II)Ldi;" + descriptor = "(Lic;II)Ldk;" ) @Export("readMusicSample") static VorbisSample readMusicSample(AbstractArchive var0, int var1, int var2) { - if (!method2500(var0)) { - var0.tryLoadFile(var1, var2); - return null; + if (!method2468(var0)) { // L: 391 + var0.tryLoadFile(var1, var2); // L: 392 + return null; // L: 393 } else { - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new VorbisSample(var3); + byte[] var3 = var0.takeFile(var1, var2); // L: 395 + return var3 == null ? null : new VorbisSample(var3); // L: 396 } } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 7e18d29a7a..a6829499a2 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -4,174 +4,97 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ep") +@ObfuscatedName("ex") @Implements("WallDecoration") public final class WallDecoration { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1099689565 - ) - @Export("tileHeight") - int tileHeight; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = 1128423733 - ) - @Export("x") - int x; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -242275183 - ) - @Export("y") - int y; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 255410517 + intValue = 1170791361 ) @Export("orientation") int orientation; - @ObfuscatedName("p") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1472318581 + intValue = 85116123 + ) + @Export("tileHeight") + int tileHeight; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 841011539 + ) + @Export("x") + int x; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 321574291 + ) + @Export("y") + int y; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -429102155 ) @Export("orientation2") int orientation2; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 96520519 + intValue = -978448895 ) @Export("xOffset") int xOffset; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -752151105 + intValue = 2017479075 ) @Export("yOffset") int yOffset; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lez;" ) @Export("entity1") public Entity entity1; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "Lel;" + descriptor = "Lez;" ) @Export("entity2") public Entity entity2; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - longValue = 7567781693564802897L + longValue = -8703832368131294063L ) @Export("tag") public long tag; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1087358253 + intValue = -2069520015 ) @Export("flags") int flags; WallDecoration() { - this.tag = 0L; - this.flags = 0; - } + this.tag = 0L; // L: 13 + this.flags = 0; // L: 14 + } // L: 16 - @ObfuscatedName("fu") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "764201281" + descriptor = "(I)V", + garbageValue = "-807916273" ) - @Export("doCheat") - static final void doCheat(String var0) { - if (var0.equalsIgnoreCase("toggleroof")) { - NetSocket.clientPreferences.roofsHidden = !NetSocket.clientPreferences.roofsHidden; - SpriteMask.savePreferences(); - if (NetSocket.clientPreferences.roofsHidden) { - ObjectSound.addGameMessage(99, "", "Roofs are now all hidden"); - } else { - ObjectSound.addGameMessage(99, "", "Roofs will only be removed selectively"); - } + public static void method3409() { + synchronized(MouseHandler.MouseHandler_instance) { // L: 58 + MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButtonVolatile; // L: 59 + MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_xVolatile; // L: 60 + MouseHandler.MouseHandler_y = MouseHandler.MouseHandler_yVolatile; // L: 61 + MouseHandler.MouseHandler_millis = MouseHandler.MouseHandler_lastMovedVolatile; // L: 62 + MouseHandler.MouseHandler_lastButton = MouseHandler.MouseHandler_lastButtonVolatile; // L: 63 + MouseHandler.MouseHandler_lastPressedX = MouseHandler.MouseHandler_lastPressedXVolatile; // L: 64 + MouseHandler.MouseHandler_lastPressedY = MouseHandler.MouseHandler_lastPressedYVolatile; // L: 65 + MouseHandler.MouseHandler_lastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillisVolatile; // L: 66 + MouseHandler.MouseHandler_lastButtonVolatile = 0; // L: 67 } - - if (var0.equalsIgnoreCase("displayfps")) { - Client.displayFps = !Client.displayFps; - } - - if (var0.equalsIgnoreCase("renderself")) { - Client.renderSelf = !Client.renderSelf; - } - - if (var0.equalsIgnoreCase("mouseovertext")) { - Client.showMouseOverText = !Client.showMouseOverText; - } - - if (Client.staffModLevel >= 2) { - if (var0.equalsIgnoreCase("errortest")) { - throw new RuntimeException(); - } - - if (var0.equalsIgnoreCase("showcoord")) { - class228.worldMap.showCoord = !class228.worldMap.showCoord; - } - - if (var0.equalsIgnoreCase("fpson")) { - Client.displayFps = true; - } - - if (var0.equalsIgnoreCase("fpsoff")) { - Client.displayFps = false; - } - - if (var0.equalsIgnoreCase("gc")) { - System.gc(); - } - - if (var0.equalsIgnoreCase("clientdrop")) { - CollisionMap.method3707(); - } - } - - PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2268, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(var0.length() + 1); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); - } - - @ObfuscatedName("ir") - @ObfuscatedSignature( - descriptor = "(Lhd;Ljo;IIZI)V", - garbageValue = "-771039466" - ) - @Export("addWidgetItemMenuItem") - static final void addWidgetItemMenuItem(Widget widget, ItemDefinition itemDef, int slotIdx, int actionIdx, boolean forceLeftClick) { - String[] itemActions = itemDef.inventoryActions; - byte opcode = -1; - String action = null; - if (itemActions != null && itemActions[actionIdx] != null) { - if (actionIdx == 0) { - opcode = 33; - } else if (actionIdx == 1) { - opcode = 34; - } else if (actionIdx == 2) { - opcode = 35; - } else if (actionIdx == 3) { - opcode = 36; - } else { - opcode = 37; - } - - action = itemActions[actionIdx]; - } else if (actionIdx == 4) { - opcode = 37; - action = "Drop"; - } - - if (opcode != -1 && action != null) { - ApproximateRouteStrategy.insertMenuItem(action, ItemContainer.colorStartTag(16748608) + itemDef.name, opcode, itemDef.id, slotIdx, widget.id, forceLeftClick); - } - - } + } // L: 69 } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 5f8e7c17cf..70ee656a33 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1,548 +1,555 @@ +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hd") +@ObfuscatedName("hq") @Implements("Widget") public class Widget extends Node { - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "[[Lhd;" + descriptor = "[[Lhq;" ) @Export("Widget_interfaceComponents") public static Widget[][] Widget_interfaceComponents; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("Widget_archive") - static AbstractArchive Widget_archive; - @ObfuscatedName("c") + public static AbstractArchive Widget_archive; + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lic;" + ) + @Export("Widget_modelsArchive") + public static AbstractArchive Widget_modelsArchive; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lel;" ) @Export("Widget_cachedSprites") static EvictingDualNodeHashTable Widget_cachedSprites; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("Widget_cachedModels") static EvictingDualNodeHashTable Widget_cachedModels; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("Widget_cachedFonts") static EvictingDualNodeHashTable Widget_cachedFonts; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("Widget_cachedSpriteMasks") static EvictingDualNodeHashTable Widget_cachedSpriteMasks; - @ObfuscatedName("s") - public static boolean field2600; - @ObfuscatedName("v") + @ObfuscatedName("f") + public static boolean field2611; + @ObfuscatedName("y") @Export("isIf3") public boolean isIf3; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1532053467 + intValue = 1189552295 ) @Export("id") public int id; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedGetter( - intValue = 94060767 + intValue = -1997993253 ) @Export("childIndex") public int childIndex; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedGetter( - intValue = 1914677931 + intValue = -531389959 ) @Export("type") public int type; - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = 650107535 + intValue = -271172565 ) @Export("buttonType") public int buttonType; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = 1929640649 + intValue = -784599883 ) @Export("contentType") public int contentType; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = 671987209 + intValue = -160427093 ) @Export("xAlignment") public int xAlignment; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -1358214717 + intValue = 1846560629 ) @Export("yAlignment") public int yAlignment; - @ObfuscatedName("f") + @ObfuscatedName("e") @ObfuscatedGetter( - intValue = 1288389301 + intValue = 84465573 ) @Export("widthAlignment") public int widthAlignment; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @ObfuscatedGetter( - intValue = 147496779 + intValue = 1226090749 ) @Export("heightAlignment") public int heightAlignment; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = -108757037 + intValue = -2088624487 ) @Export("rawX") public int rawX; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -1114050541 + intValue = 1233836267 ) @Export("rawY") public int rawY; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -426293773 + intValue = 1843073905 ) @Export("rawWidth") public int rawWidth; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = 1314381509 + intValue = -1879271747 ) @Export("rawHeight") public int rawHeight; - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 1103460101 + intValue = -1517732015 ) @Export("x") public int x; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = 102959843 + intValue = 256308969 ) @Export("y") public int y; - @ObfuscatedName("am") + @ObfuscatedName("au") @ObfuscatedGetter( - intValue = -75340697 + intValue = 1613274363 ) @Export("width") public int width; - @ObfuscatedName("ak") + @ObfuscatedName("aa") @ObfuscatedGetter( - intValue = -2125257181 + intValue = 1991496335 ) @Export("height") public int height; - @ObfuscatedName("ad") - @ObfuscatedGetter( - intValue = -30981469 - ) - public int field2741; - @ObfuscatedName("as") - @ObfuscatedGetter( - intValue = -1536699571 - ) - public int field2641; @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1118896329 + intValue = -1488324875 + ) + public int field2622; + @ObfuscatedName("at") + @ObfuscatedGetter( + intValue = -1765523627 + ) + public int field2623; + @ObfuscatedName("aq") + @ObfuscatedGetter( + intValue = 1948885583 ) @Export("parentId") public int parentId; - @ObfuscatedName("ap") + @ObfuscatedName("al") @Export("isHidden") public boolean isHidden; - @ObfuscatedName("al") + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = 1010580353 + intValue = -1183715667 ) @Export("scrollX") public int scrollX; - @ObfuscatedName("an") + @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 1724100971 + intValue = -699502093 ) @Export("scrollY") public int scrollY; - @ObfuscatedName("ac") + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 1772823043 + intValue = -1556531767 ) @Export("scrollWidth") public int scrollWidth; - @ObfuscatedName("av") + @ObfuscatedName("as") @ObfuscatedGetter( - intValue = -519746393 + intValue = 1626628049 ) @Export("scrollHeight") public int scrollHeight; - @ObfuscatedName("af") + @ObfuscatedName("az") @ObfuscatedGetter( - intValue = -1542653287 + intValue = 1201601061 ) @Export("color") public int color; - @ObfuscatedName("at") + @ObfuscatedName("ad") @ObfuscatedGetter( - intValue = -2094712983 + intValue = -1272515191 ) @Export("color2") public int color2; - @ObfuscatedName("aa") + @ObfuscatedName("ai") @ObfuscatedGetter( - intValue = -583623665 + intValue = -5591483 ) @Export("mouseOverColor") public int mouseOverColor; - @ObfuscatedName("aw") + @ObfuscatedName("ay") @ObfuscatedGetter( - intValue = 1750494175 + intValue = 1367295317 ) @Export("mouseOverColor2") public int mouseOverColor2; - @ObfuscatedName("az") + @ObfuscatedName("aj") @Export("fill") public boolean fill; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @ObfuscatedSignature( - descriptor = "Llw;" + descriptor = "Llm;" ) @Export("fillMode") - public class332 fillMode; - @ObfuscatedName("ay") + public FillMode fillMode; + @ObfuscatedName("af") @ObfuscatedGetter( - intValue = 374007217 + intValue = 955254737 ) @Export("transparencyTop") public int transparencyTop; - @ObfuscatedName("au") + @ObfuscatedName("ak") @ObfuscatedGetter( - intValue = -1124278239 + intValue = 1148839493 ) @Export("transparencyBot") public int transparencyBot; - @ObfuscatedName("aj") + @ObfuscatedName("ac") @ObfuscatedGetter( - intValue = 1598998121 + intValue = -1328949873 ) @Export("lineWid") public int lineWid; - @ObfuscatedName("bk") - public boolean field2633; - @ObfuscatedName("bh") + @ObfuscatedName("bl") + public boolean field2639; + @ObfuscatedName("bc") @ObfuscatedGetter( - intValue = -26976881 + intValue = -1969239081 ) @Export("spriteId2") public int spriteId2; - @ObfuscatedName("bg") + @ObfuscatedName("bz") @ObfuscatedGetter( - intValue = 735913065 + intValue = -250118287 ) @Export("spriteId") public int spriteId; - @ObfuscatedName("be") + @ObfuscatedName("bj") @ObfuscatedGetter( - intValue = -1395543785 + intValue = -237364125 ) @Export("spriteAngle") public int spriteAngle; - @ObfuscatedName("bf") + @ObfuscatedName("bh") @Export("spriteTiling") public boolean spriteTiling; - @ObfuscatedName("ba") + @ObfuscatedName("bi") @ObfuscatedGetter( - intValue = 1014909581 + intValue = -1634007559 ) @Export("outline") public int outline; - @ObfuscatedName("bd") + @ObfuscatedName("bg") @ObfuscatedGetter( - intValue = 511945889 + intValue = 1037474535 ) @Export("spriteShadow") public int spriteShadow; - @ObfuscatedName("bb") + @ObfuscatedName("br") @Export("spriteFlipV") public boolean spriteFlipV; - @ObfuscatedName("bw") + @ObfuscatedName("bp") @Export("spriteFlipH") public boolean spriteFlipH; - @ObfuscatedName("bq") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 2063868425 + intValue = 1324605985 ) @Export("modelType") public int modelType; - @ObfuscatedName("bn") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = 2132248089 + intValue = 734022747 ) @Export("modelId") public int modelId; - @ObfuscatedName("bc") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 1137051425 + intValue = 1986373533 ) @Export("modelType2") int modelType2; - @ObfuscatedName("bo") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -2115206777 + intValue = -651946363 ) @Export("modelId2") int modelId2; - @ObfuscatedName("bp") + @ObfuscatedName("ba") @ObfuscatedGetter( - intValue = -1819802445 + intValue = 1530355915 ) @Export("sequenceId") public int sequenceId; @ObfuscatedName("bm") @ObfuscatedGetter( - intValue = -1542616685 + intValue = 1814107681 ) @Export("sequenceId2") public int sequenceId2; - @ObfuscatedName("bl") + @ObfuscatedName("bd") @ObfuscatedGetter( - intValue = 775491195 + intValue = 1684215659 ) @Export("modelOffsetX") public int modelOffsetX; - @ObfuscatedName("bv") + @ObfuscatedName("bb") @ObfuscatedGetter( - intValue = 1987076219 + intValue = -2011277719 ) @Export("modelOffsetY") public int modelOffsetY; - @ObfuscatedName("bi") + @ObfuscatedName("bx") @ObfuscatedGetter( - intValue = -1572125175 + intValue = -1767129155 ) @Export("modelAngleX") public int modelAngleX; - @ObfuscatedName("bz") + @ObfuscatedName("bq") @ObfuscatedGetter( - intValue = -34840117 + intValue = 21691605 ) @Export("modelAngleY") public int modelAngleY; - @ObfuscatedName("bu") + @ObfuscatedName("by") @ObfuscatedGetter( - intValue = 1647170417 + intValue = 1295427891 ) @Export("modelAngleZ") public int modelAngleZ; - @ObfuscatedName("bx") + @ObfuscatedName("bo") @ObfuscatedGetter( - intValue = 433394219 + intValue = 1679520267 ) @Export("modelZoom") public int modelZoom; - @ObfuscatedName("br") + @ObfuscatedName("bk") @ObfuscatedGetter( - intValue = -2079945959 + intValue = 1534988333 ) - public int field2657; - @ObfuscatedName("bs") + public int field2728; + @ObfuscatedName("bv") @ObfuscatedGetter( - intValue = 295500307 + intValue = 1067909943 ) - public int field2658; - @ObfuscatedName("by") + public int field2633; + @ObfuscatedName("bf") @Export("modelOrthog") public boolean modelOrthog; - @ObfuscatedName("bj") + @ObfuscatedName("bt") @Export("modelTransparency") public boolean modelTransparency; - @ObfuscatedName("bt") + @ObfuscatedName("bs") @ObfuscatedGetter( - intValue = 904576921 + intValue = 1750770011 ) @Export("itemQuantityMode") public int itemQuantityMode; - @ObfuscatedName("cc") + @ObfuscatedName("cg") @ObfuscatedGetter( - intValue = -732516347 + intValue = 228754721 ) @Export("fontId") public int fontId; - @ObfuscatedName("cb") + @ObfuscatedName("ca") @Export("text") public String text; - @ObfuscatedName("ch") + @ObfuscatedName("ct") @Export("text2") public String text2; - @ObfuscatedName("cw") + @ObfuscatedName("cv") @ObfuscatedGetter( - intValue = 1932808517 + intValue = 22170567 ) @Export("textLineHeight") public int textLineHeight; - @ObfuscatedName("cz") + @ObfuscatedName("ce") @ObfuscatedGetter( - intValue = -1100910863 + intValue = 372737821 ) @Export("textXAlignment") public int textXAlignment; - @ObfuscatedName("cg") + @ObfuscatedName("cr") @ObfuscatedGetter( - intValue = -1006232377 + intValue = 188319241 ) @Export("textYAlignment") public int textYAlignment; @ObfuscatedName("cn") @Export("textShadowed") public boolean textShadowed; - @ObfuscatedName("ce") + @ObfuscatedName("ci") @ObfuscatedGetter( - intValue = -1719700201 + intValue = 1239558509 ) @Export("paddingX") public int paddingX; - @ObfuscatedName("cj") + @ObfuscatedName("cm") @ObfuscatedGetter( - intValue = -895052993 + intValue = 684939999 ) @Export("paddingY") public int paddingY; - @ObfuscatedName("ck") + @ObfuscatedName("cu") @Export("inventoryXOffsets") public int[] inventoryXOffsets; - @ObfuscatedName("cv") + @ObfuscatedName("cw") @Export("inventoryYOffsets") public int[] inventoryYOffsets; - @ObfuscatedName("cp") + @ObfuscatedName("cq") @Export("inventorySprites") public int[] inventorySprites; - @ObfuscatedName("ci") + @ObfuscatedName("cc") @Export("itemActions") public String[] itemActions; - @ObfuscatedName("cu") + @ObfuscatedName("cf") @ObfuscatedGetter( - intValue = 1451565177 + intValue = 1387630371 ) @Export("flags") public int flags; - @ObfuscatedName("cq") - public boolean field2709; - @ObfuscatedName("co") - public byte[][] field2647; - @ObfuscatedName("ca") - public byte[][] field2678; + @ObfuscatedName("cj") + public boolean field2676; @ObfuscatedName("cd") - public int[] field2679; - @ObfuscatedName("cy") - public int[] field2680; + public byte[][] field2626; + @ObfuscatedName("cx") + public byte[][] field2719; + @ObfuscatedName("ck") + public int[] field2682; + @ObfuscatedName("co") + public int[] field2683; @ObfuscatedName("dx") @Export("dataText") public String dataText; - @ObfuscatedName("dw") + @ObfuscatedName("dq") @Export("actions") public String[] actions; - @ObfuscatedName("dm") + @ObfuscatedName("dv") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lhq;" ) @Export("parent") public Widget parent; - @ObfuscatedName("dd") + @ObfuscatedName("dh") @ObfuscatedGetter( - intValue = -730835665 + intValue = -1668184029 ) @Export("dragZoneSize") public int dragZoneSize; - @ObfuscatedName("dh") + @ObfuscatedName("dd") @ObfuscatedGetter( - intValue = 2091861089 + intValue = -1282838075 ) @Export("dragThreshold") public int dragThreshold; - @ObfuscatedName("dl") + @ObfuscatedName("db") @Export("isScrollBar") public boolean isScrollBar; - @ObfuscatedName("dr") + @ObfuscatedName("dj") @Export("spellActionName") public String spellActionName; - @ObfuscatedName("di") + @ObfuscatedName("dk") @Export("hasListener") public boolean hasListener; - @ObfuscatedName("dp") + @ObfuscatedName("de") @Export("onLoad") public Object[] onLoad; - @ObfuscatedName("dc") + @ObfuscatedName("da") @Export("onClick") public Object[] onClick; - @ObfuscatedName("dt") + @ObfuscatedName("dr") @Export("onClickRepeat") public Object[] onClickRepeat; - @ObfuscatedName("ds") + @ObfuscatedName("dw") @Export("onRelease") public Object[] onRelease; - @ObfuscatedName("dg") + @ObfuscatedName("dy") @Export("onHold") public Object[] onHold; - @ObfuscatedName("do") + @ObfuscatedName("ds") @Export("onMouseOver") public Object[] onMouseOver; - @ObfuscatedName("dn") + @ObfuscatedName("dl") @Export("onMouseRepeat") public Object[] onMouseRepeat; - @ObfuscatedName("db") + @ObfuscatedName("di") @Export("onMouseLeave") public Object[] onMouseLeave; - @ObfuscatedName("de") + @ObfuscatedName("do") @Export("onDrag") public Object[] onDrag; - @ObfuscatedName("dv") + @ObfuscatedName("df") @Export("onDragComplete") public Object[] onDragComplete; - @ObfuscatedName("dk") + @ObfuscatedName("dm") @Export("onTargetEnter") public Object[] onTargetEnter; - @ObfuscatedName("da") + @ObfuscatedName("du") @Export("onTargetLeave") public Object[] onTargetLeave; - @ObfuscatedName("df") + @ObfuscatedName("dc") @Export("onVarTransmit") public Object[] onVarTransmit; - @ObfuscatedName("dz") + @ObfuscatedName("dn") @Export("varTransmitTriggers") public int[] varTransmitTriggers; - @ObfuscatedName("dq") + @ObfuscatedName("dz") @Export("onInvTransmit") public Object[] onInvTransmit; - @ObfuscatedName("dy") + @ObfuscatedName("dp") @Export("invTransmitTriggers") public int[] invTransmitTriggers; - @ObfuscatedName("du") + @ObfuscatedName("dt") @Export("onStatTransmit") public Object[] onStatTransmit; - @ObfuscatedName("dj") + @ObfuscatedName("dg") @Export("statTransmitTriggers") public int[] statTransmitTriggers; - @ObfuscatedName("ek") + @ObfuscatedName("ee") @Export("onTimer") public Object[] onTimer; - @ObfuscatedName("ej") + @ObfuscatedName("en") @Export("onOp") public Object[] onOp; @ObfuscatedName("eu") @@ -554,45 +561,45 @@ public class Widget extends Node { @ObfuscatedName("es") @Export("onKey") public Object[] onKey; - @ObfuscatedName("ea") + @ObfuscatedName("ek") @Export("onFriendTransmit") public Object[] onFriendTransmit; - @ObfuscatedName("ef") + @ObfuscatedName("er") @Export("onClanTransmit") public Object[] onClanTransmit; - @ObfuscatedName("ei") + @ObfuscatedName("ep") @Export("onMiscTransmit") public Object[] onMiscTransmit; - @ObfuscatedName("et") + @ObfuscatedName("eg") @Export("onDialogAbort") public Object[] onDialogAbort; @ObfuscatedName("eq") @Export("onSubChange") public Object[] onSubChange; - @ObfuscatedName("ex") + @ObfuscatedName("em") @Export("onResize") public Object[] onResize; - @ObfuscatedName("er") + @ObfuscatedName("eh") @Export("onStockTransmit") public Object[] onStockTransmit; - @ObfuscatedName("em") - public Object[] field2719; - @ObfuscatedName("en") + @ObfuscatedName("ec") + public Object[] field2722; + @ObfuscatedName("ej") @Export("cs1Instructions") public int[][] cs1Instructions; - @ObfuscatedName("el") + @ObfuscatedName("ez") @Export("cs1Comparisons") public int[] cs1Comparisons; - @ObfuscatedName("ez") + @ObfuscatedName("eb") @Export("cs1ComparisonValues") public int[] cs1ComparisonValues; - @ObfuscatedName("ed") + @ObfuscatedName("et") @ObfuscatedGetter( - intValue = -1020277937 + intValue = -1041425319 ) @Export("mouseOverRedirect") public int mouseOverRedirect; - @ObfuscatedName("eg") + @ObfuscatedName("ef") @Export("spellName") public String spellName; @ObfuscatedName("ey") @@ -601,212 +608,212 @@ public class Widget extends Node { @ObfuscatedName("ew") @Export("itemIds") public int[] itemIds; - @ObfuscatedName("ep") + @ObfuscatedName("ex") @Export("itemQuantities") public int[] itemQuantities; - @ObfuscatedName("ev") + @ObfuscatedName("ed") @ObfuscatedGetter( - intValue = -2118409911 + intValue = -419140007 ) @Export("itemId") public int itemId; - @ObfuscatedName("eh") + @ObfuscatedName("ev") @ObfuscatedGetter( - intValue = 488452853 + intValue = -239895029 ) @Export("itemQuantity") public int itemQuantity; - @ObfuscatedName("eb") + @ObfuscatedName("ei") @ObfuscatedGetter( - intValue = 1121550345 + intValue = -844392783 ) @Export("modelFrame") public int modelFrame; - @ObfuscatedName("ec") + @ObfuscatedName("el") @ObfuscatedGetter( - intValue = 404689141 + intValue = -450327171 ) @Export("modelFrameCycle") public int modelFrameCycle; - @ObfuscatedName("ee") + @ObfuscatedName("ea") @ObfuscatedSignature( - descriptor = "[Lhd;" + descriptor = "[Lhq;" ) @Export("children") public Widget[] children; - @ObfuscatedName("fe") + @ObfuscatedName("fq") @Export("containsMouse") public boolean containsMouse; - @ObfuscatedName("fi") + @ObfuscatedName("fx") @Export("isClicked") public boolean isClicked; - @ObfuscatedName("fr") - @ObfuscatedGetter( - intValue = -1318677179 - ) - public int field2735; - @ObfuscatedName("fd") - @ObfuscatedGetter( - intValue = 1691925671 - ) - public int field2736; - @ObfuscatedName("fc") - @ObfuscatedGetter( - intValue = 717903213 - ) - public int field2643; - @ObfuscatedName("ft") - @ObfuscatedGetter( - intValue = 989290657 - ) - public int field2721; @ObfuscatedName("fp") @ObfuscatedGetter( - intValue = -775158901 + intValue = -1974330189 + ) + public int field2664; + @ObfuscatedName("fj") + @ObfuscatedGetter( + intValue = 786737003 + ) + public int field2618; + @ObfuscatedName("fs") + @ObfuscatedGetter( + intValue = 421837705 + ) + public int field2727; + @ObfuscatedName("fv") + @ObfuscatedGetter( + intValue = 1990354289 + ) + public int field2681; + @ObfuscatedName("fz") + @ObfuscatedGetter( + intValue = -390238451 ) @Export("rootIndex") public int rootIndex; - @ObfuscatedName("fq") + @ObfuscatedName("fk") @ObfuscatedGetter( - intValue = -1023305039 + intValue = 1135189541 ) @Export("cycle") public int cycle; - @ObfuscatedName("fk") - public int[] field2723; - @ObfuscatedName("fx") + @ObfuscatedName("fe") + public int[] field2661; + @ObfuscatedName("fb") @Export("noClickThrough") public boolean noClickThrough; - @ObfuscatedName("fy") + @ObfuscatedName("fc") @Export("noScrollThrough") public boolean noScrollThrough; - @ObfuscatedName("fn") + @ObfuscatedName("fm") @Export("prioritizeMenuEntry") public boolean prioritizeMenuEntry; static { - Widget_cachedSprites = new EvictingDualNodeHashTable(200); - Widget_cachedModels = new EvictingDualNodeHashTable(50); - Widget_cachedFonts = new EvictingDualNodeHashTable(20); - Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); - field2600 = false; + Widget_cachedSprites = new EvictingDualNodeHashTable(200); // L: 31 + Widget_cachedModels = new EvictingDualNodeHashTable(50); // L: 32 + Widget_cachedFonts = new EvictingDualNodeHashTable(20); // L: 33 + Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8); // L: 34 + field2611 = false; // L: 35 } public Widget() { - this.isIf3 = false; - this.id = -1; - this.childIndex = -1; - this.buttonType = 0; - this.contentType = 0; - this.xAlignment = 0; - this.yAlignment = 0; - this.widthAlignment = 0; - this.heightAlignment = 0; - this.rawX = 0; - this.rawY = 0; - this.rawWidth = 0; - this.rawHeight = 0; - this.x = 0; - this.y = 0; - this.width = 0; - this.height = 0; - this.field2741 = 1; - this.field2641 = 1; - this.parentId = -1; - this.isHidden = false; - this.scrollX = 0; - this.scrollY = 0; - this.scrollWidth = 0; - this.scrollHeight = 0; - this.color = 0; - this.color2 = 0; - this.mouseOverColor = 0; - this.mouseOverColor2 = 0; - this.fill = false; - this.fillMode = class332.SOLID; - this.transparencyTop = 0; - this.transparencyBot = 0; - this.lineWid = 1; - this.field2633 = false; - this.spriteId2 = -1; - this.spriteId = -1; - this.spriteAngle = 0; - this.spriteTiling = false; - this.outline = 0; - this.spriteShadow = 0; - this.modelType = 1; - this.modelId = -1; - this.modelType2 = 1; - this.modelId2 = -1; - this.sequenceId = -1; - this.sequenceId2 = -1; - this.modelOffsetX = 0; - this.modelOffsetY = 0; - this.modelAngleX = 0; - this.modelAngleY = 0; - this.modelAngleZ = 0; - this.modelZoom = 100; - this.field2657 = 0; - this.field2658 = 0; - this.modelOrthog = false; - this.modelTransparency = false; - this.itemQuantityMode = 2; - this.fontId = -1; - this.text = ""; - this.text2 = ""; - this.textLineHeight = 0; - this.textXAlignment = 0; - this.textYAlignment = 0; - this.textShadowed = false; - this.paddingX = 0; - this.paddingY = 0; - this.flags = 0; - this.field2709 = false; - this.dataText = ""; - this.parent = null; - this.dragZoneSize = 0; - this.dragThreshold = 0; - this.isScrollBar = false; - this.spellActionName = ""; - this.hasListener = false; - this.mouseOverRedirect = -1; - this.spellName = ""; - this.buttonText = "Ok"; - this.itemId = -1; - this.itemQuantity = 0; - this.modelFrame = 0; - this.modelFrameCycle = 0; - this.containsMouse = false; - this.isClicked = false; - this.field2735 = -1; - this.field2736 = 0; - this.field2643 = 0; - this.field2721 = 0; - this.rootIndex = -1; - this.cycle = -1; - this.noClickThrough = false; - this.noScrollThrough = false; - this.prioritizeMenuEntry = false; - } + this.isIf3 = false; // L: 36 + this.id = -1; // L: 37 + this.childIndex = -1; // L: 38 + this.buttonType = 0; // L: 40 + this.contentType = 0; // L: 41 + this.xAlignment = 0; // L: 42 + this.yAlignment = 0; // L: 43 + this.widthAlignment = 0; // L: 44 + this.heightAlignment = 0; // L: 45 + this.rawX = 0; // L: 46 + this.rawY = 0; // L: 47 + this.rawWidth = 0; // L: 48 + this.rawHeight = 0; // L: 49 + this.x = 0; // L: 50 + this.y = 0; // L: 51 + this.width = 0; // L: 52 + this.height = 0; // L: 53 + this.field2622 = 1; // L: 54 + this.field2623 = 1; // L: 55 + this.parentId = -1; // L: 56 + this.isHidden = false; // L: 57 + this.scrollX = 0; // L: 58 + this.scrollY = 0; // L: 59 + this.scrollWidth = 0; // L: 60 + this.scrollHeight = 0; // L: 61 + this.color = 0; // L: 62 + this.color2 = 0; // L: 63 + this.mouseOverColor = 0; // L: 64 + this.mouseOverColor2 = 0; // L: 65 + this.fill = false; // L: 66 + this.fillMode = FillMode.SOLID; // L: 67 + this.transparencyTop = 0; // L: 68 + this.transparencyBot = 0; // L: 69 + this.lineWid = 1; // L: 70 + this.field2639 = false; // L: 71 + this.spriteId2 = -1; // L: 72 + this.spriteId = -1; // L: 73 + this.spriteAngle = 0; // L: 74 + this.spriteTiling = false; // L: 75 + this.outline = 0; // L: 76 + this.spriteShadow = 0; // L: 77 + this.modelType = 1; // L: 80 + this.modelId = -1; // L: 81 + this.modelType2 = 1; // L: 82 + this.modelId2 = -1; // L: 83 + this.sequenceId = -1; // L: 84 + this.sequenceId2 = -1; // L: 85 + this.modelOffsetX = 0; // L: 86 + this.modelOffsetY = 0; // L: 87 + this.modelAngleX = 0; // L: 88 + this.modelAngleY = 0; // L: 89 + this.modelAngleZ = 0; // L: 90 + this.modelZoom = 100; // L: 91 + this.field2728 = 0; // L: 92 + this.field2633 = 0; // L: 93 + this.modelOrthog = false; // L: 94 + this.modelTransparency = false; // L: 95 + this.itemQuantityMode = 2; // L: 96 + this.fontId = -1; // L: 97 + this.text = ""; // L: 98 + this.text2 = ""; // L: 99 + this.textLineHeight = 0; // L: 100 + this.textXAlignment = 0; // L: 101 + this.textYAlignment = 0; // L: 102 + this.textShadowed = false; // L: 103 + this.paddingX = 0; // L: 104 + this.paddingY = 0; // L: 105 + this.flags = 0; // L: 110 + this.field2676 = false; // L: 111 + this.dataText = ""; // L: 120 + this.parent = null; // L: 122 + this.dragZoneSize = 0; // L: 123 + this.dragThreshold = 0; // L: 124 + this.isScrollBar = false; // L: 125 + this.spellActionName = ""; // L: 126 + this.hasListener = false; // L: 127 + this.mouseOverRedirect = -1; // L: 162 + this.spellName = ""; // L: 163 + this.buttonText = "Ok"; // L: 164 + this.itemId = -1; // L: 167 + this.itemQuantity = 0; // L: 168 + this.modelFrame = 0; // L: 169 + this.modelFrameCycle = 0; // L: 170 + this.containsMouse = false; // L: 172 + this.isClicked = false; // L: 173 + this.field2664 = -1; // L: 174 + this.field2618 = 0; // L: 175 + this.field2727 = 0; // L: 176 + this.field2681 = 0; // L: 177 + this.rootIndex = -1; // L: 178 + this.cycle = -1; // L: 179 + this.noClickThrough = false; // L: 181 + this.noScrollThrough = false; // L: 182 + this.prioritizeMenuEntry = false; // L: 183 + } // L: 705 - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Lkn;S)V", - garbageValue = "27305" + descriptor = "(Lkf;B)V", + garbageValue = "-56" ) @Export("decodeLegacy") void decodeLegacy(Buffer var1) { this.isIf3 = false; - this.type = var1.readUnsignedByte(); - this.buttonType = var1.readUnsignedByte(); - this.contentType = var1.readUnsignedShort(); + this.type = var1.readUnsignedByte(); // L: 244 + this.buttonType = var1.readUnsignedByte(); // L: 245 + this.contentType = var1.readUnsignedShort(); // L: 246 this.rawX = var1.readShort(); - this.rawY = var1.readShort(); + this.rawY = var1.readShort(); // L: 248 this.rawWidth = var1.readUnsignedShort(); this.rawHeight = var1.readUnsignedShort(); this.transparencyTop = var1.readUnsignedByte(); - this.parentId = var1.readUnsignedShort(); - if (this.parentId == 65535) { + this.parentId = var1.readUnsignedShort(); // L: 252 + if (this.parentId == 65535) { // L: 253 this.parentId = -1; } else { this.parentId += this.id & -65536; @@ -817,9 +824,9 @@ public class Widget extends Node { this.mouseOverRedirect = -1; } - int var2 = var1.readUnsignedByte(); + int var2 = var1.readUnsignedByte(); // L: 257 int var3; - if (var2 > 0) { + if (var2 > 0) { // L: 258 this.cs1Comparisons = new int[var2]; this.cs1ComparisonValues = new int[var2]; @@ -836,532 +843,532 @@ public class Widget extends Node { if (var3 > 0) { this.cs1Instructions = new int[var3][]; - for (var4 = 0; var4 < var3; ++var4) { - var5 = var1.readUnsignedShort(); - this.cs1Instructions[var4] = new int[var5]; + for (var4 = 0; var4 < var3; ++var4) { // L: 269 + var5 = var1.readUnsignedShort(); // L: 270 + this.cs1Instructions[var4] = new int[var5]; // L: 271 - for (var6 = 0; var6 < var5; ++var6) { - this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); - if (this.cs1Instructions[var4][var6] == 65535) { + for (var6 = 0; var6 < var5; ++var6) { // L: 272 + this.cs1Instructions[var4][var6] = var1.readUnsignedShort(); // L: 273 + if (this.cs1Instructions[var4][var6] == 65535) { // L: 274 this.cs1Instructions[var4][var6] = -1; } } } } - if (this.type == 0) { - this.scrollHeight = var1.readUnsignedShort(); - this.isHidden = var1.readUnsignedByte() == 1; + if (this.type == 0) { // L: 278 + this.scrollHeight = var1.readUnsignedShort(); // L: 279 + this.isHidden = var1.readUnsignedByte() == 1; // L: 280 } - if (this.type == 1) { - var1.readUnsignedShort(); - var1.readUnsignedByte(); + if (this.type == 1) { // L: 282 + var1.readUnsignedShort(); // L: 283 + var1.readUnsignedByte(); // L: 284 } - if (this.type == 2) { - this.itemIds = new int[this.rawWidth * this.rawHeight]; - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; - var4 = var1.readUnsignedByte(); - if (var4 == 1) { + if (this.type == 2) { // L: 286 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 287 + this.itemQuantities = new int[this.rawWidth * this.rawHeight]; // L: 288 + var4 = var1.readUnsignedByte(); // L: 289 + if (var4 == 1) { // L: 290 this.flags |= 268435456; } - var5 = var1.readUnsignedByte(); - if (var5 == 1) { + var5 = var1.readUnsignedByte(); // L: 291 + if (var5 == 1) { // L: 292 this.flags |= 1073741824; } - var6 = var1.readUnsignedByte(); - if (var6 == 1) { + var6 = var1.readUnsignedByte(); // L: 293 + if (var6 == 1) { // L: 294 this.flags |= Integer.MIN_VALUE; } - int var7 = var1.readUnsignedByte(); - if (var7 == 1) { + int var7 = var1.readUnsignedByte(); // L: 295 + if (var7 == 1) { // L: 296 this.flags |= 536870912; } - this.paddingX = var1.readUnsignedByte(); - this.paddingY = var1.readUnsignedByte(); - this.inventoryXOffsets = new int[20]; - this.inventoryYOffsets = new int[20]; - this.inventorySprites = new int[20]; + this.paddingX = var1.readUnsignedByte(); // L: 297 + this.paddingY = var1.readUnsignedByte(); // L: 298 + this.inventoryXOffsets = new int[20]; // L: 299 + this.inventoryYOffsets = new int[20]; // L: 300 + this.inventorySprites = new int[20]; // L: 301 int var8; - for (var8 = 0; var8 < 20; ++var8) { - int var9 = var1.readUnsignedByte(); - if (var9 == 1) { - this.inventoryXOffsets[var8] = var1.readShort(); - this.inventoryYOffsets[var8] = var1.readShort(); - this.inventorySprites[var8] = var1.readInt(); + for (var8 = 0; var8 < 20; ++var8) { // L: 302 + int var11 = var1.readUnsignedByte(); // L: 303 + if (var11 == 1) { // L: 304 + this.inventoryXOffsets[var8] = var1.readShort(); // L: 305 + this.inventoryYOffsets[var8] = var1.readShort(); // L: 306 + this.inventorySprites[var8] = var1.readInt(); // L: 307 } else { - this.inventorySprites[var8] = -1; + this.inventorySprites[var8] = -1; // L: 309 } } - this.itemActions = new String[5]; + this.itemActions = new String[5]; // L: 311 - for (var8 = 0; var8 < 5; ++var8) { - String var10 = var1.readStringCp1252NullTerminated(); - if (var10.length() > 0) { - this.itemActions[var8] = var10; - this.flags |= 1 << var8 + 23; + for (var8 = 0; var8 < 5; ++var8) { // L: 312 + String var9 = var1.readStringCp1252NullTerminated(); // L: 313 + if (var9.length() > 0) { // L: 314 + this.itemActions[var8] = var9; // L: 315 + this.flags |= 1 << var8 + 23; // L: 316 } } } - if (this.type == 3) { - this.fill = var1.readUnsignedByte() == 1; + if (this.type == 3) { // L: 320 + this.fill = var1.readUnsignedByte() == 1; // L: 321 } - if (this.type == 4 || this.type == 1) { - this.textXAlignment = var1.readUnsignedByte(); - this.textYAlignment = var1.readUnsignedByte(); - this.textLineHeight = var1.readUnsignedByte(); - this.fontId = var1.readUnsignedShort(); - if (this.fontId == 65535) { + if (this.type == 4 || this.type == 1) { // L: 323 + this.textXAlignment = var1.readUnsignedByte(); // L: 324 + this.textYAlignment = var1.readUnsignedByte(); // L: 325 + this.textLineHeight = var1.readUnsignedByte(); // L: 326 + this.fontId = var1.readUnsignedShort(); // L: 327 + if (this.fontId == 65535) { // L: 328 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; + this.textShadowed = var1.readUnsignedByte() == 1; // L: 329 } - if (this.type == 4) { - this.text = var1.readStringCp1252NullTerminated(); - this.text2 = var1.readStringCp1252NullTerminated(); + if (this.type == 4) { // L: 331 + this.text = var1.readStringCp1252NullTerminated(); // L: 332 + this.text2 = var1.readStringCp1252NullTerminated(); // L: 333 } - if (this.type == 1 || this.type == 3 || this.type == 4) { + if (this.type == 1 || this.type == 3 || this.type == 4) { // L: 335 this.color = var1.readInt(); } - if (this.type == 3 || this.type == 4) { - this.color2 = var1.readInt(); - this.mouseOverColor = var1.readInt(); - this.mouseOverColor2 = var1.readInt(); + if (this.type == 3 || this.type == 4) { // L: 336 + this.color2 = var1.readInt(); // L: 337 + this.mouseOverColor = var1.readInt(); // L: 338 + this.mouseOverColor2 = var1.readInt(); // L: 339 } - if (this.type == 5) { - this.spriteId2 = var1.readInt(); - this.spriteId = var1.readInt(); + if (this.type == 5) { // L: 341 + this.spriteId2 = var1.readInt(); // L: 342 + this.spriteId = var1.readInt(); // L: 343 } - if (this.type == 6) { - this.modelType = 1; - this.modelId = var1.readUnsignedShort(); - if (this.modelId == 65535) { + if (this.type == 6) { // L: 345 + this.modelType = 1; // L: 346 + this.modelId = var1.readUnsignedShort(); // L: 347 + if (this.modelId == 65535) { // L: 348 this.modelId = -1; } - this.modelType2 = 1; - this.modelId2 = var1.readUnsignedShort(); - if (this.modelId2 == 65535) { + this.modelType2 = 1; // L: 349 + this.modelId2 = var1.readUnsignedShort(); // L: 350 + if (this.modelId2 == 65535) { // L: 351 this.modelId2 = -1; } - this.sequenceId = var1.readUnsignedShort(); - if (this.sequenceId == 65535) { + this.sequenceId = var1.readUnsignedShort(); // L: 352 + if (this.sequenceId == 65535) { // L: 353 this.sequenceId = -1; } - this.sequenceId2 = var1.readUnsignedShort(); - if (this.sequenceId2 == 65535) { + this.sequenceId2 = var1.readUnsignedShort(); // L: 354 + if (this.sequenceId2 == 65535) { // L: 355 this.sequenceId2 = -1; } - this.modelZoom = var1.readUnsignedShort(); - this.modelAngleX = var1.readUnsignedShort(); - this.modelAngleY = var1.readUnsignedShort(); + this.modelZoom = var1.readUnsignedShort(); // L: 356 + this.modelAngleX = var1.readUnsignedShort(); // L: 357 + this.modelAngleY = var1.readUnsignedShort(); // L: 358 } - if (this.type == 7) { - this.itemIds = new int[this.rawHeight * this.rawWidth]; - this.itemQuantities = new int[this.rawWidth * this.rawHeight]; - this.textXAlignment = var1.readUnsignedByte(); - this.fontId = var1.readUnsignedShort(); - if (this.fontId == 65535) { + if (this.type == 7) { // L: 360 + this.itemIds = new int[this.rawWidth * this.rawHeight]; // L: 361 + this.itemQuantities = new int[this.rawHeight * this.rawWidth]; // L: 362 + this.textXAlignment = var1.readUnsignedByte(); // L: 363 + this.fontId = var1.readUnsignedShort(); // L: 364 + if (this.fontId == 65535) { // L: 365 this.fontId = -1; } - this.textShadowed = var1.readUnsignedByte() == 1; - this.color = var1.readInt(); - this.paddingX = var1.readShort(); - this.paddingY = var1.readShort(); - var4 = var1.readUnsignedByte(); - if (var4 == 1) { + this.textShadowed = var1.readUnsignedByte() == 1; // L: 366 + this.color = var1.readInt(); // L: 367 + this.paddingX = var1.readShort(); // L: 368 + this.paddingY = var1.readShort(); // L: 369 + var4 = var1.readUnsignedByte(); // L: 370 + if (var4 == 1) { // L: 371 this.flags |= 1073741824; } - this.itemActions = new String[5]; + this.itemActions = new String[5]; // L: 372 - for (var5 = 0; var5 < 5; ++var5) { - String var11 = var1.readStringCp1252NullTerminated(); - if (var11.length() > 0) { - this.itemActions[var5] = var11; - this.flags |= 1 << var5 + 23; + for (var5 = 0; var5 < 5; ++var5) { // L: 373 + String var10 = var1.readStringCp1252NullTerminated(); // L: 374 + if (var10.length() > 0) { // L: 375 + this.itemActions[var5] = var10; // L: 376 + this.flags |= 1 << var5 + 23; // L: 377 } } } - if (this.type == 8) { - this.text = var1.readStringCp1252NullTerminated(); + if (this.type == 8) { // L: 381 + this.text = var1.readStringCp1252NullTerminated(); // L: 382 } - if (this.buttonType == 2 || this.type == 2) { - this.spellActionName = var1.readStringCp1252NullTerminated(); - this.spellName = var1.readStringCp1252NullTerminated(); - var4 = var1.readUnsignedShort() & 63; - this.flags |= var4 << 11; + if (this.buttonType == 2 || this.type == 2) { // L: 384 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 385 + this.spellName = var1.readStringCp1252NullTerminated(); // L: 386 + var4 = var1.readUnsignedShort() & 63; // L: 387 + this.flags |= var4 << 11; // L: 388 } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { - this.buttonText = var1.readStringCp1252NullTerminated(); - if (this.buttonText.length() == 0) { - if (this.buttonType == 1) { + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) { // L: 390 + this.buttonText = var1.readStringCp1252NullTerminated(); // L: 391 + if (this.buttonText.length() == 0) { // L: 392 + if (this.buttonType == 1) { // L: 393 this.buttonText = "Ok"; } - if (this.buttonType == 4) { + if (this.buttonType == 4) { // L: 394 this.buttonText = "Select"; } - if (this.buttonType == 5) { + if (this.buttonType == 5) { // L: 395 this.buttonText = "Select"; } - if (this.buttonType == 6) { + if (this.buttonType == 6) { // L: 396 this.buttonText = "Continue"; } } } - if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { - this.flags |= 4194304; + if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) { // L: 399 + this.flags |= 4194304; // L: 400 } - if (this.buttonType == 6) { - this.flags |= 1; + if (this.buttonType == 6) { // L: 402 + this.flags |= 1; // L: 403 } - } + } // L: 405 - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "0" + descriptor = "(Lkf;I)V", + garbageValue = "-1100284620" ) @Export("decode") void decode(Buffer var1) { - var1.readUnsignedByte(); - this.isIf3 = true; - this.type = var1.readUnsignedByte(); - this.contentType = var1.readUnsignedShort(); - this.rawX = var1.readShort(); - this.rawY = var1.readShort(); - this.rawWidth = var1.readUnsignedShort(); - if (this.type == 9) { + var1.readUnsignedByte(); // L: 408 + this.isIf3 = true; // L: 409 + this.type = var1.readUnsignedByte(); // L: 410 + this.contentType = var1.readUnsignedShort(); // L: 411 + this.rawX = var1.readShort(); // L: 412 + this.rawY = var1.readShort(); // L: 413 + this.rawWidth = var1.readUnsignedShort(); // L: 414 + if (this.type == 9) { // L: 415 this.rawHeight = var1.readShort(); } else { - this.rawHeight = var1.readUnsignedShort(); + this.rawHeight = var1.readUnsignedShort(); // L: 416 } - this.widthAlignment = var1.readByte(); - this.heightAlignment = var1.readByte(); - this.xAlignment = var1.readByte(); - this.yAlignment = var1.readByte(); - this.parentId = var1.readUnsignedShort(); - if (this.parentId == 65535) { + this.widthAlignment = var1.readByte(); // L: 417 + this.heightAlignment = var1.readByte(); // L: 418 + this.xAlignment = var1.readByte(); // L: 419 + this.yAlignment = var1.readByte(); // L: 420 + this.parentId = var1.readUnsignedShort(); // L: 421 + if (this.parentId == 65535) { // L: 422 this.parentId = -1; } else { - this.parentId += this.id & -65536; + this.parentId += this.id & -65536; // L: 423 } - this.isHidden = var1.readUnsignedByte() == 1; - if (this.type == 0) { - this.scrollWidth = var1.readUnsignedShort(); - this.scrollHeight = var1.readUnsignedShort(); - this.noClickThrough = var1.readUnsignedByte() == 1; + this.isHidden = var1.readUnsignedByte() == 1; // L: 424 + if (this.type == 0) { // L: 425 + this.scrollWidth = var1.readUnsignedShort(); // L: 426 + this.scrollHeight = var1.readUnsignedShort(); // L: 427 + this.noClickThrough = var1.readUnsignedByte() == 1; // L: 428 } - if (this.type == 5) { - this.spriteId2 = var1.readInt(); - this.spriteAngle = var1.readUnsignedShort(); - this.spriteTiling = var1.readUnsignedByte() == 1; - this.transparencyTop = var1.readUnsignedByte(); - this.outline = var1.readUnsignedByte(); - this.spriteShadow = var1.readInt(); - this.spriteFlipV = var1.readUnsignedByte() == 1; - this.spriteFlipH = var1.readUnsignedByte() == 1; + if (this.type == 5) { // L: 430 + this.spriteId2 = var1.readInt(); // L: 431 + this.spriteAngle = var1.readUnsignedShort(); // L: 432 + this.spriteTiling = var1.readUnsignedByte() == 1; // L: 433 + this.transparencyTop = var1.readUnsignedByte(); // L: 434 + this.outline = var1.readUnsignedByte(); // L: 435 + this.spriteShadow = var1.readInt(); // L: 436 + this.spriteFlipV = var1.readUnsignedByte() == 1; // L: 437 + this.spriteFlipH = var1.readUnsignedByte() == 1; // L: 438 } - if (this.type == 6) { - this.modelType = 1; - this.modelId = var1.readUnsignedShort(); - if (this.modelId == 65535) { + if (this.type == 6) { // L: 440 + this.modelType = 1; // L: 441 + this.modelId = var1.readUnsignedShort(); // L: 442 + if (this.modelId == 65535) { // L: 443 this.modelId = -1; } - this.modelOffsetX = var1.readShort(); - this.modelOffsetY = var1.readShort(); - this.modelAngleX = var1.readUnsignedShort(); - this.modelAngleY = var1.readUnsignedShort(); - this.modelAngleZ = var1.readUnsignedShort(); - this.modelZoom = var1.readUnsignedShort(); - this.sequenceId = var1.readUnsignedShort(); - if (this.sequenceId == 65535) { + this.modelOffsetX = var1.readShort(); // L: 444 + this.modelOffsetY = var1.readShort(); // L: 445 + this.modelAngleX = var1.readUnsignedShort(); // L: 446 + this.modelAngleY = var1.readUnsignedShort(); // L: 447 + this.modelAngleZ = var1.readUnsignedShort(); // L: 448 + this.modelZoom = var1.readUnsignedShort(); // L: 449 + this.sequenceId = var1.readUnsignedShort(); // L: 450 + if (this.sequenceId == 65535) { // L: 451 this.sequenceId = -1; } - this.modelOrthog = var1.readUnsignedByte() == 1; - var1.readUnsignedShort(); - if (this.widthAlignment != 0) { - this.field2657 = var1.readUnsignedShort(); + this.modelOrthog = var1.readUnsignedByte() == 1; // L: 452 + var1.readUnsignedShort(); // L: 453 + if (this.widthAlignment != 0) { // L: 454 + this.field2728 = var1.readUnsignedShort(); } - if (this.heightAlignment != 0) { - var1.readUnsignedShort(); + if (this.heightAlignment != 0) { // L: 455 + var1.readUnsignedShort(); // L: 456 } } - if (this.type == 4) { - this.fontId = var1.readUnsignedShort(); - if (this.fontId == 65535) { + if (this.type == 4) { // L: 459 + this.fontId = var1.readUnsignedShort(); // L: 460 + if (this.fontId == 65535) { // L: 461 this.fontId = -1; } - this.text = var1.readStringCp1252NullTerminated(); - this.textLineHeight = var1.readUnsignedByte(); - this.textXAlignment = var1.readUnsignedByte(); - this.textYAlignment = var1.readUnsignedByte(); - this.textShadowed = var1.readUnsignedByte() == 1; - this.color = var1.readInt(); + this.text = var1.readStringCp1252NullTerminated(); // L: 462 + this.textLineHeight = var1.readUnsignedByte(); // L: 463 + this.textXAlignment = var1.readUnsignedByte(); // L: 464 + this.textYAlignment = var1.readUnsignedByte(); // L: 465 + this.textShadowed = var1.readUnsignedByte() == 1; // L: 466 + this.color = var1.readInt(); // L: 467 } - if (this.type == 3) { - this.color = var1.readInt(); - this.fill = var1.readUnsignedByte() == 1; - this.transparencyTop = var1.readUnsignedByte(); + if (this.type == 3) { // L: 469 + this.color = var1.readInt(); // L: 470 + this.fill = var1.readUnsignedByte() == 1; // L: 471 + this.transparencyTop = var1.readUnsignedByte(); // L: 472 } - if (this.type == 9) { - this.lineWid = var1.readUnsignedByte(); - this.color = var1.readInt(); - this.field2633 = var1.readUnsignedByte() == 1; + if (this.type == 9) { // L: 474 + this.lineWid = var1.readUnsignedByte(); // L: 475 + this.color = var1.readInt(); // L: 476 + this.field2639 = var1.readUnsignedByte() == 1; // L: 477 } - this.flags = var1.readMedium(); - this.dataText = var1.readStringCp1252NullTerminated(); - int var2 = var1.readUnsignedByte(); - if (var2 > 0) { - this.actions = new String[var2]; + this.flags = var1.readMedium(); // L: 479 + this.dataText = var1.readStringCp1252NullTerminated(); // L: 480 + int var2 = var1.readUnsignedByte(); // L: 481 + if (var2 > 0) { // L: 482 + this.actions = new String[var2]; // L: 483 - for (int var3 = 0; var3 < var2; ++var3) { + for (int var3 = 0; var3 < var2; ++var3) { // L: 484 this.actions[var3] = var1.readStringCp1252NullTerminated(); } } - this.dragZoneSize = var1.readUnsignedByte(); - this.dragThreshold = var1.readUnsignedByte(); - this.isScrollBar = var1.readUnsignedByte() == 1; - this.spellActionName = var1.readStringCp1252NullTerminated(); - this.onLoad = this.readListener(var1); - this.onMouseOver = this.readListener(var1); - this.onMouseLeave = this.readListener(var1); - this.onTargetLeave = this.readListener(var1); - this.onTargetEnter = this.readListener(var1); - this.onVarTransmit = this.readListener(var1); - this.onInvTransmit = this.readListener(var1); - this.onStatTransmit = this.readListener(var1); - this.onTimer = this.readListener(var1); - this.onOp = this.readListener(var1); - this.onMouseRepeat = this.readListener(var1); - this.onClick = this.readListener(var1); - this.onClickRepeat = this.readListener(var1); - this.onRelease = this.readListener(var1); - this.onHold = this.readListener(var1); - this.onDrag = this.readListener(var1); - this.onDragComplete = this.readListener(var1); - this.onScroll = this.readListener(var1); - this.varTransmitTriggers = this.readListenerTriggers(var1); - this.invTransmitTriggers = this.readListenerTriggers(var1); - this.statTransmitTriggers = this.readListenerTriggers(var1); - } + this.dragZoneSize = var1.readUnsignedByte(); // L: 486 + this.dragThreshold = var1.readUnsignedByte(); // L: 487 + this.isScrollBar = var1.readUnsignedByte() == 1; // L: 488 + this.spellActionName = var1.readStringCp1252NullTerminated(); // L: 489 + this.onLoad = this.readListener(var1); // L: 490 + this.onMouseOver = this.readListener(var1); // L: 491 + this.onMouseLeave = this.readListener(var1); // L: 492 + this.onTargetLeave = this.readListener(var1); // L: 493 + this.onTargetEnter = this.readListener(var1); // L: 494 + this.onVarTransmit = this.readListener(var1); // L: 495 + this.onInvTransmit = this.readListener(var1); // L: 496 + this.onStatTransmit = this.readListener(var1); // L: 497 + this.onTimer = this.readListener(var1); // L: 498 + this.onOp = this.readListener(var1); // L: 499 + this.onMouseRepeat = this.readListener(var1); // L: 500 + this.onClick = this.readListener(var1); // L: 501 + this.onClickRepeat = this.readListener(var1); // L: 502 + this.onRelease = this.readListener(var1); // L: 503 + this.onHold = this.readListener(var1); // L: 504 + this.onDrag = this.readListener(var1); // L: 505 + this.onDragComplete = this.readListener(var1); // L: 506 + this.onScroll = this.readListener(var1); // L: 507 + this.varTransmitTriggers = this.readListenerTriggers(var1); // L: 508 + this.invTransmitTriggers = this.readListenerTriggers(var1); // L: 509 + this.statTransmitTriggers = this.readListenerTriggers(var1); // L: 510 + } // L: 511 - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lkn;I)[Ljava/lang/Object;", - garbageValue = "2034218421" + descriptor = "(Lkf;I)[Ljava/lang/Object;", + garbageValue = "1410086858" ) @Export("readListener") Object[] readListener(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { + int var2 = var1.readUnsignedByte(); // L: 514 + if (var2 == 0) { // L: 515 return null; } else { - Object[] var3 = new Object[var2]; + Object[] var3 = new Object[var2]; // L: 516 - for (int var4 = 0; var4 < var2; ++var4) { - int var5 = var1.readUnsignedByte(); + for (int var4 = 0; var4 < var2; ++var4) { // L: 517 + int var5 = var1.readUnsignedByte(); // L: 518 if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); - } else if (var5 == 1) { + var3[var4] = new Integer(var1.readInt()); // L: 519 + } else if (var5 == 1) { // L: 520 var3[var4] = var1.readStringCp1252NullTerminated(); } } - this.hasListener = true; - return var3; + this.hasListener = true; // L: 522 + return var3; // L: 523 } } - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(Lkn;S)[I", - garbageValue = "-3542" - ) - @Export("readListenerTriggers") - int[] readListenerTriggers(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return null; - } else { - int[] var3 = new int[var2]; - - for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = var1.readInt(); - } - - return var3; - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "429586427" - ) - @Export("swapItems") - public void swapItems(int var1, int var2) { - int var3 = this.itemIds[var2]; - this.itemIds[var2] = this.itemIds[var1]; - this.itemIds[var1] = var3; - var3 = this.itemQuantities[var2]; - this.itemQuantities[var2] = this.itemQuantities[var1]; - this.itemQuantities[var1] = var3; - } - @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(ZB)Llz;", - garbageValue = "1" + descriptor = "(Lkf;I)[I", + garbageValue = "931068469" + ) + @Export("readListenerTriggers") + int[] readListenerTriggers(Buffer var1) { + int var2 = var1.readUnsignedByte(); // L: 527 + if (var2 == 0) { // L: 528 + return null; + } else { + int[] var3 = new int[var2]; // L: 529 + + for (int var4 = 0; var4 < var2; ++var4) { // L: 530 + var3[var4] = var1.readInt(); // L: 531 + } + + return var3; // L: 533 + } + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "1248652086" + ) + @Export("swapItems") + public void swapItems(int var1, int var2) { + int var3 = this.itemIds[var2]; // L: 537 + this.itemIds[var2] = this.itemIds[var1]; // L: 538 + this.itemIds[var1] = var3; // L: 539 + var3 = this.itemQuantities[var2]; // L: 540 + this.itemQuantities[var2] = this.itemQuantities[var1]; // L: 541 + this.itemQuantities[var1] = var3; // L: 542 + } // L: 543 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(ZB)Llp;", + garbageValue = "-13" ) @Export("getSprite") public Sprite getSprite(boolean var1) { - field2600 = false; + field2611 = false; // L: 546 int var2; - if (var1) { + if (var1) { // L: 548 var2 = this.spriteId; } else { - var2 = this.spriteId2; + var2 = this.spriteId2; // L: 549 } - if (var2 == -1) { + if (var2 == -1) { // L: 550 return null; } else { - long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((long)this.spriteShadow << 40); - Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); - if (var5 != null) { + long var3 = ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((long)this.spriteShadow << 40); // L: 551 + Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); // L: 552 + if (var5 != null) { // L: 553 return var5; } else { - var5 = GameShell.SpriteBuffer_getSprite(class349.Widget_spritesArchive, var2, 0); - if (var5 == null) { - field2600 = true; - return null; + var5 = AbstractUserComparator.SpriteBuffer_getSprite(Messages.Widget_spritesArchive, var2, 0); // L: 554 + if (var5 == null) { // L: 555 + field2611 = true; // L: 556 + return null; // L: 557 } else { - if (this.spriteFlipV) { + if (this.spriteFlipV) { // L: 559 var5.flipVertically(); } - if (this.spriteFlipH) { + if (this.spriteFlipH) { // L: 560 var5.flipHorizontally(); } - if (this.outline > 0) { + if (this.outline > 0) { // L: 561 var5.pad(this.outline); } - if (this.outline >= 1) { + if (this.outline >= 1) { // L: 562 var5.outline(1); } - if (this.outline >= 2) { + if (this.outline >= 2) { // L: 563 var5.outline(16777215); } - if (this.spriteShadow != 0) { + if (this.spriteShadow != 0) { // L: 564 var5.shadow(this.spriteShadow); } - Widget_cachedSprites.put(var5, var3); - return var5; + Widget_cachedSprites.put(var5, var3); // L: 565 + return var5; // L: 566 } } } } - @ObfuscatedName("y") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)Lko;", - garbageValue = "24" + descriptor = "(I)Lkr;", + garbageValue = "-5714739" ) @Export("getFont") public Font getFont() { - field2600 = false; - if (this.fontId == -1) { + field2611 = false; // L: 570 + if (this.fontId == -1) { // L: 571 return null; } else { - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); - if (var1 != null) { + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); // L: 572 + if (var1 != null) { // L: 573 return var1; } else { - var1 = Frames.method3394(class349.Widget_spritesArchive, WorldMapLabel.Widget_fontsArchive, this.fontId, 0); + var1 = RouteStrategy.method3688(Messages.Widget_spritesArchive, HealthBar.Widget_fontsArchive, this.fontId, 0); // L: 574 if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); + Widget_cachedFonts.put(var1, (long)this.fontId); // L: 575 } else { - field2600 = true; + field2611 = true; // L: 576 } - return var1; + return var1; // L: 577 } } } - @ObfuscatedName("c") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(II)Llz;", - garbageValue = "2132771251" + descriptor = "(IB)Llp;", + garbageValue = "45" ) @Export("getInventorySprite") public Sprite getInventorySprite(int var1) { - field2600 = false; - if (var1 >= 0 && var1 < this.inventorySprites.length) { - int var2 = this.inventorySprites[var1]; - if (var2 == -1) { + field2611 = false; // L: 581 + if (var1 >= 0 && var1 < this.inventorySprites.length) { // L: 582 + int var2 = this.inventorySprites[var1]; // L: 583 + if (var2 == -1) { // L: 584 return null; } else { - Sprite var3 = (Sprite)Widget_cachedSprites.get((long)var2); - if (var3 != null) { + Sprite var3 = (Sprite)Widget_cachedSprites.get((long)var2); // L: 585 + if (var3 != null) { // L: 586 return var3; } else { - var3 = GameShell.SpriteBuffer_getSprite(class349.Widget_spritesArchive, var2, 0); - if (var3 != null) { + var3 = AbstractUserComparator.SpriteBuffer_getSprite(Messages.Widget_spritesArchive, var2, 0); // L: 587 + if (var3 != null) { // L: 588 Widget_cachedSprites.put(var3, (long)var2); } else { - field2600 = true; + field2611 = true; // L: 589 } - return var3; + return var3; // L: 590 } } } else { @@ -1371,192 +1378,287 @@ public class Widget extends Node { @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(Ljm;IZLhv;I)Lef;", - garbageValue = "-893461893" + descriptor = "(Ljm;IZLha;I)Ler;", + garbageValue = "-1710688056" ) @Export("getModel") public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) { - field2600 = false; + field2611 = false; // L: 594 int var5; int var6; - if (var3) { - var5 = this.modelType2; - var6 = this.modelId2; + if (var3) { // L: 597 + var5 = this.modelType2; // L: 598 + var6 = this.modelId2; // L: 599 } else { - var5 = this.modelType; - var6 = this.modelId; + var5 = this.modelType; // L: 602 + var6 = this.modelId; // L: 603 } - if (var5 == 0) { + if (var5 == 0) { // L: 605 return null; - } else if (var5 == 1 && var6 == -1) { + } else if (var5 == 1 && var6 == -1) { // L: 606 return null; } else { - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); - if (var7 == null) { + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); // L: 607 + if (var7 == null) { // L: 608 ModelData var8; - if (var5 == 1) { - var8 = ModelData.ModelData_get(SecureRandomCallable.Widget_modelsArchive, var6, 0); - if (var8 == null) { - field2600 = true; - return null; + if (var5 == 1) { // L: 610 + var8 = ModelData.ModelData_get(Widget_modelsArchive, var6, 0); // L: 611 + if (var8 == null) { // L: 612 + field2611 = true; // L: 613 + return null; // L: 614 } - var7 = var8.toModel(64, 768, -50, -10, -50); + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 616 } - if (var5 == 2) { - var8 = StudioGame.getNpcDefinition(var6).getModelData(); - if (var8 == null) { - field2600 = true; - return null; + if (var5 == 2) { // L: 618 + var8 = Skeleton.getNpcDefinition(var6).getModelData(); // L: 619 + if (var8 == null) { // L: 620 + field2611 = true; // L: 621 + return null; // L: 622 } - var7 = var8.toModel(64, 768, -50, -10, -50); + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 624 } - if (var5 == 3) { - if (var4 == null) { + if (var5 == 3) { // L: 626 + if (var4 == null) { // L: 627 return null; } - var8 = var4.getModelData(); - if (var8 == null) { - field2600 = true; - return null; + var8 = var4.getModelData(); // L: 628 + if (var8 == null) { // L: 629 + field2611 = true; // L: 630 + return null; // L: 631 } - var7 = var8.toModel(64, 768, -50, -10, -50); + var7 = var8.toModel(64, 768, -50, -10, -50); // L: 633 } - if (var5 == 4) { - ItemDefinition var9 = KitDefinition.ItemDefinition_get(var6); - var8 = var9.getModelData(10); - if (var8 == null) { - field2600 = true; - return null; + if (var5 == 4) { // L: 635 + ItemDefinition var9 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6); // L: 636 + var8 = var9.getModelData(10); // L: 637 + if (var8 == null) { // L: 638 + field2611 = true; // L: 639 + return null; // L: 640 } - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); // L: 642 } - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); // L: 644 } - if (var1 != null) { - var7 = var1.transformWidgetModel(var7, var2); + if (var1 != null) { // L: 646 + var7 = var1.transformWidgetModel(var7, var2); // L: 647 } - return var7; + return var7; // L: 649 } } - @ObfuscatedName("k") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(ZI)Lhh;", - garbageValue = "-1801496414" + descriptor = "(ZI)Lhz;", + garbageValue = "1282321676" ) @Export("getSpriteMask") public SpriteMask getSpriteMask(boolean var1) { - if (this.spriteId == -1) { + if (this.spriteId == -1) { // L: 653 var1 = false; } - int var2 = var1 ? this.spriteId * 735913065 * -114644007 : this.spriteId2 * -26976881 * 953426287; - if (var2 == -1) { + int var2 = var1 ? this.spriteId * 1800888721 * -250118287 : this.spriteId2 * -408987673 * -1969239081; // L: 654 + if (var2 == -1) { // L: 655 return null; } else { - long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36); - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); - if (var5 != null) { + long var3 = ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); // L: 656 + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); // L: 657 + if (var5 != null) { // L: 658 return var5; } else { - Sprite var6 = this.getSprite(var1); - if (var6 == null) { + Sprite var6 = this.getSprite(var1); // L: 659 + if (var6 == null) { // L: 660 return null; } else { - Sprite var7 = var6.copyNormalized(); - int[] var8 = new int[var7.subHeight]; - int[] var9 = new int[var7.subHeight]; + Sprite var7 = var6.copyNormalized(); // L: 661 + int[] var8 = new int[var7.subHeight]; // L: 662 + int[] var9 = new int[var7.subHeight]; // L: 663 - for (int var10 = 0; var10 < var7.subHeight; ++var10) { - int var11 = 0; - int var12 = var7.subWidth; + for (int var10 = 0; var10 < var7.subHeight; ++var10) { // L: 664 + int var11 = 0; // L: 665 + int var12 = var7.subWidth; // L: 666 int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var11 = var13; + for (var13 = 0; var13 < var7.subWidth; ++var13) { // L: 667 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 668 + var11 = var13; // L: 669 break; } } - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var12 = var13 + 1; + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { // L: 673 + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { // L: 674 + var12 = var13 + 1; // L: 675 break; } } - var8[var10] = var11; - var9[var10] = var12 - var11; + var8[var10] = var11; // L: 679 + var9[var10] = var12 - var11; // L: 680 } - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); - Widget_cachedSpriteMasks.put(var5, var3); - return var5; + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); // L: 682 + Widget_cachedSpriteMasks.put(var5, var3); // L: 683 + return var5; // L: 684 } } } } - @ObfuscatedName("d") + @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(ILjava/lang/String;I)V", - garbageValue = "1766154663" + garbageValue = "-1337078024" ) @Export("setAction") public void setAction(int var1, String var2) { - if (this.actions == null || this.actions.length <= var1) { - String[] var3 = new String[var1 + 1]; - if (this.actions != null) { - for (int var4 = 0; var4 < this.actions.length; ++var4) { + if (this.actions == null || this.actions.length <= var1) { // L: 695 + String[] var3 = new String[var1 + 1]; // L: 696 + if (this.actions != null) { // L: 697 + for (int var4 = 0; var4 < this.actions.length; ++var4) { // L: 698 var3[var4] = this.actions[var4]; } } - this.actions = var3; + this.actions = var3; // L: 700 } - this.actions[var1] = var2; - } + this.actions[var1] = var2; // L: 702 + } // L: 703 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "863764794" + descriptor = "(Lln;ZI)V", + garbageValue = "-846882241" ) - @Export("getVarbit") - public static int getVarbit(int var0) { - VarbitDefinition var2 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); - VarbitDefinition var1; - if (var2 != null) { - var1 = var2; - } else { - byte[] var7 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); - var2 = new VarbitDefinition(); - if (var7 != null) { - var2.decode(new Buffer(var7)); + public static void method4173(AbstractSocket var0, boolean var1) { + if (NetCache.NetCache_socket != null) { // L: 193 + try { + NetCache.NetCache_socket.close(); // L: 195 + } catch (Exception var8) { // L: 197 } - VarbitDefinition.VarbitDefinition_cached.put(var2, (long)var0); - var1 = var2; + NetCache.NetCache_socket = null; // L: 198 } - int var3 = var1.baseVar; - int var4 = var1.startBit; - int var5 = var1.endBit; - int var6 = Varps.Varps_masks[var5 - var4]; - return Varps.Varps_main[var3] >> var4 & var6; + NetCache.NetCache_socket = var0; // L: 200 + Buffer var2; + if (NetCache.NetCache_socket != null) { // L: 202 + try { + var2 = new Buffer(4); // L: 204 + var2.writeByte(var1 ? 2 : 3); // L: 205 + var2.writeMedium(0); // L: 206 + NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 207 + } catch (IOException var7) { + try { + NetCache.NetCache_socket.close(); // L: 211 + } catch (Exception var6) { // L: 213 + } + + ++NetCache.NetCache_ioExceptions; // L: 214 + NetCache.NetCache_socket = null; // L: 215 + } + } + + NetCache.NetCache_responseHeaderBuffer.offset = 0; // L: 218 + TilePaint.NetCache_currentResponse = null; // L: 219 + class224.NetCache_responseArchiveBuffer = null; // L: 220 + NetCache.field3205 = 0; // L: 221 + + while (true) { + NetFileRequest var9 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first(); // L: 223 + if (var9 == null) { // L: 224 + while (true) { + var9 = (NetFileRequest)NetCache.NetCache_pendingResponses.first(); // L: 230 + if (var9 == null) { // L: 231 + if (NetCache.field3208 != 0) { // L: 237 + try { + var2 = new Buffer(4); // L: 239 + var2.writeByte(4); // L: 240 + var2.writeByte(NetCache.field3208); // L: 241 + var2.writeShort(0); // L: 242 + NetCache.NetCache_socket.write(var2.array, 0, 4); // L: 243 + } catch (IOException var5) { + try { + NetCache.NetCache_socket.close(); // L: 247 + } catch (Exception var4) { // L: 249 + } + + ++NetCache.NetCache_ioExceptions; // L: 250 + NetCache.NetCache_socket = null; // L: 251 + } + } + + NetCache.NetCache_loadTime = 0; // L: 254 + NetCache.field3195 = PacketWriter.currentTimeMillis(); // L: 255 + return; // L: 256 + } + + NetCache.NetCache_pendingWritesQueue.addLast(var9); // L: 232 + NetCache.NetCache_pendingWrites.put(var9, var9.key); // L: 233 + ++NetCache.NetCache_pendingWritesCount; // L: 234 + --NetCache.NetCache_pendingResponsesCount; // L: 235 + } + } + + NetCache.NetCache_pendingPriorityWrites.put(var9, var9.key); // L: 225 + ++NetCache.NetCache_pendingPriorityWritesCount; // L: 226 + --NetCache.NetCache_pendingPriorityResponsesCount; // L: 227 + } } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Liw;IS)V", + garbageValue = "1604" + ) + static void method4174(Archive var0, int var1) { + if (MenuAction.NetCache_reference != null) { // L: 259 + MenuAction.NetCache_reference.offset = var1 * 8 + 5; // L: 260 + int var2 = MenuAction.NetCache_reference.readInt(); // L: 261 + int var3 = MenuAction.NetCache_reference.readInt(); // L: 262 + var0.loadIndex(var2, var3); // L: 263 + } else { + Varps.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true); // L: 266 + NetCache.NetCache_archives[var1] = var0; // L: 267 + } + } // L: 264 268 + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IB)Z", + garbageValue = "37" + ) + public static boolean method4172(int var0) { + return (var0 >> 29 & 1) != 0; // L: 25 + } + + @ObfuscatedName("hv") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "757638710" + ) + static final void method4175(int var0) { + if (var0 >= 0) { // L: 7239 + int var1 = Client.menuArguments1[var0]; // L: 7240 + int var2 = Client.menuArguments2[var0]; // L: 7241 + int var3 = Client.menuOpcodes[var0]; // L: 7242 + int var4 = Client.menuIdentifiers[var0]; // L: 7243 + String var5 = Client.menuActions[var0]; // L: 7244 + String var6 = Client.menuTargets[var0]; // L: 7245 + SecureRandomCallable.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY); // L: 7246 + } + } // L: 7247 } diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java index 0e73f01c48..a987de59d1 100644 --- a/runescape-client/src/main/java/World.java +++ b/runescape-client/src/main/java/World.java @@ -4,711 +4,158 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ch") +@ObfuscatedName("ct") @Implements("World") public class World { - @ObfuscatedName("po") - @ObfuscatedSignature( - descriptor = "Lls;" - ) - @Export("privateChatMode") - static PrivateChatMode privateChatMode; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1441971191 + intValue = 1992113923 ) @Export("World_count") static int World_count; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1186159091 + intValue = 1564802557 ) @Export("World_listCount") static int World_listCount; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("World_sortOption2") static int[] World_sortOption2; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("World_sortOption1") static int[] World_sortOption1; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1957394053 + intValue = 1790821377 ) @Export("id") int id; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 698149195 + intValue = -370098411 ) @Export("properties") int properties; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 291989859 + intValue = 1089553333 ) @Export("population") int population; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("host") String host; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("activity") String activity; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1891315591 + intValue = -82869953 ) @Export("location") int location; - @ObfuscatedName("s") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 198131919 + intValue = 1577335433 ) @Export("index") int index; static { - World_count = 0; - World_listCount = 0; - World_sortOption2 = new int[]{1, 1, 1, 1}; - World_sortOption1 = new int[]{0, 1, 2, 3}; + World_count = 0; // L: 14 + World_listCount = 0; // L: 15 + World_sortOption2 = new int[]{1, 1, 1, 1}; // L: 16 + World_sortOption1 = new int[]{0, 1, 2, 3}; // L: 17 } World() { - } + } // L: 27 - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-1952948484" + descriptor = "(B)Z", + garbageValue = "17" ) @Export("isMembersOnly") boolean isMembersOnly() { - return (1 & this.properties) != 0; + return (1 & this.properties) != 0; // L: 247 } - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-964696384" + garbageValue = "-2022198526" ) - boolean method1874() { - return (2 & this.properties) != 0; + boolean method1821() { + return (2 & this.properties) != 0; // L: 251 } - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1522011023" + garbageValue = "1058529393" ) @Export("isPvp") boolean isPvp() { - return (4 & this.properties) != 0; + return (4 & this.properties) != 0; // L: 255 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-973887328" + ) + boolean method1823() { + return (8 & this.properties) != 0; // L: 259 + } + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)Z", + garbageValue = "-101" + ) + @Export("isDeadman") + boolean isDeadman() { + return (536870912 & this.properties) != 0; // L: 263 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-249036975" + ) + @Export("isBeta") + boolean isBeta() { + return (33554432 & this.properties) != 0; // L: 267 } @ObfuscatedName("c") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "1974803313" + garbageValue = "1700714003" ) - boolean method1841() { - return (8 & this.properties) != 0; - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "15" - ) - @Export("isDeadman") - boolean isDeadman() { - return (536870912 & this.properties) != 0; + boolean method1826() { + return (1073741824 & this.properties) != 0; // L: 271 } @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "607891956" + descriptor = "(Ljava/lang/CharSequence;I)Z", + garbageValue = "-1732366534" ) - @Export("isBeta") - boolean isBeta() { - return (33554432 & this.properties) != 0; + @Export("isNumber") + public static boolean isNumber(CharSequence var0) { + return class92.method2141(var0, 10, true); // L: 34 } - @ObfuscatedName("r") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1312079731" + descriptor = "(IIS)I", + garbageValue = "500" ) - boolean method1835() { - return (1073741824 & this.properties) != 0; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIILga;Lfz;I)Z", - garbageValue = "1323151453" - ) - static final boolean method1856(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) { - int var5 = var0; - int var6 = var1; - byte var7 = 64; - byte var8 = 64; - int var9 = var0 - var7; - int var10 = var1 - var8; - class182.directions[var7][var8] = 99; - class182.distances[var7][var8] = 0; - byte var11 = 0; - int var12 = 0; - class182.bufferX[var11] = var0; - int var20 = var11 + 1; - class182.bufferY[var11] = var1; - int[][] var13 = var4.flags; - - while (true) { - label309: - while (true) { - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - do { - do { - do { - label286: - do { - if (var12 == var20) { - class182.field2132 = var5; - GrandExchangeOfferOwnWorldComparator.field666 = var6; - return false; - } - - var5 = class182.bufferX[var12]; - var6 = class182.bufferY[var12]; - var12 = var12 + 1 & 4095; - var18 = var5 - var9; - var19 = var6 - var10; - var14 = var5 - var4.xInset; - var15 = var6 - var4.yInset; - if (var3.hasArrived(var2, var5, var6, var4)) { - class182.field2132 = var5; - GrandExchangeOfferOwnWorldComparator.field666 = var6; - return true; - } - - var16 = class182.distances[var18][var19] + 1; - if (var18 > 0 && class182.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class182.bufferX[var20] = var5 - 1; - class182.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class182.directions[var18 - 1][var19] = 2; - class182.distances[var18 - 1][var19] = var16; - break; - } - - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0) { - break; - } - - ++var17; - } - } - - if (var18 < 128 - var2 && class182.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class182.bufferX[var20] = var5 + 1; - class182.bufferY[var20] = var6; - var20 = var20 + 1 & 4095; - class182.directions[var18 + 1][var19] = 8; - class182.distances[var18 + 1][var19] = var16; - break; - } - - if ((var13[var14 + var2][var15 + var17] & 19136995) != 0) { - break; - } - - ++var17; - } - } - - if (var19 > 0 && class182.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class182.bufferX[var20] = var5; - class182.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class182.directions[var18][var19 - 1] = 1; - class182.distances[var18][var19 - 1] = var16; - break; - } - - if ((var13[var14 + var17][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var19 < 128 - var2 && class182.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2 - 1) { - class182.bufferX[var20] = var5; - class182.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class182.directions[var18][var19 + 1] = 4; - class182.distances[var18][var19 + 1] = var16; - break; - } - - if ((var13[var14 + var17][var15 + var2] & 19137016) != 0) { - break; - } - - ++var17; - } - } - - if (var18 > 0 && var19 > 0 && class182.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2) { - class182.bufferX[var20] = var5 - 1; - class182.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class182.directions[var18 - 1][var19 - 1] = 3; - class182.distances[var18 - 1][var19 - 1] = var16; - break; - } - - if ((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var18 < 128 - var2 && var19 > 0 && class182.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) { - var17 = 1; - - while (true) { - if (var17 >= var2) { - class182.bufferX[var20] = var5 + 1; - class182.bufferY[var20] = var6 - 1; - var20 = var20 + 1 & 4095; - class182.directions[var18 + 1][var19 - 1] = 9; - class182.distances[var18 + 1][var19 - 1] = var16; - break; - } - - if ((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var14 + var17][var15 - 1] & 19136911) != 0) { - break; - } - - ++var17; - } - } - - if (var18 > 0 && var19 < 128 - var2 && class182.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) { - for (var17 = 1; var17 < var2; ++var17) { - if ((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) { - continue label286; - } - } - - class182.bufferX[var20] = var5 - 1; - class182.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class182.directions[var18 - 1][var19 + 1] = 6; - class182.distances[var18 - 1][var19 + 1] = var16; - } - } while(var18 >= 128 - var2); - } while(var19 >= 128 - var2); - } while(class182.directions[var18 + 1][var19 + 1] != 0); - } while((var13[var14 + var2][var15 + var2] & 19136992) != 0); - - for (var17 = 1; var17 < var2; ++var17) { - if ((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) { - continue label309; - } - } - - class182.bufferX[var20] = var5 + 1; - class182.bufferY[var20] = var6 + 1; - var20 = var20 + 1 & 4095; - class182.directions[var18 + 1][var19 + 1] = 12; - class182.distances[var18 + 1][var19 + 1] = var16; - } - } - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(Lko;Lko;Lko;B)V", - garbageValue = "-14" - ) - @Export("drawTitle") - static void drawTitle(Font var0, Font var1, Font var2) { - Login.xPadding = (Varcs.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - Login.loginBoxCenter = Login.loginBoxX + 180; - if (Login.worldSelectOpen) { - Language.method3786(var0, var1); - } else { - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - ItemContainer.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - int var4; - if (Client.gameState == 0 || Client.gameState == 5) { - byte var3 = 20; - var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var3, 16777215, -1); - var4 = 253 - var3; - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var4, 304, 34, 9179409); - Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var4 + 1, 302, 32, 0); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var4 + 2, Login.Login_loadingPercent * 3, 30, 9179409); - Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var4 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0); - var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var3, 16777215, -1); - } - - String var5; - String var19; - short var22; - int var23; - short var24; - if (Client.gameState == 20) { - HealthBar.titleboxSprite.drawAt(Login.loginBoxX + 180 - HealthBar.titleboxSprite.subWidth / 2, 271 - HealthBar.titleboxSprite.subHeight / 2); - var22 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var23 += 7; - if (Login.loginIndex != 4) { - var0.draw("Login: ", Login.loginBoxX + 180 - 110, var23, 16777215, 0); - var24 = 200; - - for (var5 = FaceNormal.method3392(); var0.stringWidth(var5) > var24; var5 = var5.substring(0, var5.length() - 1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5), Login.loginBoxX + 180 - 70, var23, 16777215, 0); - var23 += 15; - - for (var19 = WorldMapRegion.method613(Login.Login_password); var0.stringWidth(var19) > var24; var19 = var19.substring(1)) { - } - - var0.draw("Password: " + var19, Login.loginBoxX + 180 - 108, var23, 16777215, 0); - var23 += 15; - } - } - - if (Client.gameState == 10 || Client.gameState == 11) { - HealthBar.titleboxSprite.drawAt(Login.loginBoxX, 171); - short var17; - if (Login.loginIndex == 0) { - var22 = 251; - var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var22, 16776960, 0); - var23 = var22 + 30; - var4 = Login.loginBoxX + 180 - 80; - var17 = 291; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawLines("New User", var4 - 73, var17 - 20, 144, 40, 16777215, 0, 1, 1, 0); - var4 = Login.loginBoxX + 180 + 80; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawLines("Existing User", var4 - 73, var17 - 20, 144, 40, 16777215, 0, 1, 1, 0); - } else if (Login.loginIndex == 1) { - var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0); - var22 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); - var23 += 15; - var4 = Login.loginBoxX + 180 - 80; - var17 = 321; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Continue", var4, var17 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Cancel", var4, var17 + 5, 16777215, 0); - } else { - int var7; - if (Login.loginIndex == 2) { - var22 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxCenter, var22, 16776960, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxCenter, var23, 16776960, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxCenter, var23, 16776960, 0); - var23 += 15; - var23 += 7; - var0.draw("Login: ", Login.loginBoxCenter - 110, var23, 16777215, 0); - var24 = 200; - - for (var5 = FaceNormal.method3392(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? ItemContainer.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 70, var23, 16777215, 0); - var23 += 15; - - for (var19 = WorldMapRegion.method613(Login.Login_password); var0.stringWidth(var19) > var24; var19 = var19.substring(1)) { - } - - var0.draw("Password: " + var19 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? ItemContainer.colorStartTag(16776960) + "|" : ""), Login.loginBoxCenter - 108, var23, 16777215, 0); - var23 += 15; - var22 = 277; - var7 = Login.loginBoxCenter + -117; - boolean var9 = Client.Login_isUsernameRemembered; - boolean var10 = Login.field1209; - IndexedSprite var8 = var9 ? (var10 ? ScriptEvent.field597 : GameShell.options_buttons_2Sprite) : (var10 ? class336.field3912 : Login.options_buttons_0Sprite); - var8.drawAt(var7, var22); - var7 = var7 + var8.subWidth + 5; - var1.draw("Remember username", var7, var22 + 13, 16776960, 0); - var7 = Login.loginBoxCenter + 24; - boolean var13 = NetSocket.clientPreferences.hideUsername; - boolean var14 = Login.field1231; - IndexedSprite var12 = var13 ? (var14 ? ScriptEvent.field597 : GameShell.options_buttons_2Sprite) : (var14 ? class336.field3912 : Login.options_buttons_0Sprite); - var12.drawAt(var7, var22); - var7 = var7 + var12.subWidth + 5; - var1.draw("Hide username", var7, var22 + 13, 16776960, 0); - var23 = var22 + 15; - int var15 = Login.loginBoxCenter - 80; - short var16 = 321; - Fonts.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); - var0.drawCentered("Login", var15, var16 + 5, 16777215, 0); - var15 = Login.loginBoxCenter + 80; - Fonts.titlebuttonSprite.drawAt(var15 - 73, var16 - 20); - var0.drawCentered("Cancel", var15, var16 + 5, 16777215, 0); - var22 = 357; - switch(Login.field1213) { - case 2: - WorldMapID.field300 = "Having trouble logging in?"; - break; - default: - WorldMapID.field300 = "Can't login? Click here."; - } - - ItemContainer.field567 = new Bounds(Login.loginBoxCenter, var22, var1.stringWidth(WorldMapID.field300), 11); - GrandExchangeOffer.field87 = new Bounds(Login.loginBoxCenter, var22, var1.stringWidth("Still having trouble logging in?"), 11); - var1.drawCentered(WorldMapID.field300, Login.loginBoxCenter, var22, 16777215, 0); - } else if (Login.loginIndex == 3) { - var22 = 201; - var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var22, 16776960, 0); - var23 = var22 + 20; - var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var4 = Login.loginBoxX + 180; - var17 = 276; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var2.drawCentered("Try again", var4, var17 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180; - var17 = 326; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var2.drawCentered("Forgotten password?", var4, var17 + 5, 16777215, 0); - } else { - short var20; - if (Login.loginIndex == 4) { - var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0); - var22 = 236; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); - var23 += 15; - var0.draw("PIN: " + WorldMapRegion.method613(ClanMate.otp) + (Client.cycle % 40 < 20 ? ItemContainer.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var23, 16777215, 0); - var23 -= 8; - var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var23, 16776960, 0); - var23 += 15; - var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var23, 16776960, 0); - var4 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15; - int var27 = var23 - var0.ascent; - IndexedSprite var29; - if (Login.field1223) { - var29 = GameShell.options_buttons_2Sprite; - } else { - var29 = Login.options_buttons_0Sprite; - } - - var29.drawAt(var4, var27); - var23 += 15; - var7 = Login.loginBoxX + 180 - 80; - var20 = 321; - Fonts.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Continue", var7, var20 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180 + 80; - Fonts.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Cancel", var7, var20 + 5, 16777215, 0); - var1.drawCentered("Can't Log In?", Login.loginBoxX + 180, var20 + 36, 255, 0); - } else if (Login.loginIndex == 5) { - var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0); - var22 = 221; - var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); - var23 = var22 + 15; - var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var23 += 14; - var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var23, 16777215, 0); - var24 = 174; - - for (var5 = FaceNormal.method3392(); var0.stringWidth(var5) > var24; var5 = var5.substring(1)) { - } - - var0.draw(AbstractFont.escapeBrackets(var5) + (Client.cycle % 40 < 20 ? ItemContainer.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var23, 16777215, 0); - var23 += 15; - int var6 = Login.loginBoxX + 180 - 80; - short var26 = 321; - Fonts.titlebuttonSprite.drawAt(var6 - 73, var26 - 20); - var0.drawCentered("Recover", var6, var26 + 5, 16777215, 0); - var6 = Login.loginBoxX + 180 + 80; - Fonts.titlebuttonSprite.drawAt(var6 - 73, var26 - 20); - var0.drawCentered("Back", var6, var26 + 5, 16777215, 0); - var26 = 356; - var1.drawCentered("Still having trouble logging in?", Login.loginBoxCenter, var26, 268435455, 0); - } else if (Login.loginIndex == 6) { - var22 = 201; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16776960, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var4 = Login.loginBoxX + 180; - var17 = 321; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); - } else if (Login.loginIndex == 7) { - var22 = 216; - var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var22, 16776960, 0); - var23 = var22 + 15; - var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var4 = Login.loginBoxX + 180 - 80; - var17 = 321; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Set Date of Birth", var4, var17 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); - } else if (Login.loginIndex == 8) { - var22 = 216; - var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var22, 16776960, 0); - var23 = var22 + 15; - var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var4 = Login.loginBoxX + 180 - 80; - var17 = 321; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Privacy Policy", var4, var17 + 5, 16777215, 0); - var4 = Login.loginBoxX + 180 + 80; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Back", var4, var17 + 5, 16777215, 0); - } else if (Login.loginIndex == 12) { - var22 = 201; - String var21 = ""; - var5 = ""; - var19 = ""; - switch(Login.field1212) { - case 0: - var21 = "Your account has been disabled."; - var5 = Strings.field2845; - var19 = ""; - break; - case 1: - var21 = "Account locked as we suspect it has been stolen."; - var5 = Strings.field2856; - var19 = ""; - break; - default: - WorldMapRectangle.Login_promptCredentials(false); - } - - var0.drawCentered(var21, Login.loginBoxX + 180, var22, 16776960, 0); - var23 = var22 + 15; - var2.drawCentered(var5, Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var2.drawCentered(var19, Login.loginBoxX + 180, var23, 16776960, 0); - var23 += 15; - var7 = Login.loginBoxX + 180; - var20 = 276; - Fonts.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Support Page", var7, var20 + 5, 16777215, 0); - var7 = Login.loginBoxX + 180; - var20 = 326; - Fonts.titlebuttonSprite.drawAt(var7 - 73, var20 - 20); - var0.drawCentered("Back", var7, var20 + 5, 16777215, 0); - } else if (Login.loginIndex == 24) { - var22 = 221; - var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var22, 16777215, 0); - var23 = var22 + 15; - var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var23, 16777215, 0); - var23 += 15; - var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var23, 16777215, 0); - var23 += 15; - var4 = Login.loginBoxX + 180; - var17 = 301; - Fonts.titlebuttonSprite.drawAt(var4 - 73, var17 - 20); - var0.drawCentered("Ok", var4, var17 + 5, 16777215, 0); - } - } - } - } - - if (Client.gameState >= 10) { - int[] var18 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var18); - Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, class52.canvasHeight); - Login.loginScreenRunesAnimation.draw(Login.xPadding - 22, Client.cycle); - Login.loginScreenRunesAnimation.draw(Login.xPadding + 22 + 765 - 128, Client.cycle); - Rasterizer2D.Rasterizer2D_setClipArray(var18); - } - - Decimator.title_muteSprite[NetSocket.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463); - if (Client.gameState > 5 && UserComparator9.clientLanguage == Language.Language_EN) { - if (WorldMapIcon_1.field206 != null) { - var23 = Login.xPadding + 5; - var24 = 463; - byte var28 = 100; - byte var25 = 35; - WorldMapIcon_1.field206.drawAt(var23, var24); - var0.drawCentered("World" + " " + Client.worldId, var28 / 2 + var23, var25 / 2 + var24 - 2, 16777215, 0); - if (VertexNormal.World_request != null) { - var1.drawCentered("Loading...", var28 / 2 + var23, var25 / 2 + var24 + 12, 16777215, 0); - } else { - var1.drawCentered("Click to switch", var28 / 2 + var23, var25 / 2 + var24 + 12, 16777215, 0); - } - } else { - WorldMapIcon_1.field206 = class329.SpriteBuffer_getIndexedSpriteByName(GrandExchangeEvent.archive8, "sl_button", ""); - } - } - - } + static int method1845(int var0, int var1) { + long var2 = (long)((var0 << 16) + var1); // L: 313 + return TilePaint.NetCache_currentResponse != null && var2 == TilePaint.NetCache_currentResponse.key ? class224.NetCache_responseArchiveBuffer.offset * 99 / (class224.NetCache_responseArchiveBuffer.array.length - TilePaint.NetCache_currentResponse.padding) + 1 : 0; // L: 314 315 } } diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 64d4f76e7d..5e29e605c4 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -10,1433 +10,1430 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ma") +@ObfuscatedName("mx") @Implements("WorldMap") public class WorldMap { - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkz;" ) @Export("fontNameVerdana11") static final FontName fontNameVerdana11; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkz;" ) @Export("fontNameVerdana13") static final FontName fontNameVerdana13; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Lke;" + descriptor = "Lkz;" ) @Export("fontNameVerdana15") static final FontName fontNameVerdana15; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("WorldMap_archive") AbstractArchive WorldMap_archive; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("WorldMap_geographyArchive") AbstractArchive WorldMap_geographyArchive; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("WorldMap_groundArchive") AbstractArchive WorldMap_groundArchive; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "Lko;" + descriptor = "Lkr;" ) @Export("font") Font font; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("fonts") HashMap fonts; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "[Llh;" + descriptor = "[Lls;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("r") + @ObfuscatedName("c") @Export("details") HashMap details; - @ObfuscatedName("s") + @ObfuscatedName("f") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Lar;" ) @Export("mainMapArea") WorldMapArea mainMapArea; - @ObfuscatedName("v") + @ObfuscatedName("y") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Lar;" ) @Export("currentMapArea") WorldMapArea currentMapArea; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedSignature( - descriptor = "Lad;" + descriptor = "Lar;" ) - WorldMapArea field3984; - @ObfuscatedName("e") + WorldMapArea field3995; + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lai;" ) @Export("worldMapManager") WorldMapManager worldMapManager; - @ObfuscatedName("l") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "Lml;" + descriptor = "Lmd;" ) @Export("cacheLoader") WorldMapArchiveLoader cacheLoader; - @ObfuscatedName("t") + @ObfuscatedName("u") @ObfuscatedGetter( - intValue = -477044905 + intValue = -611163949 ) @Export("centerTileX") int centerTileX; - @ObfuscatedName("x") + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -2103634789 + intValue = -1065399067 ) @Export("centerTileY") int centerTileY; @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -1027821819 + intValue = -681769299 ) @Export("worldMapTargetX") int worldMapTargetX; - @ObfuscatedName("i") + @ObfuscatedName("l") @ObfuscatedGetter( - intValue = -921409869 + intValue = -1693054595 ) @Export("worldMapTargetY") int worldMapTargetY; - @ObfuscatedName("f") + @ObfuscatedName("e") @Export("zoom") float zoom; - @ObfuscatedName("ah") + @ObfuscatedName("ab") @Export("zoomTarget") float zoomTarget; - @ObfuscatedName("ai") + @ObfuscatedName("ag") @ObfuscatedGetter( - intValue = 356289309 + intValue = 1569686885 ) @Export("worldMapDisplayWidth") int worldMapDisplayWidth; @ObfuscatedName("ao") @ObfuscatedGetter( - intValue = -733670243 + intValue = 358605679 ) @Export("worldMapDisplayHeight") int worldMapDisplayHeight; @ObfuscatedName("ae") @ObfuscatedGetter( - intValue = -1490793911 + intValue = -2122847541 ) @Export("worldMapDisplayX") int worldMapDisplayX; - @ObfuscatedName("ax") + @ObfuscatedName("an") @ObfuscatedGetter( - intValue = -1155375327 + intValue = -2116246555 ) @Export("worldMapDisplayY") int worldMapDisplayY; - @ObfuscatedName("ag") + @ObfuscatedName("am") @ObfuscatedGetter( - intValue = 414730673 + intValue = 52853051 ) @Export("maxFlashCount") int maxFlashCount; - @ObfuscatedName("ab") + @ObfuscatedName("ap") @ObfuscatedGetter( - intValue = -1380461053 + intValue = 1639517063 ) @Export("cyclesPerFlash") int cyclesPerFlash; - @ObfuscatedName("am") + @ObfuscatedName("au") @Export("perpetualFlash") boolean perpetualFlash; - @ObfuscatedName("ak") + @ObfuscatedName("aa") @Export("flashingElements") HashSet flashingElements; - @ObfuscatedName("ad") + @ObfuscatedName("ar") @ObfuscatedGetter( - intValue = 1899094841 + intValue = 1602251249 ) @Export("flashCount") int flashCount; - @ObfuscatedName("as") + @ObfuscatedName("at") @ObfuscatedGetter( - intValue = -2123119613 + intValue = -1930209769 ) @Export("flashCycle") int flashCycle; - @ObfuscatedName("ar") + @ObfuscatedName("aq") @ObfuscatedGetter( - intValue = -879818821 + intValue = -2046405399 ) - int field4014; - @ObfuscatedName("ap") - @ObfuscatedGetter( - intValue = 1109861733 - ) - int field3975; + int field4037; @ObfuscatedName("al") @ObfuscatedGetter( - intValue = -1756719777 + intValue = -1792714989 ) - int field4005; - @ObfuscatedName("an") + int field4015; + @ObfuscatedName("ah") @ObfuscatedGetter( - intValue = -903365883 + intValue = 517874941 ) - int field4006; - @ObfuscatedName("ac") - @ObfuscatedGetter( - longValue = 684510429086866809L - ) - long field4007; + int field4034; @ObfuscatedName("av") @ObfuscatedGetter( - intValue = 69046583 + intValue = -86397235 ) - int field4008; - @ObfuscatedName("af") + int field4017; + @ObfuscatedName("ax") @ObfuscatedGetter( - intValue = 788734491 + longValue = 599475952816375777L ) - int field4009; - @ObfuscatedName("at") - boolean field4017; + long field4018; + @ObfuscatedName("as") + @ObfuscatedGetter( + intValue = -1972713683 + ) + int field4028; @ObfuscatedName("az") + @ObfuscatedGetter( + intValue = 1655893285 + ) + int field4035; + @ObfuscatedName("ad") + boolean field4021; + @ObfuscatedName("aj") @Export("enabledElements") HashSet enabledElements; - @ObfuscatedName("aq") + @ObfuscatedName("aw") @Export("enabledCategories") HashSet enabledCategories; - @ObfuscatedName("ay") + @ObfuscatedName("af") @Export("enabledElementIds") HashSet enabledElementIds; - @ObfuscatedName("au") - HashSet field4027; - @ObfuscatedName("aj") + @ObfuscatedName("ak") + HashSet field4025; + @ObfuscatedName("ac") @Export("elementsDisabled") boolean elementsDisabled; - @ObfuscatedName("bk") + @ObfuscatedName("bl") @ObfuscatedGetter( - intValue = 668714479 + intValue = -1876166455 ) - int field4016; - @ObfuscatedName("bg") + int field4027; + @ObfuscatedName("bz") @Export("menuOpcodes") final int[] menuOpcodes; - @ObfuscatedName("be") - List field4018; - @ObfuscatedName("bf") + @ObfuscatedName("bj") + List field4029; + @ObfuscatedName("bh") @Export("iconIterator") Iterator iconIterator; - @ObfuscatedName("ba") - HashSet field3978; - @ObfuscatedName("bd") + @ObfuscatedName("bi") + HashSet field4007; + @ObfuscatedName("bg") @ObfuscatedSignature( descriptor = "Lhg;" ) @Export("mouseCoord") Coord mouseCoord; - @ObfuscatedName("bb") + @ObfuscatedName("br") @Export("showCoord") public boolean showCoord; - @ObfuscatedName("bw") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Llp;" ) @Export("sprite") Sprite sprite; - @ObfuscatedName("bq") + @ObfuscatedName("bn") @ObfuscatedGetter( - intValue = 1633365947 + intValue = -1176520287 ) @Export("cachedPixelsPerTile") int cachedPixelsPerTile; - @ObfuscatedName("bn") + @ObfuscatedName("bw") @ObfuscatedGetter( - intValue = -1616979105 + intValue = 627351645 ) @Export("minCachedTileX") int minCachedTileX; - @ObfuscatedName("bc") + @ObfuscatedName("be") @ObfuscatedGetter( - intValue = 780139023 + intValue = 357245399 ) @Export("minCachedTileY") int minCachedTileY; - @ObfuscatedName("bo") + @ObfuscatedName("bu") @ObfuscatedGetter( - intValue = -385601979 + intValue = -486020465 ) - int field3988; + int field4038; static { - fontNameVerdana11 = FontName.FontName_verdana11; - fontNameVerdana13 = FontName.FontName_verdana13; - fontNameVerdana15 = FontName.FontName_verdana15; + fontNameVerdana11 = FontName.FontName_verdana11; // L: 46 + fontNameVerdana13 = FontName.FontName_verdana13; // L: 47 + fontNameVerdana15 = FontName.FontName_verdana15; // L: 48 } public WorldMap() { - this.worldMapTargetX = -1; - this.worldMapTargetY = -1; - this.worldMapDisplayWidth = -1; - this.worldMapDisplayHeight = -1; - this.worldMapDisplayX = -1; - this.worldMapDisplayY = -1; - this.maxFlashCount = 3; - this.cyclesPerFlash = 50; - this.perpetualFlash = false; - this.flashingElements = null; - this.flashCount = -1; - this.flashCycle = -1; - this.field4014 = -1; - this.field3975 = -1; - this.field4005 = -1; - this.field4006 = -1; - this.field4017 = true; - this.enabledElements = new HashSet(); - this.enabledCategories = new HashSet(); - this.enabledElementIds = new HashSet(); - this.field4027 = new HashSet(); - this.elementsDisabled = false; - this.field4016 = 0; - this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; - this.field3978 = new HashSet(); - this.mouseCoord = null; - this.showCoord = false; - this.minCachedTileX = -1; - this.minCachedTileY = -1; - this.field3988 = -1; + this.worldMapTargetX = -1; // L: 60 + this.worldMapTargetY = -1; // L: 61 + this.worldMapDisplayWidth = -1; // L: 64 + this.worldMapDisplayHeight = -1; // L: 65 + this.worldMapDisplayX = -1; // L: 66 + this.worldMapDisplayY = -1; // L: 67 + this.maxFlashCount = 3; // L: 68 + this.cyclesPerFlash = 50; // L: 69 + this.perpetualFlash = false; // L: 70 + this.flashingElements = null; // L: 71 + this.flashCount = -1; // L: 72 + this.flashCycle = -1; // L: 73 + this.field4037 = -1; // L: 74 + this.field4015 = -1; // L: 75 + this.field4034 = -1; // L: 76 + this.field4017 = -1; // L: 77 + this.field4021 = true; // L: 81 + this.enabledElements = new HashSet(); // L: 84 + this.enabledCategories = new HashSet(); // L: 85 + this.enabledElementIds = new HashSet(); // L: 86 + this.field4025 = new HashSet(); // L: 87 + this.elementsDisabled = false; // L: 88 + this.field4027 = 0; // L: 89 + this.menuOpcodes = new int[]{1008, 1009, 1010, 1011, 1012}; // L: 91 + this.field4007 = new HashSet(); // L: 94 + this.mouseCoord = null; // L: 95 + this.showCoord = false; // L: 96 + this.minCachedTileX = -1; // L: 99 + this.minCachedTileY = -1; // L: 100 + this.field4038 = -1; // L: 101 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lic;Lic;Lic;Lko;Ljava/util/HashMap;[Llh;I)V", - garbageValue = "-2031713861" + descriptor = "(Lic;Lic;Lic;Lkr;Ljava/util/HashMap;[Lls;I)V", + garbageValue = "-926248913" ) @Export("init") public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) { - this.mapSceneSprites = var6; - this.WorldMap_archive = var1; - this.WorldMap_geographyArchive = var2; - this.WorldMap_groundArchive = var3; - this.font = var4; - this.fonts = new HashMap(); - this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); - this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); - this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); - this.cacheLoader = new WorldMapArchiveLoader(var1); - int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field322.name); - int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); - this.details = new HashMap(var8.length); + this.mapSceneSprites = var6; // L: 105 + this.WorldMap_archive = var1; // L: 106 + this.WorldMap_geographyArchive = var2; // L: 107 + this.WorldMap_groundArchive = var3; // L: 108 + this.font = var4; // L: 109 + this.fonts = new HashMap(); // L: 110 + this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11)); // L: 111 + this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13)); // L: 112 + this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15)); // L: 113 + this.cacheLoader = new WorldMapArchiveLoader(var1); // L: 114 + int var7 = this.WorldMap_archive.getGroupId(WorldMapCacheName.field322.name); // L: 115 + int[] var8 = this.WorldMap_archive.getGroupFileIds(var7); // L: 116 + this.details = new HashMap(var8.length); // L: 117 - for (int var9 = 0; var9 < var8.length; ++var9) { - Buffer var10 = new Buffer(this.WorldMap_archive.takeFile(var7, var8[var9])); - WorldMapArea var11 = new WorldMapArea(); - var11.read(var10, var8[var9]); - this.details.put(var11.getInternalName(), var11); - if (var11.getIsMain()) { - this.mainMapArea = var11; + for (int var9 = 0; var9 < var8.length; ++var9) { // L: 118 + Buffer var10 = new Buffer(this.WorldMap_archive.takeFile(var7, var8[var9])); // L: 119 + WorldMapArea var11 = new WorldMapArea(); // L: 120 + var11.read(var10, var8[var9]); // L: 121 + this.details.put(var11.getInternalName(), var11); // L: 122 + if (var11.getIsMain()) { // L: 123 + this.mainMapArea = var11; // L: 124 } } - this.setCurrentMapArea(this.mainMapArea); - this.field3984 = null; - } + this.setCurrentMapArea(this.mainMapArea); // L: 127 + this.field3995 = null; // L: 128 + } // L: 129 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "19" + descriptor = "(I)V", + garbageValue = "680469506" ) - public void method6696() { - Players.method2274(); - } + public void method6428() { + WorldMapRegion.WorldMapRegion_cachedSprites.demote(5); // L: 133 + } // L: 135 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(IIZIIIII)V", - garbageValue = "2116125643" + garbageValue = "-1994141756" ) @Export("onCycle") public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) { - if (this.cacheLoader.isLoaded()) { - this.smoothZoom(); - this.scrollToTarget(); - if (var3) { - int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); - int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); - List var10 = this.worldMapManager.method695(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); - HashSet var11 = new HashSet(); + if (this.cacheLoader.isLoaded()) { // L: 138 + this.smoothZoom(); // L: 141 + this.scrollToTarget(); // L: 142 + if (var3) { // L: 143 + int var8 = (int)Math.ceil((double)((float)var6 / this.zoom)); // L: 146 + int var9 = (int)Math.ceil((double)((float)var7 / this.zoom)); // L: 147 + List var10 = this.worldMapManager.method721(this.centerTileX - var8 / 2 - 1, this.centerTileY - var9 / 2 - 1, var8 / 2 + this.centerTileX + 1, var9 / 2 + this.centerTileY + 1, var4, var5, var6, var7, var1, var2); // L: 148 + HashSet var11 = new HashSet(); // L: 149 Iterator var12; AbstractWorldMapIcon var13; ScriptEvent var14; WorldMapEvent var15; - for (var12 = var10.iterator(); var12.hasNext(); InterfaceParent.runScriptEvent(var14)) { - var13 = (AbstractWorldMapIcon)var12.next(); - var11.add(var13); - var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); - var14.setArgs(new Object[]{var15, var1, var2}); - if (this.field3978.contains(var13)) { - var14.setType(17); + for (var12 = var10.iterator(); var12.hasNext(); Script.runScriptEvent(var14)) { // L: 150 163 + var13 = (AbstractWorldMapIcon)var12.next(); // L: 151 + var11.add(var13); // L: 153 + var14 = new ScriptEvent(); // L: 154 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 155 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 156 + if (this.field4007.contains(var13)) { // L: 157 + var14.setType(17); // L: 158 } else { - var14.setType(15); + var14.setType(15); // L: 161 } } - var12 = this.field3978.iterator(); + var12 = this.field4007.iterator(); // L: 166 while (var12.hasNext()) { - var13 = (AbstractWorldMapIcon)var12.next(); - if (!var11.contains(var13)) { - var14 = new ScriptEvent(); - var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); - var14.setArgs(new Object[]{var15, var1, var2}); - var14.setType(16); - InterfaceParent.runScriptEvent(var14); + var13 = (AbstractWorldMapIcon)var12.next(); // L: 167 + if (!var11.contains(var13)) { // L: 169 + var14 = new ScriptEvent(); // L: 170 + var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2); // L: 171 + var14.setArgs(new Object[]{var15, var1, var2}); // L: 172 + var14.setType(16); // L: 173 + Script.runScriptEvent(var14); // L: 174 } } - this.field3978 = var11; + this.field4007 = var11; // L: 178 } } - } + } // L: 139 144 179 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIZZB)V", - garbageValue = "69" + garbageValue = "81" ) - public void method6693(int var1, int var2, boolean var3, boolean var4) { - long var5 = MilliClock.currentTimeMillis(); - this.method6525(var1, var2, var4, var5); - if (!this.hasTarget() && (var4 || var3)) { - if (var4) { - this.field4005 = var1; - this.field4006 = var2; - this.field4014 = this.centerTileX; - this.field3975 = this.centerTileY; - } - - if (this.field4014 != -1) { - int var7 = var1 - this.field4005; - int var8 = var2 - this.field4006; - this.setWorldMapPosition(this.field4014 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field3975, false); - } + public void method6430(int var1, int var2, boolean var3, boolean var4) { + long var5 = PacketWriter.currentTimeMillis(); // L: 182 + this.method6431(var1, var2, var4, var5); // L: 183 + if (this.hasTarget() || !var4 && !var3) { // L: 184 + this.method6439(); // L: 198 } else { - this.method6529(); + if (var4) { // L: 185 + this.field4034 = var1; // L: 186 + this.field4017 = var2; // L: 187 + this.field4037 = this.centerTileX; // L: 188 + this.field4015 = this.centerTileY; // L: 189 + } + + if (this.field4037 != -1) { // L: 191 + int var7 = var1 - this.field4034; // L: 192 + int var8 = var2 - this.field4017; // L: 193 + this.setWorldMapPosition(this.field4037 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field4015, false); // L: 194 + } } - if (var4) { - this.field4007 = var5; - this.field4008 = var1; - this.field4009 = var2; + if (var4) { // L: 200 + this.field4018 = var5; // L: 201 + this.field4028 = var1; // L: 202 + this.field4035 = var2; // L: 203 } - } + } // L: 205 - @ObfuscatedName("p") - void method6525(int var1, int var2, boolean var3, long var4) { - if (this.currentMapArea != null) { - int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); - int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); - this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); - if (this.mouseCoord != null && var3) { - boolean var8 = Client.staffModLevel >= 2; - if (var8 && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { - GrandExchangeOffer.method191(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); + @ObfuscatedName("i") + void method6431(int var1, int var2, boolean var3, long var4) { + if (this.currentMapArea != null) { // L: 208 + int var6 = (int)((float)this.centerTileX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom); // L: 209 + int var7 = (int)((float)this.centerTileY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom); // L: 210 + this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.getRegionLowX() * 64, var7 + this.currentMapArea.getRegionLowY() * 64); // L: 211 + if (this.mouseCoord != null && var3) { // L: 212 + if (JagexCache.method3576() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) { // L: 213 + class92.method2143(this.mouseCoord.x, this.mouseCoord.y, this.mouseCoord.plane, false); // L: 214 } else { - boolean var9 = true; - if (this.field4017) { - int var10 = var1 - this.field4008; - int var11 = var2 - this.field4009; - if (var4 - this.field4007 > 500L || var10 < -25 || var10 > 25 || var11 < -25 || var11 > 25) { - var9 = false; + boolean var8 = true; // L: 217 + if (this.field4021) { // L: 218 + int var9 = var1 - this.field4028; // L: 219 + int var10 = var2 - this.field4035; // L: 220 + if (var4 - this.field4018 > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) { // L: 221 + var8 = false; // L: 222 } } - if (var9) { - PacketBufferNode var12 = UserComparator4.getPacketBufferNode(ClientPacket.field2333, Client.packetWriter.isaacCipher); - var12.packetBuffer.method5764(this.mouseCoord.packed()); - Client.packetWriter.addNode(var12); - this.field4007 = 0L; + if (var8) { // L: 225 + PacketBufferNode var11 = Client.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); // L: 226 + var11.packetBuffer.writeInt(this.mouseCoord.packed()); // L: 227 + Client.packetWriter.addNode(var11); // L: 228 + this.field4018 = 0L; // L: 229 } } } } else { - this.mouseCoord = null; + this.mouseCoord = null; // L: 234 } - } + } // L: 235 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "422650301" + garbageValue = "1666598951" ) @Export("smoothZoom") void smoothZoom() { - if (class278.field3585 != null) { - this.zoom = this.zoomTarget; + if (ModelData0.field1901 != null) { // L: 238 + this.zoom = this.zoomTarget; // L: 239 } else { - if (this.zoom < this.zoomTarget) { - this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); + if (this.zoom < this.zoomTarget) { // L: 242 + this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom); // L: 243 } - if (this.zoom > this.zoomTarget) { - this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); + if (this.zoom > this.zoomTarget) { // L: 245 + this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F); // L: 246 } } + } // L: 240 248 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "1" + ) + @Export("scrollToTarget") + void scrollToTarget() { + if (this.hasTarget()) { // L: 251 + int var1 = this.worldMapTargetX - this.centerTileX; // L: 254 + int var2 = this.worldMapTargetY - this.centerTileY; // L: 255 + if (var1 != 0) { // L: 256 + var1 /= Math.min(8, Math.abs(var1)); // L: 257 + } + + if (var2 != 0) { // L: 259 + var2 /= Math.min(8, Math.abs(var2)); // L: 260 + } + + this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); // L: 262 + if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { // L: 263 + this.worldMapTargetX = -1; // L: 264 + this.worldMapTargetY = -1; // L: 265 + } + + } + } // L: 252 267 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIZI)V", + garbageValue = "1721878015" + ) + @Export("setWorldMapPosition") + final void setWorldMapPosition(int var1, int var2, boolean var3) { + this.centerTileX = var1; // L: 270 + this.centerTileY = var2; // L: 271 + PacketWriter.currentTimeMillis(); // L: 272 + if (var3) { + this.method6439(); // L: 273 + } + + } // L: 274 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-29" + ) + final void method6439() { + this.field4017 = -1; // L: 277 + this.field4034 = -1; // L: 278 + this.field4015 = -1; // L: 279 + this.field4037 = -1; // L: 280 + } // L: 281 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "2112762378" + ) + @Export("hasTarget") + boolean hasTarget() { + return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; // L: 284 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2119991272" - ) - @Export("scrollToTarget") - void scrollToTarget() { - if (this.hasTarget()) { - int var1 = this.worldMapTargetX - this.centerTileX; - int var2 = this.worldMapTargetY - this.centerTileY; - if (var1 != 0) { - var1 /= Math.min(8, Math.abs(var1)); - } - - if (var2 != 0) { - var2 /= Math.min(8, Math.abs(var2)); - } - - this.setWorldMapPosition(var1 + this.centerTileX, var2 + this.centerTileY, true); - if (this.worldMapTargetX == this.centerTileX && this.centerTileY == this.worldMapTargetY) { - this.worldMapTargetX = -1; - this.worldMapTargetY = -1; - } - - } - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IIZB)V", - garbageValue = "83" - ) - @Export("setWorldMapPosition") - final void setWorldMapPosition(int var1, int var2, boolean var3) { - this.centerTileX = var1; - this.centerTileY = var2; - MilliClock.currentTimeMillis(); - if (var3) { - this.method6529(); - } - - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1330915767" - ) - final void method6529() { - this.field4006 = -1; - this.field4005 = -1; - this.field3975 = -1; - this.field4014 = -1; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2089729451" - ) - @Export("hasTarget") - boolean hasTarget() { - return this.worldMapTargetX != -1 && this.worldMapTargetY != -1; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(IIII)Lad;", - garbageValue = "-342923578" + descriptor = "(IIIB)Lar;", + garbageValue = "-8" ) @Export("mapAreaAtCoord") public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) { - Iterator var4 = this.details.values().iterator(); + Iterator var4 = this.details.values().iterator(); // L: 288 WorldMapArea var5; do { if (!var4.hasNext()) { - return null; + return null; // L: 296 } - var5 = (WorldMapArea)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); + var5 = (WorldMapArea)var4.next(); // L: 289 + } while(!var5.containsCoord(var1, var2, var3)); // L: 291 - return var5; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(IIIZI)V", - garbageValue = "-1486444716" - ) - public void method6532(int var1, int var2, int var3, boolean var4) { - WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); - if (var5 == null) { - if (!var4) { - return; - } - - var5 = this.mainMapArea; - } - - boolean var6 = false; - if (var5 != this.field3984 || var4) { - this.field3984 = var5; - this.setCurrentMapArea(var5); - var6 = true; - } - - if (var6 || var4) { - this.jump(var1, var2, var3); - } - - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-1476612822" - ) - @Export("setCurrentMapAreaId") - public void setCurrentMapAreaId(int var1) { - WorldMapArea var2 = this.getMapArea(var1); - if (var2 != null) { - this.setCurrentMapArea(var2); - } - - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "96" - ) - @Export("currentMapAreaId") - public int currentMapAreaId() { - return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); - } - - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(I)Lad;", - garbageValue = "-434939978" - ) - @Export("getCurrentMapArea") - public WorldMapArea getCurrentMapArea() { - return this.currentMapArea; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(Lad;I)V", - garbageValue = "1435320921" - ) - @Export("setCurrentMapArea") - void setCurrentMapArea(WorldMapArea var1) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMapManager(var1); - this.jump(-1, -1, -1); - } + return var5; // L: 292 } @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lad;I)V", - garbageValue = "1169619542" + descriptor = "(IIIZI)V", + garbageValue = "1089137052" + ) + public void method6482(int var1, int var2, int var3, boolean var4) { + WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3); // L: 300 + if (var5 == null) { // L: 301 + if (!var4) { // L: 302 + return; // L: 305 + } + + var5 = this.mainMapArea; // L: 303 + } + + boolean var6 = false; // L: 307 + if (var5 != this.field3995 || var4) { // L: 308 + this.field3995 = var5; // L: 309 + this.setCurrentMapArea(var5); // L: 310 + var6 = true; // L: 311 + } + + if (var6 || var4) { // L: 313 + this.jump(var1, var2, var3); // L: 314 + } + + } // L: 316 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-5" + ) + @Export("setCurrentMapAreaId") + public void setCurrentMapAreaId(int var1) { + WorldMapArea var2 = this.getMapArea(var1); // L: 319 + if (var2 != null) { // L: 320 + this.setCurrentMapArea(var2); // L: 321 + } + + } // L: 323 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(B)I", + garbageValue = "84" + ) + @Export("currentMapAreaId") + public int currentMapAreaId() { + return this.currentMapArea == null ? -1 : this.currentMapArea.getId(); // L: 326 327 329 + } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(B)Lar;", + garbageValue = "-64" + ) + @Export("getCurrentMapArea") + public WorldMapArea getCurrentMapArea() { + return this.currentMapArea; // L: 333 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(Lar;I)V", + garbageValue = "65867668" + ) + @Export("setCurrentMapArea") + void setCurrentMapArea(WorldMapArea var1) { + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 337 + this.initializeWorldMapManager(var1); // L: 340 + this.jump(-1, -1, -1); // L: 341 + } + } // L: 338 342 + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(Lar;I)V", + garbageValue = "-1701354489" ) @Export("initializeWorldMapManager") void initializeWorldMapManager(WorldMapArea var1) { - this.currentMapArea = var1; - this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); - this.cacheLoader.reset(this.currentMapArea.getInternalName()); - } + this.currentMapArea = var1; // L: 345 + this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.WorldMap_geographyArchive, this.WorldMap_groundArchive); // L: 346 + this.cacheLoader.reset(this.currentMapArea.getInternalName()); // L: 347 + } // L: 348 - @ObfuscatedName("e") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(Lad;Lhg;Lhg;ZB)V", - garbageValue = "-3" + descriptor = "(Lar;Lhg;Lhg;ZB)V", + garbageValue = "65" ) - public void method6538(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { - if (var1 != null) { - if (this.currentMapArea == null || var1 != this.currentMapArea) { - this.initializeWorldMapManager(var1); + public void method6549(WorldMapArea var1, Coord var2, Coord var3, boolean var4) { + if (var1 != null) { // L: 351 + if (this.currentMapArea == null || var1 != this.currentMapArea) { // L: 354 + this.initializeWorldMapManager(var1); // L: 355 } - if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { - this.jump(var2.plane, var2.x, var2.y); + if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) { // L: 357 + this.jump(var2.plane, var2.x, var2.y); // L: 361 } else { - this.jump(var3.plane, var3.x, var3.y); + this.jump(var3.plane, var3.x, var3.y); // L: 358 } } + } // L: 352 363 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "-6" + ) + @Export("jump") + void jump(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 366 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 369 + if (var4 == null) { // L: 370 + var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); // L: 371 + } + + this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); // L: 373 + this.worldMapTargetX = -1; // L: 374 + this.worldMapTargetY = -1; // L: 375 + this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); // L: 376 + this.zoomTarget = this.zoom; // L: 377 + this.field4029 = null; // L: 378 + this.iconIterator = null; // L: 379 + this.worldMapManager.clearIcons(); // L: 380 + } + } // L: 367 381 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "1145142542" + ) + @Export("draw") + public void draw(int var1, int var2, int var3, int var4, int var5) { + int[] var6 = new int[4]; // L: 384 + Rasterizer2D.Rasterizer2D_getClipArray(var6); // L: 385 + Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); // L: 386 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 387 + int var7 = this.cacheLoader.getPercentLoaded(); // L: 388 + if (var7 < 100) { // L: 389 + this.drawLoading(var1, var2, var3, var4, var7); // L: 390 + } else { + if (!this.worldMapManager.isLoaded()) { // L: 393 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 394 + if (!this.worldMapManager.isLoaded()) { // L: 395 + return; // L: 396 + } + } + + if (this.flashingElements != null) { // L: 399 + ++this.flashCycle; // L: 400 + if (this.flashCycle % this.cyclesPerFlash == 0) { // L: 401 + this.flashCycle = 0; // L: 402 + ++this.flashCount; // L: 403 + } + + if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { // L: 405 + this.flashingElements = null; // L: 406 + } + } + + int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 409 + int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 410 + this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); // L: 411 + if (!this.elementsDisabled) { // L: 412 + boolean var10 = false; // L: 413 + if (var5 - this.field4027 > 100) { // L: 414 + this.field4027 = var5; // L: 415 + var10 = true; // L: 416 + } + + this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4025, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); // L: 418 + } + + this.method6448(var1, var2, var3, var4, var8, var9); // L: 420 + if (JagexCache.method3576() && this.showCoord && this.mouseCoord != null) { // L: 421 + this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); + } + + this.worldMapDisplayWidth = var8; // L: 422 + this.worldMapDisplayHeight = var9; // L: 423 + this.worldMapDisplayX = var1; // L: 424 + this.worldMapDisplayY = var2; // L: 425 + Rasterizer2D.Rasterizer2D_setClipArray(var6); // L: 426 + } + } // L: 391 427 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IIIIIII)Z", + garbageValue = "-1751443053" + ) + boolean method6447(int var1, int var2, int var3, int var4, int var5, int var6) { + if (this.sprite == null) { // L: 430 + return true; + } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { // L: 431 + if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { // L: 432 + return true; + } else if (this.field4038 != Client.field946) { // L: 433 + return true; + } else if (var3 <= 0 && var4 <= 0) { // L: 434 + return var3 + var1 < var5 || var2 + var4 < var6; // L: 435 + } else { + return true; // L: 436 + } + } else { + return true; + } } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "662676533" + descriptor = "(IIIIIII)V", + garbageValue = "1983443961" ) - @Export("jump") - void jump(int var1, int var2, int var3) { - if (this.currentMapArea != null) { - int[] var4 = this.currentMapArea.position(var1, var2, var3); - if (var4 == null) { - var4 = this.currentMapArea.position(this.currentMapArea.getOriginPlane(), this.currentMapArea.getOriginX(), this.currentMapArea.getOriginY()); - } - - this.setWorldMapPosition(var4[0] - this.currentMapArea.getRegionLowX() * 64, var4[1] - this.currentMapArea.getRegionLowY() * 64, true); - this.worldMapTargetX = -1; - this.worldMapTargetY = -1; - this.zoom = this.getZoomFromPercentage(this.currentMapArea.getZoom()); - this.zoomTarget = this.zoom; - this.field4018 = null; - this.iconIterator = null; - this.worldMapManager.clearIcons(); - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "45" - ) - @Export("draw") - public void draw(int var1, int var2, int var3, int var4, int var5) { - int[] var6 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var6); - Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4); - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); - int var7 = this.cacheLoader.getPercentLoaded(); - if (var7 < 100) { - this.drawLoading(var1, var2, var3, var4, var7); - } else { - if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); - if (!this.worldMapManager.isLoaded()) { - return; - } - } - - if (this.flashingElements != null) { - ++this.flashCycle; - if (this.flashCycle % this.cyclesPerFlash == 0) { - this.flashCycle = 0; - ++this.flashCount; - } - - if (this.flashCount >= this.maxFlashCount && !this.perpetualFlash) { - this.flashingElements = null; - } - } - - int var8 = (int)Math.ceil((double)((float)var3 / this.zoom)); - int var9 = (int)Math.ceil((double)((float)var4 / this.zoom)); - this.worldMapManager.drawTiles(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4); - boolean var10; - if (!this.elementsDisabled) { - var10 = false; - if (var5 - this.field4016 > 100) { - this.field4016 = var5; - var10 = true; - } - - this.worldMapManager.drawElements(this.centerTileX - var8 / 2, this.centerTileY - var9 / 2, var8 / 2 + this.centerTileX, var9 / 2 + this.centerTileY, var1, var2, var3 + var1, var2 + var4, this.field4027, this.flashingElements, this.flashCycle, this.cyclesPerFlash, var10); - } - - this.method6603(var1, var2, var3, var4, var8, var9); - var10 = Client.staffModLevel >= 2; - if (var10 && this.showCoord && this.mouseCoord != null) { - this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1); - } - - this.worldMapDisplayWidth = var8; - this.worldMapDisplayHeight = var9; - this.worldMapDisplayX = var1; - this.worldMapDisplayY = var2; - Rasterizer2D.Rasterizer2D_setClipArray(var6); - } - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IIIIIII)Z", - garbageValue = "1450598957" - ) - boolean method6565(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.sprite == null) { - return true; - } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { - if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { - return true; - } else if (this.field3988 != Client.field942) { - return true; - } else if (var3 <= 0 && var4 <= 0) { - return var3 + var1 < var5 || var2 + var4 < var6; - } else { - return true; - } - } else { - return true; - } - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IIIIIIB)V", - garbageValue = "0" - ) - void method6603(int var1, int var2, int var3, int var4, int var5, int var6) { - if (class278.field3585 != null) { - int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); - int var8 = var3 + 512; - int var9 = var4 + 512; - float var10 = 1.0F; - var8 = (int)((float)var8 / var10); - var9 = (int)((float)var9 / var10); - int var11 = this.getDisplayX() - var5 / 2 - var7; - int var12 = this.getDisplayY() - var6 / 2 - var7; - int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; - int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); - if (this.method6565(var8, var9, var13, var14, var3, var4)) { - if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { - Arrays.fill(this.sprite.pixels, 0); + void method6448(int var1, int var2, int var3, int var4, int var5, int var6) { + if (ModelData0.field1901 != null) { // L: 440 + int var7 = 512 / (this.worldMapManager.pixelsPerTile * 2); // L: 441 + int var8 = var3 + 512; // L: 442 + int var9 = var4 + 512; // L: 443 + float var10 = 1.0F; // L: 444 + var8 = (int)((float)var8 / var10); // L: 445 + var9 = (int)((float)var9 / var10); // L: 446 + int var11 = this.getDisplayX() - var5 / 2 - var7; // L: 447 + int var12 = this.getDisplayY() - var6 / 2 - var7; // L: 448 + int var13 = var1 - (var7 + var11 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 449 + int var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 450 + if (this.method6447(var8, var9, var13, var14, var3, var4)) { // L: 451 + if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) { // L: 452 + Arrays.fill(this.sprite.pixels, 0); // L: 455 } else { - this.sprite = new Sprite(var8, var9); + this.sprite = new Sprite(var8, var9); // L: 453 } - this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; - this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; - this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; - class278.field3585.method4490(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); - this.field3988 = Client.field942; - var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; - var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); + this.minCachedTileX = this.getDisplayX() - var5 / 2 - var7; // L: 456 + this.minCachedTileY = this.getDisplayY() - var6 / 2 - var7; // L: 457 + this.cachedPixelsPerTile = this.worldMapManager.pixelsPerTile; // L: 458 + ModelData0.field1901.method4410(this.minCachedTileX, this.minCachedTileY, this.sprite, (float)this.cachedPixelsPerTile / var10); // L: 459 + this.field4038 = Client.field946; // L: 460 + var13 = var1 - (var11 + var7 - this.minCachedTileX) * this.worldMapManager.pixelsPerTile; // L: 461 + var14 = var2 - this.worldMapManager.pixelsPerTile * (var7 - (var12 - this.minCachedTileY)); // L: 462 } - Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); - if (1.0F == var10) { - this.sprite.method6337(var13, var14, 192); + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); // L: 464 + if (var10 == 1.0F) { // L: 465 + this.sprite.method6260(var13, var14, 192); // L: 466 } else { - this.sprite.method6366(var13, var14, (int)(var10 * (float)var8), (int)(var10 * (float)var9), 192); + this.sprite.method6278(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192); // L: 469 } } - } + } // L: 472 - @ObfuscatedName("ai") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "371539895" + descriptor = "(IIIIB)V", + garbageValue = "-31" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4) { - if (this.cacheLoader.isLoaded()) { - if (!this.worldMapManager.isLoaded()) { - this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); - if (!this.worldMapManager.isLoaded()) { - return; + if (this.cacheLoader.isLoaded()) { // L: 475 + if (!this.worldMapManager.isLoaded()) { // L: 478 + this.worldMapManager.load(this.WorldMap_archive, this.currentMapArea.getInternalName(), Client.isMembersWorld); // L: 479 + if (!this.worldMapManager.isLoaded()) { // L: 480 + return; // L: 481 } } - this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); + this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.flashCycle, this.cyclesPerFlash); // L: 484 } - } + } // L: 476 485 - @ObfuscatedName("ao") + @ObfuscatedName("ab") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "2046053399" + garbageValue = "-1877509796" ) @Export("setZoomPercentage") public void setZoomPercentage(int var1) { - this.zoomTarget = this.getZoomFromPercentage(var1); + this.zoomTarget = this.getZoomFromPercentage(var1); // L: 488 + } // L: 489 + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(IIIIII)V", + garbageValue = "-1108867958" + ) + @Export("drawLoading") + void drawLoading(int var1, int var2, int var3, int var4, int var5) { + byte var6 = 20; // L: 492 + int var7 = var3 / 2 + var1; // L: 493 + int var8 = var4 / 2 + var2 - 18 - var6; // L: 494 + Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); // L: 495 + Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); // L: 496 + Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); // L: 497 + this.font.drawCentered("Loading...", var7, var8 + var6, -1, -1); // L: 498 + } // L: 499 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(IB)F", + garbageValue = "55" + ) + @Export("getZoomFromPercentage") + float getZoomFromPercentage(int var1) { + if (var1 == 25) { // L: 502 + return 1.0F; + } else if (var1 == 37) { // L: 503 + return 1.5F; + } else if (var1 == 50) { + return 2.0F; // L: 504 + } else if (var1 == 75) { // L: 505 + return 3.0F; + } else { + return var1 == 100 ? 4.0F : 8.0F; // L: 506 507 + } } @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(IIIIII)V", - garbageValue = "-911619085" - ) - @Export("drawLoading") - void drawLoading(int var1, int var2, int var3, int var4, int var5) { - byte var6 = 20; - int var7 = var3 / 2 + var1; - int var8 = var4 / 2 + var2 - 18 - var6; - Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216); - Rasterizer2D.Rasterizer2D_drawRectangle(var7 - 152, var8, 304, 34, -65536); - Rasterizer2D.Rasterizer2D_fillRectangle(var7 - 150, var8 + 2, var5 * 3, 30, -65536); - this.font.drawCentered("Loading...", var7, var6 + var8, -1, -1); - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(II)F", - garbageValue = "-101273681" - ) - @Export("getZoomFromPercentage") - float getZoomFromPercentage(int var1) { - if (var1 == 25) { - return 1.0F; - } else if (var1 == 37) { - return 1.5F; - } else if (var1 == 50) { - return 2.0F; - } else if (var1 == 75) { - return 3.0F; - } else { - return var1 == 100 ? 4.0F : 8.0F; - } - } - - @ObfuscatedName("ag") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1432703186" + garbageValue = "-1167531031" ) @Export("getZoomLevel") public int getZoomLevel() { - if (1.0D == (double)this.zoomTarget) { + if (1.0D == (double)this.zoomTarget) { // L: 511 return 25; - } else if ((double)this.zoomTarget == 1.5D) { + } else if (1.5D == (double)this.zoomTarget) { // L: 512 return 37; - } else if ((double)this.zoomTarget == 2.0D) { + } else if ((double)this.zoomTarget == 2.0D) { // L: 513 return 50; - } else if (3.0D == (double)this.zoomTarget) { - return 75; + } else if ((double)this.zoomTarget == 3.0D) { + return 75; // L: 514 } else { - return (double)this.zoomTarget == 4.0D ? 100 : 200; - } - } - - @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-344269271" - ) - @Export("loadCache") - public void loadCache() { - this.cacheLoader.load(); - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2083683127" - ) - @Export("isCacheLoaded") - public boolean isCacheLoaded() { - return this.cacheLoader.isLoaded(); - } - - @ObfuscatedName("ak") - @ObfuscatedSignature( - descriptor = "(II)Lad;", - garbageValue = "173267923" - ) - @Export("getMapArea") - public WorldMapArea getMapArea(int var1) { - Iterator var2 = this.details.values().iterator(); - - WorldMapArea var3; - do { - if (!var2.hasNext()) { - return null; - } - - var3 = (WorldMapArea)var2.next(); - } while(var3.getId() != var1); - - return var3; - } - - @ObfuscatedName("ad") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "124476569" - ) - @Export("setWorldMapPositionTarget") - public void setWorldMapPositionTarget(int var1, int var2) { - if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { - this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; - this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; - } - } - - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "796383009" - ) - @Export("setWorldMapPositionTargetInstant") - public void setWorldMapPositionTargetInstant(int var1, int var2) { - if (this.currentMapArea != null) { - this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); - this.worldMapTargetX = -1; - this.worldMapTargetY = -1; - } - } - - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(IIIB)V", - garbageValue = "-86" - ) - @Export("jumpToSourceCoord") - public void jumpToSourceCoord(int var1, int var2, int var3) { - if (this.currentMapArea != null) { - int[] var4 = this.currentMapArea.position(var1, var2, var3); - if (var4 != null) { - this.setWorldMapPositionTarget(var4[0], var4[1]); - } - + return (double)this.zoomTarget == 4.0D ? 100 : 200; // L: 515 516 } } @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IIII)V", - garbageValue = "1641941372" + descriptor = "(I)V", + garbageValue = "-1132818911" ) - @Export("jumpToSourceCoordInstant") - public void jumpToSourceCoordInstant(int var1, int var2, int var3) { - if (this.currentMapArea != null) { - int[] var4 = this.currentMapArea.position(var1, var2, var3); - if (var4 != null) { - this.setWorldMapPositionTargetInstant(var4[0], var4[1]); + @Export("loadCache") + public void loadCache() { + this.cacheLoader.load(); // L: 520 + } // L: 521 + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-683321726" + ) + @Export("isCacheLoaded") + public boolean isCacheLoaded() { + return this.cacheLoader.isLoaded(); // L: 524 + } + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(II)Lar;", + garbageValue = "-1578034984" + ) + @Export("getMapArea") + public WorldMapArea getMapArea(int var1) { + Iterator var2 = this.details.values().iterator(); // L: 528 + + WorldMapArea var3; + do { + if (!var2.hasNext()) { + return null; // L: 536 + } + + var3 = (WorldMapArea)var2.next(); // L: 529 + } while(var3.getId() != var1); // L: 531 + + return var3; // L: 532 + } + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-1263582707" + ) + @Export("setWorldMapPositionTarget") + public void setWorldMapPositionTarget(int var1, int var2) { + if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) { // L: 540 + this.worldMapTargetX = var1 - this.currentMapArea.getRegionLowX() * 64; // L: 543 + this.worldMapTargetY = var2 - this.currentMapArea.getRegionLowY() * 64; // L: 544 + } + } // L: 541 545 + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-39" + ) + @Export("setWorldMapPositionTargetInstant") + public void setWorldMapPositionTargetInstant(int var1, int var2) { + if (this.currentMapArea != null) { // L: 548 + this.setWorldMapPosition(var1 - this.currentMapArea.getRegionLowX() * 64, var2 - this.currentMapArea.getRegionLowY() * 64, true); // L: 551 + this.worldMapTargetX = -1; // L: 552 + this.worldMapTargetY = -1; // L: 553 + } + } // L: 549 554 + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "1993790921" + ) + @Export("jumpToSourceCoord") + public void jumpToSourceCoord(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 557 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 560 + if (var4 != null) { // L: 561 + this.setWorldMapPositionTarget(var4[0], var4[1]); // L: 562 } } - } + } // L: 558 564 @ObfuscatedName("al") + @ObfuscatedSignature( + descriptor = "(IIII)V", + garbageValue = "-367968117" + ) + @Export("jumpToSourceCoordInstant") + public void jumpToSourceCoordInstant(int var1, int var2, int var3) { + if (this.currentMapArea != null) { // L: 567 + int[] var4 = this.currentMapArea.position(var1, var2, var3); // L: 570 + if (var4 != null) { // L: 571 + this.setWorldMapPositionTargetInstant(var4[0], var4[1]); // L: 572 + } + + } + } // L: 568 574 + + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-2103537124" + garbageValue = "1157589126" ) @Export("getDisplayX") public int getDisplayX() { - return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; - } - - @ObfuscatedName("an") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "692721192" - ) - @Export("getDisplayY") - public int getDisplayY() { - return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; - } - - @ObfuscatedName("ac") - @ObfuscatedSignature( - descriptor = "(I)Lhg;", - garbageValue = "-1863746595" - ) - @Export("getDisplayCoord") - public Coord getDisplayCoord() { - return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); + return this.currentMapArea == null ? -1 : this.centerTileX + this.currentMapArea.getRegionLowX() * 64; // L: 577 578 580 } @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1645904359" + garbageValue = "423694608" + ) + @Export("getDisplayY") + public int getDisplayY() { + return this.currentMapArea == null ? -1 : this.centerTileY + this.currentMapArea.getRegionLowY() * 64; // L: 584 585 587 + } + + @ObfuscatedName("ax") + @ObfuscatedSignature( + descriptor = "(I)Lhg;", + garbageValue = "1327996030" + ) + @Export("getDisplayCoord") + public Coord getDisplayCoord() { + return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY()); // L: 591 592 594 + } + + @ObfuscatedName("as") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-1261786031" ) @Export("getDisplayWith") public int getDisplayWith() { - return this.worldMapDisplayWidth; - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1582823724" - ) - @Export("getDisplayHeight") - public int getDisplayHeight() { - return this.worldMapDisplayHeight; - } - - @ObfuscatedName("at") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "1740193117" - ) - @Export("setMaxFlashCount") - public void setMaxFlashCount(int var1) { - if (var1 >= 1) { - this.maxFlashCount = var1; - } - - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-316454776" - ) - @Export("resetMaxFlashCount") - public void resetMaxFlashCount() { - this.maxFlashCount = 3; - } - - @ObfuscatedName("aw") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "51" - ) - @Export("setCyclesPerFlash") - public void setCyclesPerFlash(int var1) { - if (var1 >= 1) { - this.cyclesPerFlash = var1; - } - + return this.worldMapDisplayWidth; // L: 598 } @ObfuscatedName("az") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2071944062" + descriptor = "(I)I", + garbageValue = "-2040090881" ) - @Export("resetCyclesPerFlash") - public void resetCyclesPerFlash() { - this.cyclesPerFlash = 50; + @Export("getDisplayHeight") + public int getDisplayHeight() { + return this.worldMapDisplayHeight; // L: 602 } - @ObfuscatedName("aq") + @ObfuscatedName("ad") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-999392835" + descriptor = "(IB)V", + garbageValue = "-83" ) - @Export("setPerpetualFlash") - public void setPerpetualFlash(boolean var1) { - this.perpetualFlash = var1; - } + @Export("setMaxFlashCount") + public void setMaxFlashCount(int var1) { + if (var1 >= 1) { // L: 606 + this.maxFlashCount = var1; // L: 607 + } + + } // L: 609 + + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "119" + ) + @Export("resetMaxFlashCount") + public void resetMaxFlashCount() { + this.maxFlashCount = 3; // L: 612 + } // L: 613 @ObfuscatedName("ay") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "106" - ) - @Export("flashElement") - public void flashElement(int var1) { - this.flashingElements = new HashSet(); - this.flashingElements.add(var1); - this.flashCount = 0; - this.flashCycle = 0; - } - - @ObfuscatedName("au") @ObfuscatedSignature( descriptor = "(II)V", - garbageValue = "-1070811489" + garbageValue = "147371535" ) - @Export("flashCategory") - public void flashCategory(int var1) { - this.flashingElements = new HashSet(); - this.flashCount = 0; - this.flashCycle = 0; - - for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { - if (Client.WorldMapElement_get(var2) != null && Client.WorldMapElement_get(var2).category == var1) { - this.flashingElements.add(Client.WorldMapElement_get(var2).objectId); - } + @Export("setCyclesPerFlash") + public void setCyclesPerFlash(int var1) { + if (var1 >= 1) { // L: 616 + this.cyclesPerFlash = var1; // L: 617 } - } + } // L: 619 @ObfuscatedName("aj") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "8454016" + garbageValue = "561976387" + ) + @Export("resetCyclesPerFlash") + public void resetCyclesPerFlash() { + this.cyclesPerFlash = 50; // L: 622 + } // L: 623 + + @ObfuscatedName("aw") + @ObfuscatedSignature( + descriptor = "(ZB)V", + garbageValue = "36" + ) + @Export("setPerpetualFlash") + public void setPerpetualFlash(boolean var1) { + this.perpetualFlash = var1; // L: 626 + } // L: 627 + + @ObfuscatedName("af") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "-1" + ) + @Export("flashElement") + public void flashElement(int var1) { + this.flashingElements = new HashSet(); // L: 630 + this.flashingElements.add(var1); // L: 631 + this.flashCount = 0; // L: 632 + this.flashCycle = 0; // L: 633 + } // L: 634 + + @ObfuscatedName("ak") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "0" + ) + @Export("flashCategory") + public void flashCategory(int var1) { + this.flashingElements = new HashSet(); // L: 637 + this.flashCount = 0; // L: 638 + this.flashCycle = 0; // L: 639 + + for (int var2 = 0; var2 < WorldMapElement.WorldMapElement_count; ++var2) { // L: 640 + if (WorldMapSection0.WorldMapElement_get(var2) != null && WorldMapSection0.WorldMapElement_get(var2).category == var1) { // L: 641 644 + this.flashingElements.add(WorldMapSection0.WorldMapElement_get(var2).objectId); // L: 645 + } + } + + } // L: 648 + + @ObfuscatedName("ac") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "578188764" ) @Export("stopCurrentFlashes") public void stopCurrentFlashes() { - this.flashingElements = null; - } + this.flashingElements = null; // L: 651 + } // L: 652 - @ObfuscatedName("bk") + @ObfuscatedName("bl") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-74185669" + garbageValue = "-805542752" ) @Export("setElementsDisabled") public void setElementsDisabled(boolean var1) { - this.elementsDisabled = !var1; - } + this.elementsDisabled = !var1; // L: 655 + } // L: 656 - @ObfuscatedName("bh") + @ObfuscatedName("bc") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "1502020559" + descriptor = "(IZS)V", + garbageValue = "5539" ) @Export("disableElement") public void disableElement(int var1, boolean var2) { - if (!var2) { - this.enabledElements.add(var1); + if (!var2) { // L: 659 + this.enabledElements.add(var1); // L: 660 } else { - this.enabledElements.remove(var1); + this.enabledElements.remove(var1); // L: 663 } - this.method6573(); - } + this.method6480(); // L: 665 + } // L: 666 - @ObfuscatedName("bg") + @ObfuscatedName("bz") @ObfuscatedSignature( - descriptor = "(IZI)V", - garbageValue = "-324596356" + descriptor = "(IZS)V", + garbageValue = "3311" ) @Export("setCategoryDisabled") public void setCategoryDisabled(int var1, boolean var2) { - if (!var2) { - this.enabledCategories.add(var1); + if (!var2) { // L: 669 + this.enabledCategories.add(var1); // L: 670 } else { - this.enabledCategories.remove(var1); + this.enabledCategories.remove(var1); // L: 673 } - for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { - if (Client.WorldMapElement_get(var3) != null && Client.WorldMapElement_get(var3).category == var1) { - int var4 = Client.WorldMapElement_get(var3).objectId; - if (!var2) { - this.enabledElementIds.add(var4); + for (int var3 = 0; var3 < WorldMapElement.WorldMapElement_count; ++var3) { // L: 675 + if (WorldMapSection0.WorldMapElement_get(var3) != null && WorldMapSection0.WorldMapElement_get(var3).category == var1) { // L: 676 679 + int var4 = WorldMapSection0.WorldMapElement_get(var3).objectId; // L: 680 + if (!var2) { // L: 681 + this.enabledElementIds.add(var4); // L: 682 } else { - this.enabledElementIds.remove(var4); + this.enabledElementIds.remove(var4); // L: 685 } } } - this.method6573(); - } + this.method6480(); // L: 689 + } // L: 690 - @ObfuscatedName("be") + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "-45" + descriptor = "(I)Z", + garbageValue = "-1921316185" ) @Export("getElementsDisabled") public boolean getElementsDisabled() { - return !this.elementsDisabled; + return !this.elementsDisabled; // L: 693 } - @ObfuscatedName("bf") + @ObfuscatedName("bh") @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "-10758" + descriptor = "(II)Z", + garbageValue = "1781251597" ) @Export("isElementDisabled") public boolean isElementDisabled(int var1) { - return !this.enabledElements.contains(var1); + return !this.enabledElements.contains(var1); // L: 697 } - @ObfuscatedName("ba") + @ObfuscatedName("bi") @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "24518" + descriptor = "(II)Z", + garbageValue = "1674259718" ) @Export("isCategoryDisabled") public boolean isCategoryDisabled(int var1) { - return !this.enabledCategories.contains(var1); + return !this.enabledCategories.contains(var1); // L: 701 } - @ObfuscatedName("bd") + @ObfuscatedName("bg") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "32" + descriptor = "(I)V", + garbageValue = "1574604658" ) - void method6573() { - this.field4027.clear(); - this.field4027.addAll(this.enabledElements); - this.field4027.addAll(this.enabledElementIds); - } + void method6480() { + this.field4025.clear(); // L: 705 + this.field4025.addAll(this.enabledElements); // L: 706 + this.field4025.addAll(this.enabledElementIds); // L: 707 + } // L: 708 - @ObfuscatedName("bb") + @ObfuscatedName("br") @ObfuscatedSignature( descriptor = "(IIIIIIB)V", - garbageValue = "-102" + garbageValue = "49" ) @Export("addElementMenuOptions") public void addElementMenuOptions(int var1, int var2, int var3, int var4, int var5, int var6) { - if (this.cacheLoader.isLoaded()) { - int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); - int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); - List var9 = this.worldMapManager.method695(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); - if (!var9.isEmpty()) { + if (this.cacheLoader.isLoaded()) { // L: 711 + int var7 = (int)Math.ceil((double)((float)var3 / this.zoom)); // L: 714 + int var8 = (int)Math.ceil((double)((float)var4 / this.zoom)); // L: 715 + List var9 = this.worldMapManager.method721(this.centerTileX - var7 / 2 - 1, this.centerTileY - var8 / 2 - 1, var7 / 2 + this.centerTileX + 1, var8 / 2 + this.centerTileY + 1, var1, var2, var3, var4, var5, var6); // L: 716 + if (!var9.isEmpty()) { // L: 717 Iterator var10 = var9.iterator(); boolean var13; do { - if (!var10.hasNext()) { - return; + if (!var10.hasNext()) { // L: 720 + return; // L: 736 } - AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); - WorldMapElement var12 = Client.WorldMapElement_get(var11.getElement()); - var13 = false; + AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next(); // L: 721 + WorldMapElement var12 = WorldMapSection0.WorldMapElement_get(var11.getElement()); // L: 723 + var13 = false; // L: 724 - for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { - if (var12.menuActions[var14] != null) { - ScriptEvent.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); - var13 = true; + for (int var14 = this.menuOpcodes.length - 1; var14 >= 0; --var14) { // L: 725 + if (var12.menuActions[var14] != null) { // L: 726 + StructDefinition.insertMenuItemNoShift(var12.menuActions[var14], var12.menuTargetName, this.menuOpcodes[var14], var11.getElement(), var11.coord1.packed(), var11.coord2.packed()); // L: 727 + var13 = true; // L: 728 } } - } while(!var13); + } while(!var13); // L: 731 } } - } + } // L: 712 718 732 - @ObfuscatedName("bw") + @ObfuscatedName("bp") @ObfuscatedSignature( - descriptor = "(ILhg;I)Lhg;", - garbageValue = "-1210676807" + descriptor = "(ILhg;S)Lhg;", + garbageValue = "11767" ) - public Coord method6575(int var1, Coord var2) { - if (!this.cacheLoader.isLoaded()) { - return null; - } else if (!this.worldMapManager.isLoaded()) { - return null; - } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { - return null; + public Coord method6507(int var1, Coord var2) { + if (!this.cacheLoader.isLoaded()) { // L: 739 + return null; // L: 740 + } else if (!this.worldMapManager.isLoaded()) { // L: 742 + return null; // L: 743 + } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { // L: 745 + return null; // L: 746 } else { - HashMap var3 = this.worldMapManager.buildIcons(); - List var4 = (List)var3.get(var1); - if (var4 != null && !var4.isEmpty()) { - AbstractWorldMapIcon var5 = null; - int var6 = -1; - Iterator var7 = var4.iterator(); + HashMap var3 = this.worldMapManager.buildIcons(); // L: 748 + List var4 = (List)var3.get(var1); // L: 749 + if (var4 != null && !var4.isEmpty()) { // L: 750 + AbstractWorldMapIcon var5 = null; // L: 753 + int var6 = -1; // L: 754 + Iterator var7 = var4.iterator(); // L: 755 while (true) { AbstractWorldMapIcon var8; int var11; do { if (!var7.hasNext()) { - return var5.coord2; + return var5.coord2; // L: 770 } - var8 = (AbstractWorldMapIcon)var7.next(); - int var9 = var8.coord2.x - var2.x; - int var10 = var8.coord2.y - var2.y; - var11 = var9 * var9 + var10 * var10; - if (var11 == 0) { - return var8.coord2; + var8 = (AbstractWorldMapIcon)var7.next(); // L: 756 + int var9 = var8.coord2.x - var2.x; // L: 758 + int var10 = var8.coord2.y - var2.y; // L: 759 + var11 = var10 * var10 + var9 * var9; // L: 760 + if (var11 == 0) { // L: 761 + return var8.coord2; // L: 762 } - } while(var11 >= var6 && var5 != null); + } while(var11 >= var6 && var5 != null); // L: 764 - var5 = var8; - var6 = var11; + var5 = var8; // L: 765 + var6 = var11; // L: 766 } } else { - return null; + return null; // L: 751 } } } - @ObfuscatedName("bq") - @ObfuscatedSignature( - descriptor = "(IILhg;Lhg;I)V", - garbageValue = "346883599" - ) - @Export("worldMapMenuAction") - public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { - ScriptEvent var5 = new ScriptEvent(); - WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); - var5.setArgs(new Object[]{var6}); - switch(var1) { - case 1008: - var5.setType(10); - break; - case 1009: - var5.setType(11); - break; - case 1010: - var5.setType(12); - break; - case 1011: - var5.setType(13); - break; - case 1012: - var5.setType(14); - } - - InterfaceParent.runScriptEvent(var5); - } - @ObfuscatedName("bn") @ObfuscatedSignature( - descriptor = "(I)Laf;", - garbageValue = "-1116444098" + descriptor = "(IILhg;Lhg;I)V", + garbageValue = "-2008216886" + ) + @Export("worldMapMenuAction") + public void worldMapMenuAction(int var1, int var2, Coord var3, Coord var4) { + ScriptEvent var5 = new ScriptEvent(); // L: 774 + WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4); // L: 775 + var5.setArgs(new Object[]{var6}); // L: 776 + switch(var1) { // L: 777 + case 1008: + var5.setType(10); // L: 780 + break; + case 1009: + var5.setType(11); // L: 790 + break; // L: 791 + case 1010: + var5.setType(12); // L: 800 + break; + case 1011: + var5.setType(13); // L: 795 + break; // L: 796 + case 1012: + var5.setType(14); // L: 785 + } + + Script.runScriptEvent(var5); // L: 804 + } // L: 805 + + @ObfuscatedName("bw") + @ObfuscatedSignature( + descriptor = "(I)Laz;", + garbageValue = "-710181196" ) @Export("iconStart") public AbstractWorldMapIcon iconStart() { - if (!this.cacheLoader.isLoaded()) { - return null; - } else if (!this.worldMapManager.isLoaded()) { - return null; + if (!this.cacheLoader.isLoaded()) { // L: 808 + return null; // L: 809 + } else if (!this.worldMapManager.isLoaded()) { // L: 811 + return null; // L: 812 } else { - HashMap var1 = this.worldMapManager.buildIcons(); - this.field4018 = new LinkedList(); - Iterator var2 = var1.values().iterator(); + HashMap var1 = this.worldMapManager.buildIcons(); // L: 814 + this.field4029 = new LinkedList(); // L: 815 + Iterator var2 = var1.values().iterator(); // L: 816 while (var2.hasNext()) { - List var3 = (List)var2.next(); - this.field4018.addAll(var3); + List var3 = (List)var2.next(); // L: 817 + this.field4029.addAll(var3); // L: 819 } - this.iconIterator = this.field4018.iterator(); - return this.iconNext(); + this.iconIterator = this.field4029.iterator(); // L: 822 + return this.iconNext(); // L: 823 } } - @ObfuscatedName("bc") + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "(B)Laf;", - garbageValue = "-42" + descriptor = "(S)Laz;", + garbageValue = "-2586" ) @Export("iconNext") public AbstractWorldMapIcon iconNext() { - if (this.iconIterator == null) { - return null; + if (this.iconIterator == null) { // L: 827 + return null; // L: 828 } else { AbstractWorldMapIcon var1; do { - if (!this.iconIterator.hasNext()) { - return null; + if (!this.iconIterator.hasNext()) { // L: 830 + return null; // L: 836 } - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); - } while(var1.getElement() == -1); + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); // L: 831 + } while(var1.getElement() == -1); // L: 832 - return var1; + return var1; // L: 833 } } } diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java index 35ea39f7f8..cae31e4bd6 100644 --- a/runescape-client/src/main/java/WorldMapArchiveLoader.java +++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java @@ -4,25 +4,25 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ml") +@ObfuscatedName("md") @Implements("WorldMapArchiveLoader") public class WorldMapArchiveLoader { - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("cacheName") String cacheName; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("archive") AbstractArchive archive; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1583552183 + intValue = 2018598251 ) @Export("percentLoaded") int percentLoaded; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("loaded") boolean loaded; @@ -30,80 +30,80 @@ public class WorldMapArchiveLoader { descriptor = "(Lic;)V" ) WorldMapArchiveLoader(AbstractArchive var1) { - this.percentLoaded = 0; - this.loaded = false; - this.archive = var1; - } + this.percentLoaded = 0; // L: 13 + this.loaded = false; // L: 14 + this.archive = var1; // L: 17 + } // L: 18 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(Ljava/lang/String;I)V", - garbageValue = "796588704" + garbageValue = "1155527039" ) @Export("reset") void reset(String var1) { - if (var1 != null && !var1.isEmpty()) { - if (var1 != this.cacheName) { - this.cacheName = var1; - this.percentLoaded = 0; - this.loaded = false; - this.load(); + if (var1 != null && !var1.isEmpty()) { // L: 21 + if (var1 != this.cacheName) { // L: 24 + this.cacheName = var1; // L: 27 + this.percentLoaded = 0; // L: 28 + this.loaded = false; // L: 29 + this.load(); // L: 30 } } - } + } // L: 22 25 31 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1901724660" + garbageValue = "-739480731" ) @Export("load") int load() { - if (this.percentLoaded < 33) { - if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field325.name, this.cacheName)) { - return this.percentLoaded; + if (this.percentLoaded < 33) { // L: 34 + if (!this.archive.tryLoadFileByNames(WorldMapCacheName.field318.name, this.cacheName)) { // L: 35 + return this.percentLoaded; // L: 36 } - this.percentLoaded = 33; + this.percentLoaded = 33; // L: 38 } - if (this.percentLoaded == 33) { - if (this.archive.isValidFileName(WorldMapCacheName.field324.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field324.name, this.cacheName)) { - return this.percentLoaded; + if (this.percentLoaded == 33) { // L: 40 + if (this.archive.isValidFileName(WorldMapCacheName.field327.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.field327.name, this.cacheName)) { // L: 41 42 + return this.percentLoaded; // L: 43 } - this.percentLoaded = 66; + this.percentLoaded = 66; // L: 46 } - if (this.percentLoaded == 66) { - if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field326.name)) { - return this.percentLoaded; + if (this.percentLoaded == 66) { // L: 48 + if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.field321.name)) { // L: 49 + return this.percentLoaded; // L: 50 } - this.percentLoaded = 100; - this.loaded = true; + this.percentLoaded = 100; // L: 52 + this.loaded = true; // L: 53 } - return this.percentLoaded; + return this.percentLoaded; // L: 55 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)Z", - garbageValue = "-1377768408" + garbageValue = "-337934116" ) @Export("isLoaded") boolean isLoaded() { - return this.loaded; + return this.loaded; // L: 59 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1099667221" + descriptor = "(B)I", + garbageValue = "-64" ) @Export("getPercentLoaded") int getPercentLoaded() { - return this.percentLoaded; + return this.percentLoaded; // L: 63 } } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index cd4b048470..382fd63d92 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -5,187 +5,190 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ad") +@ObfuscatedName("ar") @Implements("WorldMapArea") public class WorldMapArea { - @ObfuscatedName("aa") - @Export("hasFocus") - protected static boolean hasFocus; - @ObfuscatedName("m") + @ObfuscatedName("sk") + @ObfuscatedSignature( + descriptor = "Lmr;" + ) + @Export("platformInfo") + static PlatformInfo platformInfo; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -102714047 + intValue = -2004467599 ) @Export("id") int id; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("internalName") String internalName; - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("externalName") String externalName; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2008440325 + intValue = 173771503 ) @Export("backGroundColor") int backGroundColor; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -776340421 + intValue = -1585723591 ) @Export("zoom") int zoom; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "Lhg;" ) @Export("origin") Coord origin; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -1184938719 + intValue = -2050801149 ) @Export("regionLowX") int regionLowX; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 1321973801 + intValue = 1803706305 ) @Export("regionHighX") int regionHighX; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 1250553257 + intValue = 2137946489 ) @Export("regionLowY") int regionLowY; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 464294365 + intValue = 1133866307 ) @Export("regionHighY") int regionHighY; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("isMain") boolean isMain; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("sections") LinkedList sections; public WorldMapArea() { - this.id = -1; - this.backGroundColor = -1; - this.zoom = -1; - this.origin = null; - this.regionLowX = Integer.MAX_VALUE; - this.regionHighX = 0; - this.regionLowY = Integer.MAX_VALUE; - this.regionHighY = 0; - this.isMain = false; + this.id = -1; // L: 9 + this.backGroundColor = -1; // L: 12 + this.zoom = -1; // L: 13 + this.origin = null; // L: 14 + this.regionLowX = Integer.MAX_VALUE; // L: 15 + this.regionHighX = 0; // L: 16 + this.regionLowY = Integer.MAX_VALUE; // L: 17 + this.regionHighY = 0; // L: 18 + this.isMain = false; // L: 19 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "1711579729" + descriptor = "(Lkf;IB)V", + garbageValue = "24" ) @Export("read") public void read(Buffer var1, int var2) { - this.id = var2; - this.internalName = var1.readStringCp1252NullTerminated(); - this.externalName = var1.readStringCp1252NullTerminated(); - this.origin = new Coord(var1.readInt()); - this.backGroundColor = var1.readInt(); - var1.readUnsignedByte(); - this.isMain = var1.readUnsignedByte() == 1; - this.zoom = var1.readUnsignedByte(); - int var3 = var1.readUnsignedByte(); - this.sections = new LinkedList(); + this.id = var2; // L: 23 + this.internalName = var1.readStringCp1252NullTerminated(); // L: 24 + this.externalName = var1.readStringCp1252NullTerminated(); // L: 25 + this.origin = new Coord(var1.readInt()); // L: 26 + this.backGroundColor = var1.readInt(); // L: 27 + var1.readUnsignedByte(); // L: 28 + this.isMain = var1.readUnsignedByte() == 1; // L: 29 + this.zoom = var1.readUnsignedByte(); // L: 30 + int var3 = var1.readUnsignedByte(); // L: 31 + this.sections = new LinkedList(); // L: 32 - for (int var4 = 0; var4 < var3; ++var4) { - this.sections.add(this.readWorldMapSection(var1)); + for (int var4 = 0; var4 < var3; ++var4) { // L: 33 + this.sections.add(this.readWorldMapSection(var1)); // L: 34 } - this.setBounds(); - } + this.setBounds(); // L: 36 + } // L: 37 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;B)Law;", - garbageValue = "-69" + descriptor = "(Lkf;B)Lay;", + garbageValue = "-55" ) @Export("readWorldMapSection") WorldMapSection readWorldMapSection(Buffer var1) { - int var2 = var1.readUnsignedByte(); - WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE3}; - WorldMapSectionType var4 = (WorldMapSectionType)FaceNormal.findEnumerated(var3, var2); - Object var5 = null; - switch(var4.type) { + int var2 = var1.readUnsignedByte(); // L: 40 + WorldMapSectionType var3 = (WorldMapSectionType)TextureProvider.findEnumerated(WorldMapSectionType.method327(), var2); // L: 41 + Object var4 = null; // L: 42 + switch(var3.type) { // L: 43 case 0: - var5 = new WorldMapSection1(); + var4 = new WorldMapSection3(); // L: 45 break; case 1: - var5 = new WorldMapSection3(); - break; + var4 = new WorldMapSection1(); // L: 51 + break; // L: 52 case 2: - var5 = new WorldMapSection0(); - break; + var4 = new WorldMapSection2(); // L: 48 + break; // L: 49 case 3: - var5 = new WorldMapSection2(); + var4 = new WorldMapSection0(); break; default: throw new IllegalStateException(""); } - ((WorldMapSection)var5).read(var1); - return (WorldMapSection)var5; + ((WorldMapSection)var4).read(var1); // L: 59 + return (WorldMapSection)var4; } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIII)Z", - garbageValue = "303739781" + descriptor = "(IIIB)Z", + garbageValue = "31" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); + Iterator var4 = this.sections.iterator(); // L: 64 WorldMapSection var5; do { if (!var4.hasNext()) { - return false; + return false; // L: 72 } - var5 = (WorldMapSection)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); + var5 = (WorldMapSection)var4.next(); // L: 65 + } while(!var5.containsCoord(var1, var2, var3)); // L: 67 - return true; + return true; // L: 68 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIB)Z", - garbageValue = "111" + garbageValue = "118" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - int var3 = var1 / 64; - int var4 = var2 / 64; - if (var3 >= this.regionLowX && var3 <= this.regionHighX) { - if (var4 >= this.regionLowY && var4 <= this.regionHighY) { - Iterator var5 = this.sections.iterator(); + int var3 = var1 / 64; // L: 76 + int var4 = var2 / 64; // L: 77 + if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78 + if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79 + Iterator var5 = this.sections.iterator(); // L: 80 WorldMapSection var6; do { if (!var5.hasNext()) { - return false; + return false; // L: 88 } - var6 = (WorldMapSection)var5.next(); - } while(!var6.containsPosition(var1, var2)); + var6 = (WorldMapSection)var5.next(); // L: 81 + } while(!var6.containsPosition(var1, var2)); // L: 83 - return true; + return true; // L: 84 } else { return false; } @@ -194,214 +197,355 @@ public class WorldMapArea { } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "1838178690" + garbageValue = "-1676257391" ) @Export("position") public int[] position(int var1, int var2, int var3) { - Iterator var4 = this.sections.iterator(); + Iterator var4 = this.sections.iterator(); // L: 92 WorldMapSection var5; do { - if (!var4.hasNext()) { - return null; + if (!var4.hasNext()) { // L: 99 + return null; // L: 100 } - var5 = (WorldMapSection)var4.next(); - } while(!var5.containsCoord(var1, var2, var3)); + var5 = (WorldMapSection)var4.next(); // L: 93 + } while(!var5.containsCoord(var1, var2, var3)); // L: 95 - return var5.getBorderTileLengths(var1, var2, var3); + return var5.getBorderTileLengths(var1, var2, var3); // L: 96 } - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(III)Lhg;", - garbageValue = "-1660127351" + garbageValue = "788821782" ) @Export("coord") public Coord coord(int var1, int var2) { - Iterator var3 = this.sections.iterator(); + Iterator var3 = this.sections.iterator(); // L: 104 WorldMapSection var4; do { if (!var3.hasNext()) { - return null; + return null; // L: 112 } - var4 = (WorldMapSection)var3.next(); - } while(!var4.containsPosition(var1, var2)); + var4 = (WorldMapSection)var3.next(); // L: 105 + } while(!var4.containsPosition(var1, var2)); // L: 107 - return var4.coord(var1, var2); + return var4.coord(var1, var2); // L: 108 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1087000802" + ) + @Export("setBounds") + void setBounds() { + Iterator var1 = this.sections.iterator(); // L: 116 + + while (var1.hasNext()) { // L: 121 + WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117 + var2.expandBounds(this); // L: 119 + } + + } // L: 122 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "809929326" + ) + @Export("getId") + public int getId() { + return this.id; // L: 125 + } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)Z", + garbageValue = "-1492211356" + ) + @Export("getIsMain") + public boolean getIsMain() { + return this.isMain; // L: 129 + } + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-401502532" + ) + @Export("getInternalName") + public String getInternalName() { + return this.internalName; // L: 133 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "61" - ) - @Export("setBounds") - void setBounds() { - Iterator var1 = this.sections.iterator(); - - while (var1.hasNext()) { - WorldMapSection var2 = (WorldMapSection)var1.next(); - var2.expandBounds(this); - } - - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-659291236" - ) - @Export("getId") - public int getId() { - return this.id; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "-2131690602" - ) - @Export("getIsMain") - public boolean getIsMain() { - return this.isMain; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "-1380863043" - ) - @Export("getInternalName") - public String getInternalName() { - return this.internalName; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "(I)Ljava/lang/String;", - garbageValue = "657919972" + descriptor = "(S)Ljava/lang/String;", + garbageValue = "-32528" ) @Export("getExternalName") public String getExternalName() { - return this.externalName; + return this.externalName; // L: 137 } - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "49" + descriptor = "(I)I", + garbageValue = "194013380" ) @Export("getBackGroundColor") int getBackGroundColor() { - return this.backGroundColor; + return this.backGroundColor; // L: 141 } - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedSignature( descriptor = "(B)I", garbageValue = "24" ) @Export("getZoom") public int getZoom() { - return this.zoom; + return this.zoom; // L: 145 } - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1324174996" + descriptor = "(B)I", + garbageValue = "63" ) @Export("getRegionLowX") public int getRegionLowX() { - return this.regionLowX; + return this.regionLowX; // L: 149 } - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "103" + descriptor = "(I)I", + garbageValue = "-691462213" ) @Export("getRegionHighX") public int getRegionHighX() { - return this.regionHighX; + return this.regionHighX; // L: 153 + } + + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-515564038" + ) + @Export("getRegionLowY") + public int getRegionLowY() { + return this.regionLowY; // L: 157 + } + + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "330383709" + ) + @Export("getRegionHighY") + public int getRegionHighY() { + return this.regionHighY; // L: 161 } @ObfuscatedName("r") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1253585407" - ) - @Export("getRegionLowY") - public int getRegionLowY() { - return this.regionLowY; - } - - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1154975420" - ) - @Export("getRegionHighY") - public int getRegionHighY() { - return this.regionHighY; - } - - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1645493175" + garbageValue = "1099952817" ) @Export("getOriginX") public int getOriginX() { - return this.origin.x; + return this.origin.x; // L: 165 } - @ObfuscatedName("l") + @ObfuscatedName("u") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "680709831" + descriptor = "(B)I", + garbageValue = "8" ) @Export("getOriginPlane") public int getOriginPlane() { - return this.origin.plane; + return this.origin.plane; // L: 169 + } + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2050944019" + ) + @Export("getOriginY") + public int getOriginY() { + return this.origin.y; // L: 173 + } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(B)Lhg;", + garbageValue = "0" + ) + @Export("getOrigin") + public Coord getOrigin() { + return new Coord(this.origin); // L: 177 } @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-734959342" + descriptor = "(I)V", + garbageValue = "-3643334" ) - @Export("getOriginY") - public int getOriginY() { - return this.origin.y; - } + static void method415() { + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { // L: 53 + if (ArchiveDiskActionHandler.field3179 == 0) { // L: 54 + Huffman.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); // L: 55 + Huffman.ArchiveDiskActionHandler_thread.setDaemon(true); // L: 56 + Huffman.ArchiveDiskActionHandler_thread.start(); // L: 57 + Huffman.ArchiveDiskActionHandler_thread.setPriority(5); // L: 58 + } - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(I)Lhg;", - garbageValue = "-1903361332" - ) - @Export("getOrigin") - public Coord getOrigin() { - return new Coord(this.origin); - } + ArchiveDiskActionHandler.field3179 = 600; // L: 60 + } + } // L: 62 - @ObfuscatedName("hf") + @ObfuscatedName("ab") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1010580353" + descriptor = "(ILcy;ZI)I", + garbageValue = "-2119318811" ) - @Export("resumePauseWidget") - static void resumePauseWidget(int var0, int var1) { - PacketBufferNode var2 = UserComparator4.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeInt(var0); - var2.packetBuffer.method5898(var1); - Client.packetWriter.addNode(var2); + static int method485(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CLIENTCLOCK) { // L: 1723 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle; // L: 1724 + return 1; // L: 1725 + } else { + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { // L: 1727 + Interpreter.Interpreter_intStackSize -= 2; // L: 1728 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1729 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1730 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = VarbitDefinition.method4596(var3, var4); // L: 1731 + return 1; // L: 1732 + } else if (var0 == ScriptOpcodes.INV_GETNUM) { // L: 1734 + Interpreter.Interpreter_intStackSize -= 2; // L: 1735 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1736 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1737 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator10.ItemContainer_getCount(var3, var4); // L: 1738 + return 1; // L: 1739 + } else if (var0 == ScriptOpcodes.INV_TOTAL) { // L: 1741 + Interpreter.Interpreter_intStackSize -= 2; // L: 1742 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1743 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1744 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NetSocket.method3628(var3, var4); // L: 1745 + return 1; // L: 1746 + } else if (var0 == ScriptOpcodes.INV_SIZE) { // L: 1748 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1749 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = MusicPatchPcmStream.getInvDefinition(var3).size; // L: 1750 + return 1; // L: 1751 + } else if (var0 == ScriptOpcodes.STAT) { // L: 1753 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1754 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; // L: 1755 + return 1; // L: 1756 + } else if (var0 == ScriptOpcodes.STAT_BASE) { // L: 1758 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1759 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3]; // L: 1760 + return 1; // L: 1761 + } else if (var0 == ScriptOpcodes.STAT_XP) { // L: 1763 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1764 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3]; // L: 1765 + return 1; // L: 1766 + } else { + int var5; + if (var0 == ScriptOpcodes.COORD) { // L: 1768 + var3 = Huffman.Client_plane; // L: 1769 + var4 = (WorldMapLabelSize.localPlayer.x >> 7) + WorldMapManager.baseX; // L: 1770 + var5 = (WorldMapLabelSize.localPlayer.y >> 7) + WorldMapLabel.baseY; // L: 1771 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); // L: 1772 + return 1; // L: 1773 + } else if (var0 == ScriptOpcodes.COORDX) { // L: 1775 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1776 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; // L: 1777 + return 1; // L: 1778 + } else if (var0 == ScriptOpcodes.COORDZ) { // L: 1780 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1781 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28; // L: 1782 + return 1; // L: 1783 + } else if (var0 == ScriptOpcodes.COORDY) { // L: 1785 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1786 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383; // L: 1787 + return 1; // L: 1788 + } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { // L: 1790 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; // L: 1791 + return 1; // L: 1792 + } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { // L: 1794 + Interpreter.Interpreter_intStackSize -= 2; // L: 1795 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1796 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1797 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = VarbitDefinition.method4596(var3, var4); // L: 1798 + return 1; // L: 1799 + } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { // L: 1801 + Interpreter.Interpreter_intStackSize -= 2; // L: 1802 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1803 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1804 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator10.ItemContainer_getCount(var3, var4); // L: 1805 + return 1; // L: 1806 + } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { // L: 1808 + Interpreter.Interpreter_intStackSize -= 2; // L: 1809 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768; // L: 1810 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1811 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = NetSocket.method3628(var3, var4); // L: 1812 + return 1; // L: 1813 + } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { // L: 1815 + if (Client.staffModLevel >= 2) { // L: 1816 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1817 + } + + return 1; // L: 1818 + } else if (var0 == ScriptOpcodes.REBOOTTIMER) { // L: 1820 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer; // L: 1821 + return 1; // L: 1822 + } else if (var0 == ScriptOpcodes.MAP_WORLD) { // L: 1824 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId; // L: 1825 + return 1; // L: 1826 + } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { // L: 1828 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy; // L: 1829 + return 1; // L: 1830 + } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { // L: 1832 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight; // L: 1833 + return 1; // L: 1834 + } else if (var0 == ScriptOpcodes.PLAYERMOD) { // L: 1836 + if (Client.playerMod) { // L: 1837 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1838 + } + + return 1; // L: 1839 + } else if (var0 == ScriptOpcodes.WORLDFLAGS) { // L: 1841 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties; // L: 1842 + return 1; // L: 1843 + } else if (var0 == ScriptOpcodes.MOVECOORD) { // L: 1845 + Interpreter.Interpreter_intStackSize -= 4; // L: 1846 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1847 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1848 + var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1849 + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 1850 + var3 += var4 << 14; // L: 1851 + var3 += var5 << 28; // L: 1852 + var3 += var6; // L: 1853 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3; // L: 1854 + return 1; // L: 1855 + } else { + return 2; // L: 1857 + } + } + } } } diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java index 1fa47cfccc..2c17096934 100644 --- a/runescape-client/src/main/java/WorldMapAreaData.java +++ b/runescape-client/src/main/java/WorldMapAreaData.java @@ -1,209 +1,394 @@ +import java.awt.Component; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("az") +@ObfuscatedName("aj") @Implements("WorldMapAreaData") public class WorldMapAreaData extends WorldMapArea { - @ObfuscatedName("c") + @ObfuscatedName("bi") + @ObfuscatedSignature( + descriptor = "Lmu;" + ) + @Export("loginType") + static LoginType loginType; + @ObfuscatedName("ey") + @ObfuscatedGetter( + intValue = -243088695 + ) + static int field352; + @ObfuscatedName("h") @Export("worldMapData0Set") HashSet worldMapData0Set; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("worldMapData1Set") HashSet worldMapData1Set; - @ObfuscatedName("k") + @ObfuscatedName("q") @Export("iconList") List iconList; WorldMapAreaData() { - } + } // L: 14 - @ObfuscatedName("bs") + @ObfuscatedName("ce") @ObfuscatedSignature( - descriptor = "(Lkn;Lkn;IZI)V", - garbageValue = "442767924" + descriptor = "(Lkf;Lkf;IZB)V", + garbageValue = "1" ) @Export("init") void init(Buffer var1, Buffer var2, int var3, boolean var4) { - this.read(var1, var3); - int var5 = var2.readUnsignedShort(); - this.worldMapData0Set = new HashSet(var5); + this.read(var1, var3); // L: 17 + int var5 = var2.readUnsignedShort(); // L: 18 + this.worldMapData0Set = new HashSet(var5); // L: 19 int var6; - for (var6 = 0; var6 < var5; ++var6) { - WorldMapData_0 var7 = new WorldMapData_0(); + for (var6 = 0; var6 < var5; ++var6) { // L: 20 + WorldMapData_0 var7 = new WorldMapData_0(); // L: 21 try { - var7.init(var2); - } catch (IllegalStateException var12) { - continue; + var7.init(var2); // L: 23 + } catch (IllegalStateException var12) { // L: 25 + continue; // L: 26 } - this.worldMapData0Set.add(var7); + this.worldMapData0Set.add(var7); // L: 28 } - var6 = var2.readUnsignedShort(); - this.worldMapData1Set = new HashSet(var6); + var6 = var2.readUnsignedShort(); // L: 30 + this.worldMapData1Set = new HashSet(var6); // L: 31 - for (int var10 = 0; var10 < var6; ++var10) { - WorldMapData_1 var8 = new WorldMapData_1(); + for (int var10 = 0; var10 < var6; ++var10) { // L: 32 + WorldMapData_1 var8 = new WorldMapData_1(); // L: 33 try { - var8.init(var2); - } catch (IllegalStateException var11) { - continue; + var8.init(var2); // L: 35 + } catch (IllegalStateException var11) { // L: 37 + continue; // L: 38 } - this.worldMapData1Set.add(var8); + this.worldMapData1Set.add(var8); // L: 40 } - this.initIconsList(var2, var4); + this.initIconsList(var2, var4); // L: 42 } - @ObfuscatedName("by") + @ObfuscatedName("cr") @ObfuscatedSignature( - descriptor = "(Lkn;ZI)V", - garbageValue = "-380421071" + descriptor = "(Lkf;ZS)V", + garbageValue = "8691" ) @Export("initIconsList") void initIconsList(Buffer var1, boolean var2) { this.iconList = new LinkedList(); int var3 = var1.readUnsignedShort(); - for (int var4 = 0; var4 < var3; ++var4) { - int var5 = var1.method5843(); - Coord var6 = new Coord(var1.readInt()); - boolean var7 = var1.readUnsignedByte() == 1; - if (var2 || !var7) { - this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); + for (int var4 = 0; var4 < var3; ++var4) { // L: 48 + int var5 = var1.method5634(); // L: 49 + Coord var6 = new Coord(var1.readInt()); // L: 50 + boolean var7 = var1.readUnsignedByte() == 1; // L: 51 + if (var2 || !var7) { // L: 52 + this.iconList.add(new WorldMapIcon_0((Coord)null, var6, var5, (WorldMapLabel)null)); // L: 53 } } - } + } // L: 56 - @ObfuscatedName("j") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "([BI)Lcs;", - garbageValue = "1792640289" + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-681398425" ) - @Export("newScript") - static Script newScript(byte[] var0) { - Script var1 = new Script(); - Buffer var2 = new Buffer(var0); - var2.offset = var2.array.length - 2; - int var3 = var2.readUnsignedShort(); - int var4 = var2.array.length - 2 - var3 - 12; - var2.offset = var4; - int var5 = var2.readInt(); - var1.localIntCount = var2.readUnsignedShort(); - var1.localStringCount = var2.readUnsignedShort(); - var1.intArgumentCount = var2.readUnsignedShort(); - var1.stringArgumentCount = var2.readUnsignedShort(); - int var6 = var2.readUnsignedByte(); - int var7; - int var8; - if (var6 > 0) { - var1.switches = var1.newIterableNodeHashTable(var6); + static void method751(Component var0) { + var0.removeMouseListener(MouseHandler.MouseHandler_instance); // L: 43 + var0.removeMouseMotionListener(MouseHandler.MouseHandler_instance); // L: 44 + var0.removeFocusListener(MouseHandler.MouseHandler_instance); // L: 45 + MouseHandler.MouseHandler_currentButtonVolatile = 0; // L: 46 + } // L: 47 - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2.readUnsignedShort(); - int var9; - int var11; - if (var8 > 0) { - var11 = var8 - 1; - var11 |= var11 >>> 1; - var11 |= var11 >>> 2; - var11 |= var11 >>> 4; - var11 |= var11 >>> 8; - var11 |= var11 >>> 16; - int var10 = var11 + 1; - var9 = var10; - } else { - var9 = 1; - } - - IterableNodeHashTable var13 = new IterableNodeHashTable(var9); - var1.switches[var7] = var13; - - while (var8-- > 0) { - var11 = var2.readInt(); - int var12 = var2.readInt(); - var13.put(new IntegerNode(var12), (long)var11); - } - } - } - - var2.offset = 0; - var2.readStringCp1252NullTerminatedOrNull(); - var1.opcodes = new int[var5]; - var1.intOperands = new int[var5]; - var1.stringOperands = new String[var5]; - - for (var7 = 0; var2.offset < var4; var1.opcodes[var7++] = var8) { - var8 = var2.readUnsignedShort(); - if (var8 == 3) { - var1.stringOperands[var7] = var2.readStringCp1252NullTerminated(); - } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) { - var1.intOperands[var7] = var2.readInt(); - } else { - var1.intOperands[var7] = var2.readUnsignedByte(); - } - } - - return var1; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;B)I", - garbageValue = "47" - ) - public static int method759(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + var0.charAt(var3); - } - - return var2; - } - - @ObfuscatedName("ic") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(II)Ljava/lang/String;", - garbageValue = "803969817" + garbageValue = "638484007" ) - @Export("formatItemStacks") - static final String formatItemStacks(int var0) { - String var1 = Integer.toString(var0); - - for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { - var1 = var1.substring(0, var2) + "," + var1.substring(var2); - } - - if (var1.length() > 9) { - return " " + ItemContainer.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + ItemContainer.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + ItemContainer.colorStartTag(16776960) + var1 + ""; - } + @Export("colorStartTag") + static String colorStartTag(int var0) { + return ""; // L: 22 } - @ObfuscatedName("kk") + @ObfuscatedName("fr") @ObfuscatedSignature( - descriptor = "(Lhd;B)Ljava/lang/String;", - garbageValue = "-51" + descriptor = "(I)V", + garbageValue = "-1355090288" ) - @Export("Widget_getSpellActionName") - static String Widget_getSpellActionName(Widget var0) { - if (WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var0)) == 0) { + static final void method752() { + int var0; + int var1; + int var2; + int var3; + int var4; + int var5; + if (Client.oculusOrbState == 0) { // L: 3449 + var0 = WorldMapLabelSize.localPlayer.x; // L: 3450 + var1 = WorldMapLabelSize.localPlayer.y; // L: 3451 + if (GrandExchangeOfferWorldComparator.oculusOrbFocalPointX - var0 < -500 || GrandExchangeOfferWorldComparator.oculusOrbFocalPointX - var0 > 500 || MouseHandler.oculusOrbFocalPointY - var1 < -500 || MouseHandler.oculusOrbFocalPointY - var1 > 500) { // L: 3452 + GrandExchangeOfferWorldComparator.oculusOrbFocalPointX = var0; // L: 3453 + MouseHandler.oculusOrbFocalPointY = var1; // L: 3454 + } + + if (var0 != GrandExchangeOfferWorldComparator.oculusOrbFocalPointX) { // L: 3456 + GrandExchangeOfferWorldComparator.oculusOrbFocalPointX += (var0 - GrandExchangeOfferWorldComparator.oculusOrbFocalPointX) / 16; + } + + if (var1 != MouseHandler.oculusOrbFocalPointY) { // L: 3457 + MouseHandler.oculusOrbFocalPointY += (var1 - MouseHandler.oculusOrbFocalPointY) / 16; + } + + var2 = GrandExchangeOfferWorldComparator.oculusOrbFocalPointX >> 7; // L: 3458 + var3 = MouseHandler.oculusOrbFocalPointY >> 7; // L: 3459 + var4 = ArchiveLoader.getTileHeight(GrandExchangeOfferWorldComparator.oculusOrbFocalPointX, MouseHandler.oculusOrbFocalPointY, Huffman.Client_plane); // L: 3460 + var5 = 0; // L: 3461 + int var6; + if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) { // L: 3462 + for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) { // L: 3463 + for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) { // L: 3464 + int var8 = Huffman.Client_plane; // L: 3465 + if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) { // L: 3466 + ++var8; + } + + int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7]; // L: 3467 + if (var9 > var5) { // L: 3468 + var5 = var9; + } + } + } + } + + var6 = var5 * 192; // L: 3472 + if (var6 > 98048) { // L: 3473 + var6 = 98048; + } + + if (var6 < 32768) { // L: 3474 + var6 = 32768; + } + + if (var6 > Client.field762) { // L: 3475 + Client.field762 += (var6 - Client.field762) / 24; + } else if (var6 < Client.field762) { // L: 3476 + Client.field762 += (var6 - Client.field762) / 80; + } + + class7.field40 = ArchiveLoader.getTileHeight(WorldMapLabelSize.localPlayer.x, WorldMapLabelSize.localPlayer.y, Huffman.Client_plane) - Client.camFollowHeight; // L: 3477 + } else if (Client.oculusOrbState == 1) { // L: 3479 + if (Client.field759 && WorldMapLabelSize.localPlayer != null) { // L: 3481 + var0 = WorldMapLabelSize.localPlayer.pathX[0]; // L: 3482 + var1 = WorldMapLabelSize.localPlayer.pathY[0]; // L: 3483 + if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) { // L: 3484 + GrandExchangeOfferWorldComparator.oculusOrbFocalPointX = WorldMapLabelSize.localPlayer.x; // L: 3485 + var2 = ArchiveLoader.getTileHeight(WorldMapLabelSize.localPlayer.x, WorldMapLabelSize.localPlayer.y, Huffman.Client_plane) - Client.camFollowHeight; // L: 3486 + if (var2 < class7.field40) { // L: 3487 + class7.field40 = var2; + } + + MouseHandler.oculusOrbFocalPointY = WorldMapLabelSize.localPlayer.y; // L: 3488 + Client.field759 = false; // L: 3489 + } + } + + short var10 = -1; // L: 3492 + if (KeyHandler.KeyHandler_pressedKeys[33]) { // L: 3493 + var10 = 0; + } else if (KeyHandler.KeyHandler_pressedKeys[49]) { // L: 3494 + var10 = 1024; + } + + if (KeyHandler.KeyHandler_pressedKeys[48]) { // L: 3495 + if (var10 == 0) { // L: 3496 + var10 = 1792; + } else if (var10 == 1024) { // L: 3497 + var10 = 1280; + } else { + var10 = 1536; // L: 3498 + } + } else if (KeyHandler.KeyHandler_pressedKeys[50]) { // L: 3500 + if (var10 == 0) { // L: 3501 + var10 = 256; + } else if (var10 == 1024) { // L: 3502 + var10 = 768; + } else { + var10 = 512; // L: 3503 + } + } + + byte var11 = 0; // L: 3505 + if (KeyHandler.KeyHandler_pressedKeys[35]) { // L: 3506 + var11 = -1; + } else if (KeyHandler.KeyHandler_pressedKeys[51]) { // L: 3507 + var11 = 1; + } + + var2 = 0; // L: 3508 + if (var10 >= 0 || var11 != 0) { // L: 3509 + var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed * -1087548987 * -883817203 : Client.oculusOrbNormalSpeed * -106953033 * 1271248647; // L: 3510 + var2 *= 16; // L: 3511 + Client.field796 = var10; // L: 3512 + Client.field755 = var11; // L: 3513 + } + + if (Client.field753 < var2) { // L: 3515 + Client.field753 += var2 / 8; // L: 3516 + if (Client.field753 > var2) { // L: 3517 + Client.field753 = var2; + } + } else if (Client.field753 > var2) { // L: 3519 + Client.field753 = Client.field753 * 9 / 10; + } + + if (Client.field753 > 0) { // L: 3520 + var3 = Client.field753 / 16; // L: 3521 + if (Client.field796 >= 0) { // L: 3522 + var0 = Client.field796 - ServerPacket.cameraYaw & 2047; // L: 3523 + var4 = Rasterizer3D.Rasterizer3D_sine[var0]; // L: 3524 + var5 = Rasterizer3D.Rasterizer3D_cosine[var0]; // L: 3525 + GrandExchangeOfferWorldComparator.oculusOrbFocalPointX += var3 * var4 / 65536; // L: 3526 + MouseHandler.oculusOrbFocalPointY += var5 * var3 / 65536; // L: 3527 + } + + if (Client.field755 != 0) { // L: 3529 + class7.field40 += var3 * Client.field755; // L: 3530 + if (class7.field40 > 0) { // L: 3531 + class7.field40 = 0; + } + } + } else { + Client.field796 = -1; // L: 3535 + Client.field755 = -1; // L: 3536 + } + + if (KeyHandler.KeyHandler_pressedKeys[13]) { // L: 3538 + Client.packetWriter.addNode(Client.getPacketBufferNode(ClientPacket.field2290, Client.packetWriter.isaacCipher)); // L: 3540 + Client.oculusOrbState = 0; // L: 3541 + } + } + + if (MouseHandler.MouseHandler_currentButton == 4 && ScriptEvent.mouseCam) { // L: 3545 + var0 = MouseHandler.MouseHandler_y - Client.mouseCamClickedY; // L: 3546 + Client.camAngleDX = var0 * 2; // L: 3547 + Client.mouseCamClickedY = var0 != -1 && var0 != 1 ? (Client.mouseCamClickedY + MouseHandler.MouseHandler_y) / 2 : MouseHandler.MouseHandler_y * -630805473 * 1212010463; // L: 3548 + var1 = Client.mouseCamClickedX - MouseHandler.MouseHandler_x; // L: 3549 + Client.camAngleDY = var1 * 2; // L: 3550 + Client.mouseCamClickedX = var1 != -1 && var1 != 1 ? (Client.mouseCamClickedX + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x * -376552745 * 551932135; // L: 3551 + } else { + if (KeyHandler.KeyHandler_pressedKeys[96]) { // L: 3554 + Client.camAngleDY += (-24 - Client.camAngleDY) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[97]) { // L: 3555 + Client.camAngleDY += (24 - Client.camAngleDY) / 2; + } else { + Client.camAngleDY /= 2; // L: 3556 + } + + if (KeyHandler.KeyHandler_pressedKeys[98]) { // L: 3557 + Client.camAngleDX += (12 - Client.camAngleDX) / 2; + } else if (KeyHandler.KeyHandler_pressedKeys[99]) { // L: 3558 + Client.camAngleDX += (-12 - Client.camAngleDX) / 2; + } else { + Client.camAngleDX /= 2; // L: 3559 + } + + Client.mouseCamClickedY = MouseHandler.MouseHandler_y; // L: 3560 + Client.mouseCamClickedX = MouseHandler.MouseHandler_x; // L: 3561 + } + + Client.camAngleY = Client.camAngleDY / 2 + Client.camAngleY & 2047; // L: 3563 + Client.camAngleX += Client.camAngleDX / 2; // L: 3564 + if (Client.camAngleX < 128) { // L: 3565 + Client.camAngleX = 128; + } + + if (Client.camAngleX > 383) { // L: 3566 + Client.camAngleX = 383; + } + + } // L: 3567 + + @ObfuscatedName("hn") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1654311283" + ) + @Export("addCancelMenuEntry") + static void addCancelMenuEntry() { + class279.method5091(); // L: 7009 + Client.menuActions[0] = "Cancel"; // L: 7010 + Client.menuTargets[0] = ""; // L: 7011 + Client.menuOpcodes[0] = 1006; // L: 7012 + Client.menuShiftClick[0] = false; // L: 7013 + Client.menuOptionsCount = 1; // L: 7014 + } // L: 7015 + + @ObfuscatedName("jg") + @ObfuscatedSignature( + descriptor = "([Lhq;II)V", + garbageValue = "1802029198" + ) + @Export("runComponentCloseListeners") + static final void runComponentCloseListeners(Widget[] var0, int var1) { + for (int var2 = 0; var2 < var0.length; ++var2) { // L: 10115 + Widget var3 = var0[var2]; // L: 10116 + if (var3 != null) { // L: 10117 + if (var3.type == 0) { // L: 10118 + if (var3.children != null) { // L: 10119 + runComponentCloseListeners(var3.children, var1); + } + + InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); // L: 10120 + if (var4 != null) { // L: 10121 + ClientPacket.runIntfCloseListeners(var4.group, var1); + } + } + + ScriptEvent var5; + if (var1 == 0 && var3.onDialogAbort != null) { // L: 10123 + var5 = new ScriptEvent(); // L: 10124 + var5.widget = var3; // L: 10125 + var5.args = var3.onDialogAbort; // L: 10126 + Script.runScriptEvent(var5); // L: 10127 + } + + if (var1 == 1 && var3.onSubChange != null) { // L: 10129 + if (var3.childIndex >= 0) { // L: 10130 + Widget var6 = TileItem.getWidget(var3.id); // L: 10131 + if (var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) { // L: 10132 + continue; + } + } + + var5 = new ScriptEvent(); // L: 10136 + var5.widget = var3; // L: 10137 + var5.args = var3.onSubChange; // L: 10138 + Script.runScriptEvent(var5); // L: 10139 + } + } + } + + } // L: 10142 + + @ObfuscatedName("kw") + @ObfuscatedSignature( + descriptor = "(Lhq;II)Ljava/lang/String;", + garbageValue = "-1179780727" + ) + static String method756(Widget var0, int var1) { + if (!StudioGame.method4230(WorldMapIcon_0.getWidgetFlags(var0), var1) && var0.onOp == null) { // L: 10736 return null; } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; + return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; // L: 10737 10738 10740 } } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index 28ac9e0cd1..f2d5321c10 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -1,84 +1,86 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("at") +@ObfuscatedName("ad") @Implements("WorldMapCacheName") public class WorldMapCacheName { - @ObfuscatedName("rq") - @ObfuscatedGetter( - intValue = 1378764689 - ) - static int field329; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lat;" + descriptor = "Lad;" ) public static final WorldMapCacheName field322; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lad;" + ) + public static final WorldMapCacheName field318; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lad;" + ) + public static final WorldMapCacheName field327; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lad;" + ) + static final WorldMapCacheName field319; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lad;" + ) + public static final WorldMapCacheName field321; @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lat;" - ) - public static final WorldMapCacheName field325; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lat;" - ) - public static final WorldMapCacheName field324; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lat;" - ) - static final WorldMapCacheName field323; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lat;" - ) - public static final WorldMapCacheName field326; - @ObfuscatedName("ga") - @ObfuscatedGetter( - intValue = 1520300025 - ) - static int field328; - @ObfuscatedName("g") @Export("name") public final String name; static { - field322 = new WorldMapCacheName("details"); - field325 = new WorldMapCacheName("compositemap"); - field324 = new WorldMapCacheName("compositetexture"); - field323 = new WorldMapCacheName("area"); - field326 = new WorldMapCacheName("labels"); + field322 = new WorldMapCacheName("details"); // L: 4 + field318 = new WorldMapCacheName("compositemap"); // L: 5 + field327 = new WorldMapCacheName("compositetexture"); // L: 6 + field319 = new WorldMapCacheName("area"); // L: 7 + field321 = new WorldMapCacheName("labels"); // L: 8 } WorldMapCacheName(String var1) { - this.name = var1; - } + this.name = var1; // L: 12 + } // L: 13 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILlp;Lig;I)V", - garbageValue = "-1710341553" + descriptor = "(IIB)Lbk;", + garbageValue = "-87" ) - static void method688(int var0, ArchiveDisk var1, Archive var2) { - byte[] var3 = null; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) { - if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) { - var3 = var5.data; - break; - } - } + @Export("Messages_getByChannelAndID") + static Message Messages_getByChannelAndID(int var0, int var1) { + ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 35 + return var2.getMessage(var1); // L: 36 + } + + @ObfuscatedName("fe") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1002606295" + ) + @Export("playSong") + static void playSong(int var0) { + if (var0 == -1 && !Client.field704) { // L: 3288 + class206.midiPcmStream.clear(); // L: 3290 + class206.musicPlayerStatus = 1; // L: 3291 + class204.musicTrackArchive = null; // L: 3292 + } else if (var0 != -1 && var0 != Client.currentTrackGroupId && Client.musicVolume != 0 && !Client.field704) { // L: 3295 + Archive var1 = CollisionMap.archive6; // L: 3296 + int var2 = Client.musicVolume; // L: 3297 + class206.musicPlayerStatus = 1; // L: 3299 + class204.musicTrackArchive = var1; // L: 3300 + BuddyRankComparator.musicTrackGroupId = var0; // L: 3301 + class206.musicTrackFileId = 0; // L: 3302 + Tiles.musicTrackVolume = var2; // L: 3303 + class206.musicTrackBoolean = false; // L: 3304 + FaceNormal.pcmSampleLength = 2; // L: 3305 } - if (var3 != null) { - var2.load(var1, var0, var3, true); - } else { - byte[] var4 = var1.read(var0); - var2.load(var1, var0, var4, true); - } - } + Client.currentTrackGroupId = var0; // L: 3308 + } // L: 3309 } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index 848197e98b..c2a8e17ac8 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -1,69 +1,59 @@ +import java.awt.Desktop; +import java.awt.Desktop.Action; +import java.net.URI; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("i") +@ObfuscatedName("l") @Implements("WorldMapData_0") public class WorldMapData_0 extends AbstractWorldMapData { - @ObfuscatedName("dq") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive11") - static Archive archive11; - @ObfuscatedName("ej") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive19") - static Archive archive19; - WorldMapData_0() { - } + } // L: 6 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1154990112" + descriptor = "(Lkf;B)V", + garbageValue = "29" ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field301.value) { - throw new IllegalStateException(""); + int var2 = var1.readUnsignedByte(); // L: 9 + if (var2 != WorldMapID.field291.value) { // L: 10 + throw new IllegalStateException(""); // L: 11 } else { - super.minPlane = var1.readUnsignedByte(); - super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort(); - super.regionYLow = var1.readUnsignedShort(); - super.regionX = var1.readUnsignedShort(); - super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method5843(); - super.fileId = var1.method5843(); + super.minPlane = var1.readUnsignedByte(); // L: 13 + super.planes = var1.readUnsignedByte(); // L: 14 + super.regionXLow = var1.readUnsignedShort(); // L: 15 + super.regionYLow = var1.readUnsignedShort(); // L: 16 + super.regionX = var1.readUnsignedShort(); // L: 17 + super.regionY = var1.readUnsignedShort(); // L: 18 + super.groupId = var1.method5634(); // L: 19 + super.fileId = var1.method5634(); // L: 20 } - } + } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1774414997" + descriptor = "(Lkf;I)V", + garbageValue = "728123848" ) @Export("readGeography") void readGeography(Buffer var1) { super.planes = Math.min(super.planes, 4); super.floorUnderlayIds = new short[1][64][64]; super.floorOverlayIds = new short[super.planes][64][64]; - super.field185 = new byte[super.planes][64][64]; - super.field175 = new byte[super.planes][64][64]; + super.field198 = new byte[super.planes][64][64]; // L: 27 + super.field191 = new byte[super.planes][64][64]; super.decorations = new WorldMapDecoration[super.planes][64][64][]; int var2 = var1.readUnsignedByte(); - if (var2 != class39.field296.value) { + if (var2 != class39.field279.value) { throw new IllegalStateException(""); } else { int var3 = var1.readUnsignedByte(); int var4 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY) { + if (var3 == super.regionX && var4 == super.regionY) { // L: 36 for (int var5 = 0; var5 < 64; ++var5) { for (int var6 = 0; var6 < 64; ++var6) { this.readTile(var5, var6, var1); @@ -74,67 +64,81 @@ public class WorldMapData_0 extends AbstractWorldMapData { throw new IllegalStateException(""); } } - } + } // L: 44 public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_0)) { - return false; + return false; // L: 48 } else { - WorldMapData_0 var2 = (WorldMapData_0)var1; - return super.regionX == var2.regionX && var2.regionY == super.regionY; + WorldMapData_0 var2 = (WorldMapData_0)var1; // L: 50 + return var2.regionX == super.regionX && super.regionY == var2.regionY; // L: 51 } } public int hashCode() { - return super.regionX | super.regionY << 8; + return super.regionX | super.regionY << 8; // L: 55 } + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", + garbageValue = "-379441451" + ) + @Export("addChatMessage") + static void addChatMessage(int var0, String var1, String var2, String var3) { + ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 23 + if (var4 == null) { // L: 24 + var4 = new ChatChannel(); // L: 25 + Messages.Messages_channels.put(var0, var4); // L: 26 + } + + Message var5 = var4.addMessage(var0, var1, var2, var3); // L: 28 + Messages.Messages_hashTable.put(var5, (long)var5.count); // L: 29 + Messages.Messages_queue.add(var5); // L: 30 + Client.chatCycle = Client.cycleCntr; + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZLjava/lang/String;ZS)V", + garbageValue = "-25637" + ) + static void method255(String var0, boolean var1, String var2, boolean var3) { + if (var1) { // L: 31 + if (!var3 && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) { // L: 32 + try { + Desktop.getDesktop().browse(new URI(var0)); // L: 34 + return; // L: 35 + } catch (Exception var5) { // L: 37 + } + } + + if (class60.field451.startsWith("win") && !var3) { // L: 39 40 + FontName.method5444(var0, 0); // L: 41 + return; // L: 42 + } + + if (class60.field451.startsWith("mac")) { // L: 45 + WorldMapIcon_1.method380(var0, 1, var2); // L: 46 + return; // L: 47 + } + + FontName.method5444(var0, 2); // L: 49 + } else { + FontName.method5444(var0, 3); // L: 52 + } + + } // L: 54 + @ObfuscatedName("o") - @Export("base37DecodeLong") - public static String base37DecodeLong(long var0) { - if (var0 > 0L && var0 < 6582952005840035281L) { - if (var0 % 37L == 0L) { - return null; - } else { - int var2 = 0; - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class298.base37Table[(int)(var6 - 37L * var0)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); - } - } else { - return null; - } - } - - @ObfuscatedName("he") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-992239935" + descriptor = "(II)V", + garbageValue = "-2125303788" ) - static final void method243(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field879[var4] = true; - } + static void method263(int var0) { + ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); // L: 72 + if (var1 != null) { + var1.remove(); // L: 74 } - - } + } // L: 73 75 } diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index 83daf1cad0..817d34f452 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -1,137 +1,144 @@ +import java.io.IOException; +import java.lang.management.GarbageCollectorMXBean; +import java.lang.management.ManagementFactory; +import java.util.Iterator; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aq") +@ObfuscatedName("aw") @Implements("WorldMapData_1") public class WorldMapData_1 extends AbstractWorldMapData { - @ObfuscatedName("gx") - @Export("xteaKeys") - static int[][] xteaKeys; - @ObfuscatedName("r") + @ObfuscatedName("en") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive19") + static Archive archive19; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -941461191 + intValue = -1032395207 ) @Export("chunkXLow") int chunkXLow; - @ObfuscatedName("s") + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 1539271547 + intValue = 1804098781 ) @Export("chunkYLow") int chunkYLow; - @ObfuscatedName("v") + @ObfuscatedName("y") @ObfuscatedGetter( - intValue = -1911855955 + intValue = -1816930541 ) @Export("chunkX") int chunkX; - @ObfuscatedName("d") + @ObfuscatedName("v") @ObfuscatedGetter( - intValue = 1515866059 + intValue = 875347201 ) @Export("chunkY") int chunkY; WorldMapData_1() { - } + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-484373567" + descriptor = "(Lkf;B)V", + garbageValue = "-5" ) @Export("init") void init(Buffer var1) { - int var2 = var1.readUnsignedByte(); - if (var2 != WorldMapID.field299.value) { - throw new IllegalStateException(""); + int var2 = var1.readUnsignedByte(); // L: 14 + if (var2 != WorldMapID.field288.value) { // L: 15 + throw new IllegalStateException(""); // L: 16 } else { - super.minPlane = var1.readUnsignedByte(); - super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort(); - super.regionYLow = var1.readUnsignedShort(); - this.chunkXLow = var1.readUnsignedByte(); - this.chunkYLow = var1.readUnsignedByte(); - super.regionX = var1.readUnsignedShort(); - super.regionY = var1.readUnsignedShort(); - this.chunkX = var1.readUnsignedByte(); - this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method5843(); - super.fileId = var1.method5843(); + super.minPlane = var1.readUnsignedByte(); // L: 18 + super.planes = var1.readUnsignedByte(); // L: 19 + super.regionXLow = var1.readUnsignedShort(); // L: 20 + super.regionYLow = var1.readUnsignedShort(); // L: 21 + this.chunkXLow = var1.readUnsignedByte(); // L: 22 + this.chunkYLow = var1.readUnsignedByte(); // L: 23 + super.regionX = var1.readUnsignedShort(); // L: 24 + super.regionY = var1.readUnsignedShort(); // L: 25 + this.chunkX = var1.readUnsignedByte(); // L: 26 + this.chunkY = var1.readUnsignedByte(); // L: 27 + super.groupId = var1.method5634(); // L: 28 + super.fileId = var1.method5634(); // L: 29 } - } + } // L: 30 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;I)V", - garbageValue = "-1774414997" + descriptor = "(Lkf;I)V", + garbageValue = "728123848" ) @Export("readGeography") void readGeography(Buffer var1) { - super.planes = Math.min(super.planes, 4); - super.floorUnderlayIds = new short[1][64][64]; - super.floorOverlayIds = new short[super.planes][64][64]; - super.field185 = new byte[super.planes][64][64]; - super.field175 = new byte[super.planes][64][64]; - super.decorations = new WorldMapDecoration[super.planes][64][64][]; - int var2 = var1.readUnsignedByte(); - if (var2 != class39.field293.value) { - throw new IllegalStateException(""); + super.planes = Math.min(super.planes, 4); // L: 33 + super.floorUnderlayIds = new short[1][64][64]; // L: 34 + super.floorOverlayIds = new short[super.planes][64][64]; // L: 35 + super.field198 = new byte[super.planes][64][64]; // L: 36 + super.field191 = new byte[super.planes][64][64]; // L: 37 + super.decorations = new WorldMapDecoration[super.planes][64][64][]; // L: 38 + int var2 = var1.readUnsignedByte(); // L: 39 + if (var2 != class39.field280.value) { // L: 40 + throw new IllegalStateException(""); // L: 41 } else { - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - int var5 = var1.readUnsignedByte(); - int var6 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { - for (int var7 = 0; var7 < 8; ++var7) { - for (int var8 = 0; var8 < 8; ++var8) { - this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); + int var3 = var1.readUnsignedByte(); // L: 43 + int var4 = var1.readUnsignedByte(); // L: 44 + int var5 = var1.readUnsignedByte(); // L: 45 + int var6 = var1.readUnsignedByte(); // L: 46 + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { // L: 47 + for (int var7 = 0; var7 < 8; ++var7) { // L: 50 + for (int var8 = 0; var8 < 8; ++var8) { // L: 51 + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); // L: 52 } } } else { - throw new IllegalStateException(""); + throw new IllegalStateException(""); // L: 48 } } - } + } // L: 55 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "4" + descriptor = "(I)I", + garbageValue = "-173161380" ) @Export("getChunkXLow") int getChunkXLow() { - return this.chunkXLow; + return this.chunkXLow; // L: 73 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "259751183" + garbageValue = "-1289176366" ) @Export("getChunkYLow") int getChunkYLow() { - return this.chunkYLow; + return this.chunkYLow; // L: 77 } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-810164078" + garbageValue = "1672760755" ) @Export("getChunkX") int getChunkX() { return this.chunkX; } - @ObfuscatedName("as") + @ObfuscatedName("aa") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "196084572" + garbageValue = "-56911987" ) @Export("getChunkY") int getChunkY() { @@ -139,229 +146,137 @@ public class WorldMapData_1 extends AbstractWorldMapData { } public boolean equals(Object var1) { - if (!(var1 instanceof WorldMapData_1)) { - return false; + if (!(var1 instanceof WorldMapData_1)) { // L: 58 + return false; // L: 59 } else { - WorldMapData_1 var2 = (WorldMapData_1)var1; - if (var2.regionX == super.regionX && var2.regionY == super.regionY) { - return this.chunkX == var2.chunkX && var2.chunkY == this.chunkY; + WorldMapData_1 var2 = (WorldMapData_1)var1; // L: 61 + if (var2.regionX == super.regionX && super.regionY == var2.regionY) { // L: 62 + return var2.chunkX == this.chunkX && this.chunkY == var2.chunkY; // L: 65 } else { - return false; + return false; // L: 63 } } } public int hashCode() { - return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; + return super.regionX | super.regionY << 8 | this.chunkX << 16 | this.chunkY << 24; // L: 69 } - @ObfuscatedName("o") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "1959951733" + descriptor = "(B)V", + garbageValue = "1" ) - public static boolean method784(int var0) { - return var0 >= WorldMapDecorationType.field2775.id && var0 <= WorldMapDecorationType.field2778.id; - } + @Export("savePreferences") + static void savePreferences() { + AccessFile var0 = null; // L: 81 - @ObfuscatedName("im") - @ObfuscatedSignature( - descriptor = "(IIIIB)V", - garbageValue = "87" - ) - @Export("addSceneMenuOptions") - static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) { - if (Client.isItemSelected == 0 && !Client.isSpellSelected) { - ScriptEvent.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); + try { + var0 = class2.getPreferencesFile("", Tiles.field532.name, true); // L: 83 + Buffer var1 = Tile.clientPreferences.toBuffer(); // L: 84 + var0.write(var1.array, 0, var1.offset); // L: 85 + } catch (Exception var3) { // L: 87 } - long var4 = -1L; - long var6 = -1L; + try { + if (var0 != null) { // L: 89 + var0.closeSync(true); // L: 90 + } + } catch (Exception var2) { // L: 93 + } - int var8; - for (var8 = 0; var8 < WorldMapSection2.getEntityCountUnderMouse(); ++var8) { - long entityTag_1 = WorldMapLabel.getEntityUnderMouse(var8); - if (entityTag_1 != var6) { - var6 = entityTag_1; - int sceneX = SoundSystem.getSceneXForObjectUnderMouse(var8); - long entityTag_2 = ViewportMouse.ViewportMouse_entityTags[var8]; - int sceneY = (int)(entityTag_2 >>> 7 & 0x7fL); - sceneY = sceneY; - int interactType = class171.Entity_unpackType(ViewportMouse.ViewportMouse_entityTags[var8]); - int objectId = class2.getEntityIdUnderMouse(var8); - if (interactType == 2 && UserComparator3.scene.getObjectFlags(TileItemPile.Client_plane, sceneX, sceneY, entityTag_1) >= 0) { - ObjectDefinition objectDef = Canvas.getObjectDefinition(objectId); - if (objectDef.transforms != null) { - objectDef = objectDef.transform(); - } + } // L: 94 - if (objectDef == null) { - continue; - } + @ObfuscatedName("ai") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "570960818" + ) + @Export("getGcDuration") + protected static int getGcDuration() { + int var0 = 0; // L: 549 + if (WorldMapIcon_0.garbageCollector == null || !WorldMapIcon_0.garbageCollector.isValid()) { // L: 550 + try { + Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator(); // L: 552 - if (Client.isItemSelected == 1) { - ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(65535) + objectDef.name, 1, objectId, sceneX, sceneY); - } else if (Client.isSpellSelected) { - if ((WorldMapSprite.selectedSpellFlags & 4) == 4) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(65535) + objectDef.name, 2, objectId, sceneX, sceneY); - } - } else { - String[] actions = objectDef.actions; - if (actions != null) { - for (int actionIdx = 4; actionIdx >= 0; --actionIdx) { - if (actions[actionIdx] != null) { - short opcode = 0; - if (actionIdx == 0) { - opcode = 3; - } - - if (actionIdx == 1) { - opcode = 4; - } - - if (actionIdx == 2) { - opcode = 5; - } - - if (actionIdx == 3) { - opcode = 6; - } - - if (actionIdx == 4) { - opcode = 1001; - } - - ScriptEvent.insertMenuItemNoShift(actions[actionIdx], ItemContainer.colorStartTag(65535) + objectDef.name, opcode, objectId, sceneX, sceneY); - } - } - } - - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(65535) + objectDef.name, 1002, objectDef.id, sceneX, sceneY); - } - } - - int var18; - NPC var19; - Player var21; - int[] var33; - int var35; - if (interactType == 1) { - NPC var30 = Client.npcs[objectId]; - if (var30 == null) { - continue; - } - - if (var30.definition.size == 1 && (var30.x & 127) == 64 && (var30.y & 127) == 64) { - for (var18 = 0; var18 < Client.npcCount; ++var18) { - var19 = Client.npcs[Client.npcIndices[var18]]; - if (var19 != null && var30 != var19 && var19.definition.size == 1 && var19.x == var30.x && var19.y == var30.y) { - ApproximateRouteStrategy.addNpcToMenu(var19.definition, Client.npcIndices[var18], sceneX, sceneY); - } - } - - var18 = Players.Players_count; - var33 = Players.Players_indices; - - for (var35 = 0; var35 < var18; ++var35) { - var21 = Client.players[var33[var35]]; - if (var21 != null && var30.x == var21.x && var30.y == var21.y) { - Player.addPlayerToMenu(var21, var33[var35], sceneX, sceneY); - } - } - } - - ApproximateRouteStrategy.addNpcToMenu(var30.definition, objectId, sceneX, sceneY); - } - - if (interactType == 0) { - Player var31 = Client.players[objectId]; - if (var31 == null) { - continue; - } - - if ((var31.x & 127) == 64 && (var31.y & 127) == 64) { - for (var18 = 0; var18 < Client.npcCount; ++var18) { - var19 = Client.npcs[Client.npcIndices[var18]]; - if (var19 != null && var19.definition.size == 1 && var31.x == var19.x && var31.y == var19.y) { - ApproximateRouteStrategy.addNpcToMenu(var19.definition, Client.npcIndices[var18], sceneX, sceneY); - } - } - - var18 = Players.Players_count; - var33 = Players.Players_indices; - - for (var35 = 0; var35 < var18; ++var35) { - var21 = Client.players[var33[var35]]; - if (var21 != null && var21 != var31 && var21.x == var31.x && var31.y == var21.y) { - Player.addPlayerToMenu(var21, var33[var35], sceneX, sceneY); - } - } - } - - if (objectId != Client.combatTargetPlayerIndex) { - Player.addPlayerToMenu(var31, objectId, sceneX, sceneY); - } else { - var4 = entityTag_1; - } - } - - if (interactType == 3) { - NodeDeque var32 = Client.groundItems[TileItemPile.Client_plane][sceneX][sceneY]; - if (var32 != null) { - for (TileItem var36 = (TileItem)var32.first(); var36 != null; var36 = (TileItem)var32.next()) { - ItemDefinition var34 = KitDefinition.ItemDefinition_get(var36.id); - if (Client.isItemSelected == 1) { - ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var34.name, 16, var36.id, sceneX, sceneY); - } else if (Client.isSpellSelected) { - if ((WorldMapSprite.selectedSpellFlags & 1) == 1) { - ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16748608) + var34.name, 17, var36.id, sceneX, sceneY); - } - } else { - String[] var28 = var34.groundActions; - - for (int var29 = 4; var29 >= 0; --var29) { - if (var28 != null && var28[var29] != null) { - byte var22 = 0; - if (var29 == 0) { - var22 = 18; - } - - if (var29 == 1) { - var22 = 19; - } - - if (var29 == 2) { - var22 = 20; - } - - if (var29 == 3) { - var22 = 21; - } - - if (var29 == 4) { - var22 = 22; - } - - ScriptEvent.insertMenuItemNoShift(var28[var29], ItemContainer.colorStartTag(16748608) + var34.name, var22, var36.id, sceneX, sceneY); - } else if (var29 == 2) { - ScriptEvent.insertMenuItemNoShift("Take", ItemContainer.colorStartTag(16748608) + var34.name, 20, var36.id, sceneX, sceneY); - } - } - - ScriptEvent.insertMenuItemNoShift("Examine", ItemContainer.colorStartTag(16748608) + var34.name, 1004, var36.id, sceneX, sceneY); - } - } + while (var1.hasNext()) { + GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 553 + if (var2.isValid()) { // L: 555 + WorldMapIcon_0.garbageCollector = var2; // L: 556 + GameShell.garbageCollectorLastCheckTimeMs = -1L; // L: 557 + GameShell.garbageCollectorLastCollectionTime = -1L; // L: 558 } } + } catch (Throwable var11) { // L: 563 } } - if (-1L != var4) { - var8 = class279.Entity_unpackSceneX(var4); - int pSceneY = (int)(var4 >>> 7 & 127L); - Player var11 = Client.players[Client.combatTargetPlayerIndex]; - Player.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, pSceneY); + if (WorldMapIcon_0.garbageCollector != null) { // L: 565 + long var9 = PacketWriter.currentTimeMillis(); // L: 566 + long var3 = WorldMapIcon_0.garbageCollector.getCollectionTime(); // L: 567 + if (-1L != GameShell.garbageCollectorLastCollectionTime) { // L: 568 + long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; // L: 569 + long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; // L: 570 + if (0L != var7) { // L: 571 + var0 = (int)(var5 * 100L / var7); + } + } + + GameShell.garbageCollectorLastCollectionTime = var3; // L: 573 + GameShell.garbageCollectorLastCheckTimeMs = var9; // L: 574 } + return var0; // L: 576 } + + @ObfuscatedName("ex") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "1000251119" + ) + static int method785() { + if (Client.archiveLoaders != null && Client.archiveLoadersDone < Client.archiveLoaders.size()) { // L: 1437 + int var0 = 0; // L: 1438 + + for (int var1 = 0; var1 <= Client.archiveLoadersDone; ++var1) { // L: 1439 + var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount; // L: 1440 + } + + return var0 * 10000 / Client.field949; // L: 1442 + } else { + return 10000; + } + } + + @ObfuscatedName("kt") + @ObfuscatedSignature( + descriptor = "(Lkf;B)V", + garbageValue = "28" + ) + static void method783(Buffer var0) { + if (Client.randomDatData != null) { // L: 10832 + var0.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); // L: 10833 + } else { + byte[] var2 = new byte[24]; // L: 10838 + + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 10840 + JagexCache.JagexCache_randomDat.readFully(var2); // L: 10841 + + int var3; + for (var3 = 0; var3 < 24 && var2[var3] == 0; ++var3) { // L: 10842 10843 10844 + } + + if (var3 >= 24) { // L: 10846 + throw new IOException(); + } + } catch (Exception var6) { + for (int var4 = 0; var4 < 24; ++var4) { // L: 10849 + var2[var4] = -1; + } + } + + var0.writeBytes(var2, 0, var2.length); // L: 10854 + } + } // L: 10834 10855 } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 88f66bd982..48e8093e9a 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -1,138 +1,85 @@ +import java.io.File; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ak") +@ObfuscatedName("aa") @Implements("WorldMapDecoration") public class WorldMapDecoration { - @ObfuscatedName("g") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -399317437 - ) - @Export("idxCount") - static int idxCount; - @ObfuscatedName("eg") - @ObfuscatedGetter( - intValue = 1871379013 - ) - static int field238; - @ObfuscatedName("id") - @ObfuscatedGetter( - intValue = -169776853 - ) - static int field234; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = -1201238261 + intValue = -1951458321 ) @Export("objectDefinitionId") final int objectDefinitionId; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -2100994551 + intValue = 1622720231 ) @Export("decoration") final int decoration; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1800056501 + intValue = 1680868715 ) @Export("rotation") final int rotation; WorldMapDecoration(int var1, int var2, int var3) { - this.objectDefinitionId = var1; - this.decoration = var2; - this.rotation = var3; - } + this.objectDefinitionId = var1; // L: 9 + this.decoration = var2; // L: 10 + this.rotation = var3; // L: 11 + } // L: 12 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SI)V", - garbageValue = "478567291" + descriptor = "(Ljava/io/File;I)V", + garbageValue = "1315266294" ) - public static void method400(String[] var0, short[] var1) { - class4.sortItemsByName(var0, var1, 0, var0.length - 1); - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "1441437585" - ) - public static int method402(int var0) { - return var0 >> 17 & 7; - } - - @ObfuscatedName("jl") - @ObfuscatedSignature( - descriptor = "([Lhd;IB)V", - garbageValue = "-69" - ) - @Export("drawModelComponents") - static final void drawModelComponents(Widget[] var0, int var1) { - for (int var2 = 0; var2 < var0.length; ++var2) { - Widget var3 = var0[var2]; - if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !Entity.isComponentHidden(var3))) { - int var5; - if (var3.type == 0) { - if (!var3.isIf3 && Entity.isComponentHidden(var3) && var3 != WorldMapSection1.mousedOverWidgetIf1) { - continue; - } - - drawModelComponents(var0, var3.id); - if (var3.children != null) { - drawModelComponents(var3.children, var3.id); - } - - InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id); - if (var4 != null) { - var5 = var4.group; - if (UserComparator4.loadInterface(var5)) { - drawModelComponents(Widget.Widget_interfaceComponents[var5], -1); - } - } - } - - if (var3.type == 6) { - if (var3.sequenceId != -1 || var3.sequenceId2 != -1) { - boolean var7 = DevicePcmPlayerProvider.runCs1(var3); - if (var7) { - var5 = var3.sequenceId2; - } else { - var5 = var3.sequenceId; - } - - if (var5 != -1) { - SequenceDefinition var6 = NetSocket.SequenceDefinition_get(var5); - - for (var3.modelFrameCycle += Client.field747; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class234.invalidateWidget(var3)) { - var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; - ++var3.modelFrame; - if (var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame -= var6.frameCount; - if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) { - var3.modelFrame = 0; - } - } - } - } - } - - if (var3.field2658 != 0 && !var3.isIf3) { - int var8 = var3.field2658 >> 16; - var5 = var3.field2658 << 16 >> 16; - var8 *= Client.field747; - var5 *= Client.field747; - var3.modelAngleX = var8 + var3.modelAngleX & 2047; - var3.modelAngleY = var5 + var3.modelAngleY & 2047; - class234.invalidateWidget(var3); - } - } - } + static void method406(File var0) { + FileSystem.FileSystem_cacheDir = var0; // L: 16 + if (!FileSystem.FileSystem_cacheDir.exists()) { // L: 17 + throw new RuntimeException(""); + } else { + FileSystem.FileSystem_hasPermissions = true; // L: 18 } + } // L: 19 + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "-1984297327" + ) + static int method405(int var0, Script var1, boolean var2) { + Widget var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1285 + if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { // L: 1286 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var3)); // L: 1287 + return 1; // L: 1288 + } else if (var0 != ScriptOpcodes.IF_GETOP) { // L: 1290 + if (var0 == ScriptOpcodes.IF_GETOPBASE) { // L: 1297 + if (var3.dataText == null) { // L: 1298 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.dataText; // L: 1299 + } + + return 1; // L: 1300 + } else { + return 2; // L: 1302 + } + } else { + int var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1291 + --var4; // L: 1292 + if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { // L: 1293 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.actions[var4]; // L: 1294 + } else { + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; + } + + return 1; // L: 1295 + } } } diff --git a/runescape-client/src/main/java/WorldMapDecorationType.java b/runescape-client/src/main/java/WorldMapDecorationType.java index 0ff172de51..e4262d8811 100644 --- a/runescape-client/src/main/java/WorldMapDecorationType.java +++ b/runescape-client/src/main/java/WorldMapDecorationType.java @@ -4,128 +4,128 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hp") +@ObfuscatedName("hl") @Implements("WorldMapDecorationType") public enum WorldMapDecorationType implements Enumerated { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2756(0, 0), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2757(1, 0), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2755(2, 0), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2758(3, 0), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2759(9, 2), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2760(4, 1), - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2761(5, 1), - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2762(6, 1), - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2776(7, 1), @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lhl;" ) - field2764(8, 1), - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2765(12, 2), - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2763(13, 2), - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2769(14, 2), - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2768(15, 2), + field2760(0, 0), @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lhl;" ) - field2766(16, 2), - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2770(17, 2), + field2759(1, 0), @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lhl;" ) - field2771(18, 2), - @ObfuscatedName("v") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2772(19, 2), - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2767(20, 2), - @ObfuscatedName("e") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2774(21, 2), - @ObfuscatedName("l") - @ObfuscatedSignature( - descriptor = "Lhp;" - ) - field2775(10, 2), + field2763(2, 0), @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lhl;" ) - field2778(11, 2), + field2757(3, 0), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2761(9, 2), + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2767(4, 1), @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "Lhp;" + descriptor = "Lhl;" ) - field2777(22, 3); + field2769(5, 1), + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2764(6, 1), + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2765(7, 1), + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2758(8, 1), + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2771(12, 2), + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2768(13, 2), + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2762(14, 2), + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2770(15, 2), + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2766(16, 2), + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2772(17, 2), + @ObfuscatedName("f") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2773(18, 2), + @ObfuscatedName("y") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2774(19, 2), + @ObfuscatedName("v") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2780(20, 2), + @ObfuscatedName("j") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2776(21, 2), + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2777(10, 2), + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2778(11, 2), + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "Lhl;" + ) + field2779(22, 3); @ObfuscatedName("b") @ObfuscatedGetter( - intValue = -992967721 + intValue = 212530535 ) @Export("id") public final int id; @@ -135,16 +135,16 @@ public enum WorldMapDecorationType implements Enumerated { garbageValue = "0" ) WorldMapDecorationType(int var3, int var4) { - this.id = var3; - } + this.id = var3; // L: 34 + } // L: 35 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 38 } } diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 1c73d79f59..df840bc706 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -4,355 +4,306 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ih") +@ObfuscatedName("iv") @Implements("WorldMapElement") public class WorldMapElement extends DualNode { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("WorldMapElement_archive") public static AbstractArchive WorldMapElement_archive; - @ObfuscatedName("q") + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "[Liv;" + ) + @Export("WorldMapElement_cached") + public static WorldMapElement[] WorldMapElement_cached; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1135374529 + intValue = -1742537505 ) @Export("WorldMapElement_count") public static int WorldMapElement_count; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lec;" + descriptor = "Lel;" ) @Export("WorldMapElement_cachedSprites") - public static EvictingDualNodeHashTable WorldMapElement_cachedSprites; - @ObfuscatedName("hz") - @ObfuscatedSignature( - descriptor = "[Llh;" - ) - @Export("scrollBarSprites") - static IndexedSprite[] scrollBarSprites; - @ObfuscatedName("p") + static EvictingDualNodeHashTable WorldMapElement_cachedSprites; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 712564113 + intValue = 2104194333 ) @Export("objectId") public final int objectId; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 211021913 + intValue = 1581878653 ) @Export("sprite1") public int sprite1; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 492639717 + intValue = -886122493 ) @Export("sprite2") int sprite2; - @ObfuscatedName("u") + @ObfuscatedName("w") @Export("name") public String name; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1414394937 + intValue = 2144841941 ) - public int field3251; - @ObfuscatedName("z") + public int field3243; + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1395285175 + intValue = -1165437927 ) @Export("textSize") public int textSize; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("menuActions") public String[] menuActions; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("menuTargetName") public String menuTargetName; - @ObfuscatedName("h") - int[] field3243; - @ObfuscatedName("k") + @ObfuscatedName("a") + int[] field3247; + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = 234759337 + intValue = -880693079 ) - int field3252; - @ObfuscatedName("r") + int field3248; + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -1681954435 + intValue = 328256207 ) - int field3242; - @ObfuscatedName("s") + int field3249; + @ObfuscatedName("f") @ObfuscatedGetter( - intValue = 407708591 + intValue = -1153457135 ) - int field3254; + int field3250; + @ObfuscatedName("y") + @ObfuscatedGetter( + intValue = 1976425027 + ) + int field3251; @ObfuscatedName("v") - @ObfuscatedGetter( - intValue = 345147075 - ) - int field3255; - @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "Ljc;" + descriptor = "Lju;" ) @Export("horizontalAlignment") public HorizontalAlignment horizontalAlignment; - @ObfuscatedName("e") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "Lif;" + descriptor = "Lit;" ) @Export("verticalAlignment") public VerticalAlignment verticalAlignment; - @ObfuscatedName("l") - int[] field3258; - @ObfuscatedName("t") - byte[] field3259; - @ObfuscatedName("x") + @ObfuscatedName("r") + int[] field3253; + @ObfuscatedName("u") + byte[] field3242; + @ObfuscatedName("p") @ObfuscatedGetter( - intValue = -524595041 + intValue = 763418107 ) @Export("category") public int category; static { - WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); + WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256); // L: 16 } public WorldMapElement(int var1) { - this.sprite1 = -1; - this.sprite2 = -1; - this.textSize = 0; - this.menuActions = new String[5]; - this.field3252 = Integer.MAX_VALUE; - this.field3242 = Integer.MAX_VALUE; - this.field3254 = Integer.MIN_VALUE; - this.field3255 = Integer.MIN_VALUE; - this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; - this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; - this.category = -1; - this.objectId = var1; - } + this.sprite1 = -1; // L: 18 + this.sprite2 = -1; // L: 19 + this.textSize = 0; // L: 22 + this.menuActions = new String[5]; // L: 24 + this.field3248 = Integer.MAX_VALUE; // L: 27 + this.field3249 = Integer.MAX_VALUE; // L: 28 + this.field3250 = Integer.MIN_VALUE; // L: 29 + this.field3251 = Integer.MIN_VALUE; // L: 30 + this.horizontalAlignment = HorizontalAlignment.HorizontalAlignment_centered; // L: 31 + this.verticalAlignment = VerticalAlignment.VerticalAlignment_centered; // L: 32 + this.category = -1; // L: 35 + this.objectId = var1; // L: 38 + } // L: 39 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "106" + descriptor = "(Lkf;B)V", + garbageValue = "-62" ) @Export("decode") public void decode(Buffer var1) { while (true) { - int var2 = var1.readUnsignedByte(); - if (var2 == 0) { - return; + int var2 = var1.readUnsignedByte(); // L: 50 + if (var2 == 0) { // L: 51 + return; // L: 54 } - this.decodeNext(var1, var2); + this.decodeNext(var1, var2); // L: 52 } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkn;II)V", - garbageValue = "1696894212" + descriptor = "(Lkf;IB)V", + garbageValue = "87" ) @Export("decodeNext") void decodeNext(Buffer var1, int var2) { - if (var2 == 1) { - this.sprite1 = var1.method5843(); - } else if (var2 == 2) { - this.sprite2 = var1.method5843(); - } else if (var2 == 3) { + if (var2 == 1) { // L: 57 + this.sprite1 = var1.method5634(); + } else if (var2 == 2) { // L: 58 + this.sprite2 = var1.method5634(); + } else if (var2 == 3) { // L: 59 this.name = var1.readStringCp1252NullTerminated(); - } else if (var2 == 4) { - this.field3251 = var1.readMedium(); - } else if (var2 == 5) { - var1.readMedium(); - } else if (var2 == 6) { + } else if (var2 == 4) { // L: 60 + this.field3243 = var1.readMedium(); + } else if (var2 == 5) { // L: 61 + var1.readMedium(); // L: 62 + } else if (var2 == 6) { // L: 64 this.textSize = var1.readUnsignedByte(); } else { - int var3; - if (var2 == 7) { - var3 = var1.readUnsignedByte(); - if ((var3 & 1) == 0) { + int var6; + if (var2 == 7) { // L: 65 + var6 = var1.readUnsignedByte(); // L: 66 + if ((var6 & 1) == 0) { // L: 67 } - if ((var3 & 2) == 2) { + if ((var6 & 2) == 2) { // L: 68 } - } else if (var2 == 8) { - var1.readUnsignedByte(); - } else if (var2 >= 10 && var2 <= 14) { + } else if (var2 == 8) { // L: 70 + var1.readUnsignedByte(); // L: 71 + } else if (var2 >= 10 && var2 <= 14) { // L: 73 this.menuActions[var2 - 10] = var1.readStringCp1252NullTerminated(); - } else if (var2 == 15) { - var3 = var1.readUnsignedByte(); - this.field3243 = new int[var3 * 2]; + } else if (var2 == 15) { // L: 74 + var6 = var1.readUnsignedByte(); // L: 75 + this.field3247 = new int[var6 * 2]; // L: 76 int var4; - for (var4 = 0; var4 < var3 * 2; ++var4) { - this.field3243[var4] = var1.readShort(); + for (var4 = 0; var4 < var6 * 2; ++var4) { // L: 77 + this.field3247[var4] = var1.readShort(); } - var1.readInt(); - var4 = var1.readUnsignedByte(); - this.field3258 = new int[var4]; + var1.readInt(); // L: 78 + var4 = var1.readUnsignedByte(); // L: 79 + this.field3253 = new int[var4]; // L: 80 int var5; - for (var5 = 0; var5 < this.field3258.length; ++var5) { - this.field3258[var5] = var1.readInt(); + for (var5 = 0; var5 < this.field3253.length; ++var5) { // L: 81 + this.field3253[var5] = var1.readInt(); } - this.field3259 = new byte[var3]; + this.field3242 = new byte[var6]; // L: 82 - for (var5 = 0; var5 < var3; ++var5) { - this.field3259[var5] = var1.readByte(); + for (var5 = 0; var5 < var6; ++var5) { // L: 83 + this.field3242[var5] = var1.readByte(); } - } else if (var2 != 16) { - if (var2 == 17) { + } else if (var2 != 16) { // L: 85 + if (var2 == 17) { // L: 86 this.menuTargetName = var1.readStringCp1252NullTerminated(); - } else if (var2 == 18) { - var1.method5843(); - } else if (var2 == 19) { + } else if (var2 == 18) { // L: 87 + var1.method5634(); // L: 88 + } else if (var2 == 19) { // L: 90 this.category = var1.readUnsignedShort(); - } else if (var2 == 21) { - var1.readInt(); - } else if (var2 == 22) { - var1.readInt(); - } else if (var2 == 23) { - var1.readUnsignedByte(); - var1.readUnsignedByte(); - var1.readUnsignedByte(); - } else if (var2 == 24) { - var1.readShort(); - var1.readShort(); - } else if (var2 == 25) { - var1.method5843(); - } else if (var2 == 28) { - var1.readUnsignedByte(); - } else if (var2 == 29) { - this.horizontalAlignment = (HorizontalAlignment)FaceNormal.findEnumerated(GrandExchangeOfferNameComparator.method207(), var1.readUnsignedByte()); - } else if (var2 == 30) { - this.verticalAlignment = (VerticalAlignment)FaceNormal.findEnumerated(class219.method4106(), var1.readUnsignedByte()); + } else if (var2 == 21) { // L: 91 + var1.readInt(); // L: 92 + } else if (var2 == 22) { // L: 94 + var1.readInt(); // L: 95 + } else if (var2 == 23) { // L: 97 + var1.readUnsignedByte(); // L: 98 + var1.readUnsignedByte(); // L: 99 + var1.readUnsignedByte(); // L: 100 + } else if (var2 == 24) { // L: 102 + var1.readShort(); // L: 103 + var1.readShort(); // L: 104 + } else if (var2 == 25) { // L: 106 + var1.method5634(); // L: 107 + } else if (var2 == 28) { // L: 109 + var1.readUnsignedByte(); // L: 110 + } else if (var2 == 29) { // L: 112 + this.horizontalAlignment = (HorizontalAlignment)TextureProvider.findEnumerated(BoundaryObject.method3386(), var1.readUnsignedByte()); // L: 113 + } else if (var2 == 30) { // L: 115 + VerticalAlignment[] var3 = new VerticalAlignment[]{VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3221, VerticalAlignment.field3225}; // L: 118 + this.verticalAlignment = (VerticalAlignment)TextureProvider.findEnumerated(var3, var1.readUnsignedByte()); // L: 120 } } } - } + } // L: 123 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "116" + descriptor = "(I)V", + garbageValue = "1332765917" ) - public void method4548() { - if (this.field3243 != null) { - for (int var1 = 0; var1 < this.field3243.length; var1 += 2) { - if (this.field3243[var1] < this.field3252) { - this.field3252 = this.field3243[var1]; - } else if (this.field3243[var1] > this.field3254) { - this.field3254 = this.field3243[var1]; + public void method4469() { + if (this.field3247 != null) { // L: 126 + for (int var1 = 0; var1 < this.field3247.length; var1 += 2) { // L: 127 + if (this.field3247[var1] < this.field3248) { // L: 128 + this.field3248 = this.field3247[var1]; + } else if (this.field3247[var1] > this.field3250) { // L: 129 + this.field3250 = this.field3247[var1]; } - if (this.field3243[var1 + 1] < this.field3242) { - this.field3242 = this.field3243[var1 + 1]; - } else if (this.field3243[var1 + 1] > this.field3255) { - this.field3255 = this.field3243[var1 + 1]; + if (this.field3247[var1 + 1] < this.field3249) { // L: 130 + this.field3249 = this.field3247[var1 + 1]; + } else if (this.field3247[var1 + 1] > this.field3251) { + this.field3251 = this.field3247[var1 + 1]; // L: 131 } } } - } + } // L: 134 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(ZI)Llz;", - garbageValue = "-314713437" + descriptor = "(ZI)Llp;", + garbageValue = "435474118" ) @Export("getSpriteBool") public Sprite getSpriteBool(boolean var1) { - int var2 = this.sprite1; - return this.getSprite(var2); + int var2 = this.sprite1; // L: 137 + return this.getSprite(var2); // L: 138 } - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(II)Llz;", - garbageValue = "1760825025" + descriptor = "(II)Llp;", + garbageValue = "-335461547" ) @Export("getSprite") Sprite getSprite(int var1) { - if (var1 < 0) { + if (var1 < 0) { // L: 142 return null; } else { - Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); - if (var2 != null) { + Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); // L: 143 + if (var2 != null) { // L: 144 return var2; } else { - var2 = GameShell.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); - if (var2 != null) { - WorldMapElement_cachedSprites.put(var2, (long)var1); + var2 = AbstractUserComparator.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); // L: 145 + if (var2 != null) { // L: 146 + WorldMapElement_cachedSprites.put(var2, (long)var1); // L: 147 } - return var2; + return var2; // L: 149 } } } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-1240109519" + descriptor = "(B)I", + garbageValue = "13" ) @Export("getObjectId") public int getObjectId() { - return this.objectId; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(Lkn;Llf;I)Llf;", - garbageValue = "1394866461" - ) - @Export("readStringIntParameters") - static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) { - int var2 = var0.readUnsignedByte(); - int var3; - if (var1 == null) { - int var4 = var2 - 1; - var4 |= var4 >>> 1; - var4 |= var4 >>> 2; - var4 |= var4 >>> 4; - var4 |= var4 >>> 8; - var4 |= var4 >>> 16; - var3 = var4 + 1; - var1 = new IterableNodeHashTable(var3); - } - - for (var3 = 0; var3 < var2; ++var3) { - boolean var7 = var0.readUnsignedByte() == 1; - int var5 = var0.readMedium(); - Object var6; - if (var7) { - var6 = new ObjectNode(var0.readStringCp1252NullTerminated()); - } else { - var6 = new IntegerNode(var0.readInt()); - } - - var1.put((Node)var6, (long)var5); - } - - return var1; - } - - @ObfuscatedName("aa") - @ObfuscatedSignature( - descriptor = "(ILhg;ZI)V", - garbageValue = "284772848" - ) - static void method4566(int var0, Coord var1, boolean var2) { - WorldMapArea var3 = ClanChat.getWorldMap().getMapArea(var0); - int var4 = class60.localPlayer.plane; - int var5 = (class60.localPlayer.x >> 7) + class182.baseX; - int var6 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; - Coord var7 = new Coord(var4, var5, var6); - ClanChat.getWorldMap().method6538(var3, var7, var1, var2); + return this.objectId; // L: 153 } } diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java index 954833725e..3e24291ac5 100644 --- a/runescape-client/src/main/java/WorldMapEvent.java +++ b/runescape-client/src/main/java/WorldMapEvent.java @@ -1,36 +1,25 @@ -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("au") +@ObfuscatedName("ak") @Implements("WorldMapEvent") public class WorldMapEvent { @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1506774655 - ) - @Export("Interpreter_stringStackSize") - static int Interpreter_stringStackSize; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1403861851 + intValue = 1732221889 ) @Export("mapElement") public int mapElement; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lhg;" ) @Export("coord1") public Coord coord1; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lhg;" ) @@ -41,528 +30,101 @@ public class WorldMapEvent { descriptor = "(ILhg;Lhg;)V" ) public WorldMapEvent(int var1, Coord var2, Coord var3) { - this.mapElement = var1; - this.coord1 = var2; - this.coord2 = var3; - } + this.mapElement = var1; // L: 11 + this.coord1 = var2; // L: 12 + this.coord2 = var3; // L: 13 + } // L: 14 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)J", - garbageValue = "-33276510" + descriptor = "(ILcy;ZI)I", + garbageValue = "-1029806693" ) - static long method839() { - try { - URL var0 = new URL(HealthBarDefinition.method4669("services", false) + "m=accountappeal/login.ws"); - URLConnection var1 = var0.openConnection(); - var1.setRequestProperty("connection", "close"); - var1.setDoInput(true); - var1.setDoOutput(true); - var1.setConnectTimeout(5000); - OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); - var2.write("data1=req"); - var2.flush(); - InputStream var3 = var1.getInputStream(); - Buffer var4 = new Buffer(new byte[1000]); - - do { - int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); - if (var5 == -1) { - var4.offset = 0; - long var7 = var4.readLong(); - return var7; - } - - var4.offset += var5; - } while(var4.offset < 1000); - - return 0L; - } catch (Exception var9) { - return 0L; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Lir;", - garbageValue = "-2114458170" - ) - @Export("KitDefinition_get") - public static KitDefinition KitDefinition_get(int var0) { - KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; + static int method830(int var0, Script var1, boolean var2) { + if (var0 < 1000) { // L: 389 + return ApproximateRouteStrategy.method1274(var0, var1, var2); + } else if (var0 < 1100) { // L: 390 + return GameBuild.method4218(var0, var1, var2); + } else if (var0 < 1200) { // L: 391 + return WorldMapLabel.method497(var0, var1, var2); + } else if (var0 < 1300) { // L: 392 + return class1.method22(var0, var1, var2); + } else if (var0 < 1400) { // L: 393 + return UrlRequester.method3419(var0, var1, var2); + } else if (var0 < 1500) { // L: 394 + return SecureRandomCallable.method1200(var0, var1, var2); + } else if (var0 < 1600) { // L: 395 + return AttackOption.method2152(var0, var1, var2); + } else if (var0 < 1700) { // L: 396 + return WorldMapLabelSize.method279(var0, var1, var2); + } else if (var0 < 1800) { // L: 397 + return WorldMapIcon_1.method378(var0, var1, var2); + } else if (var0 < 1900) { // L: 398 + return PendingSpawn.method1794(var0, var1, var2); + } else if (var0 < 2000) { // L: 399 + return HitSplatDefinition.method4698(var0, var1, var2); + } else if (var0 < 2100) { // L: 400 + return GameBuild.method4218(var0, var1, var2); + } else if (var0 < 2200) { // L: 401 + return WorldMapLabel.method497(var0, var1, var2); + } else if (var0 < 2300) { // L: 402 + return class1.method22(var0, var1, var2); + } else if (var0 < 2400) { // L: 403 + return UrlRequester.method3419(var0, var1, var2); + } else if (var0 < 2500) { // L: 404 + return SecureRandomCallable.method1200(var0, var1, var2); + } else if (var0 < 2600) { // L: 405 + return KeyHandler.method888(var0, var1, var2); + } else if (var0 < 2700) { // L: 406 + return KeyHandler.method890(var0, var1, var2); + } else if (var0 < 2800) { // L: 407 + return GrandExchangeOfferNameComparator.method231(var0, var1, var2); + } else if (var0 < 2900) { // L: 408 + return WorldMapDecoration.method405(var0, var1, var2); + } else if (var0 < 3000) { // L: 409 + return HitSplatDefinition.method4698(var0, var1, var2); + } else if (var0 < 3200) { // L: 410 + return GrandExchangeOfferWorldComparator.method141(var0, var1, var2); + } else if (var0 < 3300) { // L: 411 + return WorldMapID.method617(var0, var1, var2); + } else if (var0 < 3400) { // L: 412 + return WorldMapArea.method485(var0, var1, var2); + } else if (var0 < 3500) { // L: 413 + return class169.method3542(var0, var1, var2); + } else if (var0 < 3700) { // L: 414 + return Actor.method1798(var0, var1, var2); + } else if (var0 < 4000) { // L: 415 + return HealthBar.method2112(var0, var1, var2); + } else if (var0 < 4100) { // L: 416 + return class303.method5451(var0, var1, var2); + } else if (var0 < 4200) { // L: 417 + return GrandExchangeEvents.method144(var0, var1, var2); + } else if (var0 < 4300) { // L: 418 + return ArchiveDiskAction.method4231(var0, var1, var2); + } else if (var0 < 5100) { + return class171.method3544(var0, var1, var2); // L: 419 + } else if (var0 < 5400) { // L: 420 + return UserComparator7.method3513(var0, var1, var2); + } else if (var0 < 5600) { // L: 421 + return SoundCache.method2607(var0, var1, var2); + } else if (var0 < 5700) { // L: 422 + return AbstractWorldMapData.method351(var0, var1, var2); + } else if (var0 < 6300) { // L: 423 + return class336.method6380(var0, var1, var2); + } else if (var0 < 6600) { // L: 424 + return ItemDefinition.method4793(var0, var1, var2); } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; + return var0 < 6700 ? Player.method1324(var0, var1, var2) : 2; // L: 425 426 } } - @ObfuscatedName("q") + @ObfuscatedName("g") @ObfuscatedSignature( - descriptor = "(Lig;IIIBZI)V", - garbageValue = "-966731754" + descriptor = "(B)Lct;", + garbageValue = "-13" ) - @Export("requestNetFile") - static void requestNetFile(Archive var0, int var1, int var2, int var3, byte var4, boolean var5) { - long var6 = (long)((var1 << 16) + var2); - NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6); - if (var8 == null) { - var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6); - if (var8 != null) { - if (var5) { - var8.removeDual(); - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingPriorityWritesCount; - } - - } else { - if (!var5) { - var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6); - if (var8 != null) { - return; - } - } - - var8 = new NetFileRequest(); - var8.archive = var0; - var8.crc = var3; - var8.padding = var4; - if (var5) { - NetCache.NetCache_pendingPriorityWrites.put(var8, var6); - ++NetCache.NetCache_pendingPriorityWritesCount; - } else { - NetCache.NetCache_pendingWritesQueue.addFirst(var8); - NetCache.NetCache_pendingWrites.put(var8, var6); - ++NetCache.NetCache_pendingWritesCount; - } - - } - } - } - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "-1652034071" - ) - static int method836(int var0, Script var1, boolean var2) { - String var3; - if (var0 == ScriptOpcodes.MES) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; - ObjectSound.addGameMessage(0, "", var3); - return 1; - } else if (var0 == ScriptOpcodes.ANIM) { - UrlRequester.Interpreter_intStackSize -= 2; - SecureRandomCallable.performPlayerAnimation(class60.localPlayer, Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize], Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); - return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { - if (!Interpreter.field1118) { - Interpreter.field1125 = true; - } - - return 1; - } else { - int var10; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; - var10 = 0; - if (UserComparator7.isNumber(var3)) { - var10 = Tiles.parseInt(var3); - } - - PacketBufferNode var12 = UserComparator4.getPacketBufferNode(ClientPacket.field2298, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var10); - Client.packetWriter.addNode(var12); - return 1; - } else { - PacketBufferNode var14; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; - var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2270, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; - var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2312, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.addNode(var14); - return 1; - } else { - String var7; - int var15; - if (var0 == ScriptOpcodes.OPPLAYER) { - var15 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; - SoundCache.method2647(var15, var7); - return 1; - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - UrlRequester.Interpreter_intStackSize -= 3; - var15 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 2]; - Widget var13 = WorldMapSprite.getWidget(var9); - class60.clickWidget(var13, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - UrlRequester.Interpreter_intStackSize -= 2; - var15 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - Widget var11 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - class60.clickWidget(var11, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - ArchiveLoader.mouseCam = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = NetSocket.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - NetSocket.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - SpriteMask.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var3 = Interpreter.Interpreter_stringStack[--Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - WorldMapSectionType.openURL(var3, var4, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var15 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var14 = UserComparator4.getPacketBufferNode(ClientPacket.field2269, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(var15); - Client.packetWriter.addNode(var14); - return 1; - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var15 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = UserComparator4.getPacketBufferNode(ClientPacket.field2304, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + DynamicObject.stringCp1252NullTerminatedByteSize(var7) + DynamicObject.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - var6.packetBuffer.method5837(var15); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - Client.packetWriter.addNode(var6); - return 1; - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 1; - } else { - Client.drawPlayerNames &= -2; - } - - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 2; - } else { - Client.drawPlayerNames &= -3; - } - - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 4; - } else { - Client.drawPlayerNames &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1) { - Client.drawPlayerNames |= 8; - } else { - Client.drawPlayerNames &= -9; - } - - return 1; - } else if (var0 == 3124) { - Client.drawPlayerNames = 0; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - Skeleton.setTapToDrop(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Player.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - UrlRequester.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - UrlRequester.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --UrlRequester.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Varcs.canvasWidth; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class52.canvasHeight; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --UrlRequester.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - UrlRequester.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field835 = 3; - Client.field671 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field835 = 2; - Client.field671 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field835 = 0; - return 1; - } else if (var0 == 3139) { - Client.field835 = 1; - return 1; - } else if (var0 == 3140) { - Client.field835 = 3; - Client.field671 = var2 ? KeyHandler.field407.id * 40459347 * 1532053467 : SecureRandomCallable.field544.id * 40459347 * 1532053467; - return 1; - } else { - boolean var8; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - NetSocket.clientPreferences.hideUsername = var8; - SpriteMask.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = NetSocket.clientPreferences.hideUsername ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var8; - if (!var8) { - NetSocket.clientPreferences.rememberedUsername = ""; - SpriteMask.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } else if (var0 == 3145) { - return 1; - } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { - var8 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (var8 == NetSocket.clientPreferences.titleMusicDisabled) { - NetSocket.clientPreferences.titleMusicDisabled = !var8; - SpriteMask.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = NetSocket.clientPreferences.titleMusicDisabled ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = MusicPatchNode2.method3820(); - return 1; - } else if (var0 == 3155) { - --Interpreter_stringStackSize; - return 1; - } else if (var0 == 3156) { - return 1; - } else if (var0 == 3157) { - UrlRequester.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3158) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3159) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3160) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3161) { - --UrlRequester.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3162) { - --UrlRequester.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3163) { - --Interpreter_stringStackSize; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3164) { - --UrlRequester.Interpreter_intStackSize; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3165) { - --UrlRequester.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3166) { - UrlRequester.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3167) { - UrlRequester.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3168) { - UrlRequester.Interpreter_intStackSize -= 2; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Interpreter_stringStackSize - 1] = ""; - return 1; - } else if (var0 == 3169) { - return 1; - } else if (var0 == 3170) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3171) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3172) { - --UrlRequester.Interpreter_intStackSize; - return 1; - } else if (var0 == 3173) { - --UrlRequester.Interpreter_intStackSize; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3174) { - --UrlRequester.Interpreter_intStackSize; - return 1; - } else if (var0 == 3175) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3176) { - return 1; - } else if (var0 == 3177) { - return 1; - } else if (var0 == 3178) { - --Interpreter_stringStackSize; - return 1; - } else if (var0 == 3179) { - return 1; - } else if (var0 == 3180) { - --Interpreter_stringStackSize; - return 1; - } else { - return 2; - } - } - } - } - } - } - - @ObfuscatedName("hg") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "823242837" - ) - static void method840(int var0, int var1) { - int var2 = GrandExchangeOfferNameComparator.fontBold12.stringWidth("Choose Option"); - - int var3; - for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { - Font var4 = GrandExchangeOfferNameComparator.fontBold12; - String var5; - if (var3 < 0) { - var5 = ""; - } else if (Client.menuTargets[var3].length() > 0) { - var5 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; - } else { - var5 = Client.menuActions[var3]; - } - - int var6 = var4.stringWidth(var5); - if (var6 > var2) { - var2 = var6; - } - } - - var2 += 8; - var3 = Client.menuOptionsCount * 15 + 22; - int var7 = var0 - var2 / 2; - if (var2 + var7 > Varcs.canvasWidth) { - var7 = Varcs.canvasWidth - var2; - } - - if (var7 < 0) { - var7 = 0; - } - - int var8 = var1; - if (var3 + var1 > class52.canvasHeight) { - var8 = class52.canvasHeight - var3; - } - - if (var8 < 0) { - var8 = 0; - } - - WorldMapRectangle.menuX = var7; - Frames.menuY = var8; - class69.menuWidth = var2; - ApproximateRouteStrategy.menuHeight = Client.menuOptionsCount * 15 + 22; + @Export("getNextWorldListWorld") + static World getNextWorldListWorld() { + return World.World_listCount < World.World_count ? AbstractByteArrayCopier.World_worlds[++World.World_listCount - 1] : null; // L: 242 243 } } diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index c91e2e6c8a..394f8087b2 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -1,140 +1,363 @@ +import java.security.SecureRandom; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("an") +@ObfuscatedName("av") @Implements("WorldMapID") public class WorldMapID { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lav;" ) - static final WorldMapID field301; - @ObfuscatedName("o") + static final WorldMapID field291; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lan;" + descriptor = "Lav;" ) - static final WorldMapID field299; - @ObfuscatedName("am") - static String field300; - @ObfuscatedName("q") + static final WorldMapID field288; + @ObfuscatedName("t") + @Export("Interpreter_stringLocals") + static String[] Interpreter_stringLocals; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -2051394385 + intValue = 658473583 + ) + @Export("clientType") + public static int clientType; + @ObfuscatedName("dl") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive3") + static Archive archive3; + @ObfuscatedName("ev") + @Export("secureRandom") + static SecureRandom secureRandom; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 563184905 ) @Export("value") final int value; static { - field301 = new WorldMapID(0); - field299 = new WorldMapID(1); + field291 = new WorldMapID(0); // L: 4 + field288 = new WorldMapID(1); // L: 5 } WorldMapID(int var1) { - this.value = var1; - } + this.value = var1; // L: 9 + } // L: 10 - @ObfuscatedName("o") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V", - garbageValue = "-452075122" + descriptor = "(ILcy;ZI)I", + garbageValue = "1634458310" ) - @Export("addChatMessage") - static void addChatMessage(int var0, String var1, String var2, String var3) { - ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(var0); - if (var4 == null) { - var4 = new ChatChannel(); - Messages.Messages_channels.put(var0, var4); - } - - Message var5 = var4.addMessage(var0, var1, var2, var3); - Messages.Messages_hashTable.put(var5, (long)var5.count); - Messages.Messages_queue.add(var5); - Client.chatCycle = Client.cycleCntr; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-211582550" - ) - @Export("Widget_unpackTargetMask") - public static int Widget_unpackTargetMask(int var0) { - return var0 >> 11 & 63; - } - - @ObfuscatedName("gv") - @ObfuscatedSignature( - descriptor = "(IIIIZI)V", - garbageValue = "-1973135066" - ) - @Export("setViewportShape") - static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { - if (var2 < 1) { - var2 = 1; - } - - if (var3 < 1) { - var3 = 1; - } - - int var5 = var3 - 334; - int var6; - if (var5 < 0) { - var6 = Client.field727; - } else if (var5 >= 100) { - var6 = Client.field924; + static int method617(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.SOUND_SYNTH) { // L: 1705 + Interpreter.Interpreter_intStackSize -= 3; // L: 1706 + class7.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]); // L: 1707 + return 1; // L: 1708 + } else if (var0 == ScriptOpcodes.SOUND_SONG) { // L: 1710 + WorldMapCacheName.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 1711 + return 1; // L: 1712 + } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { // L: 1714 + Interpreter.Interpreter_intStackSize -= 2; // L: 1715 + class298.playSoundJingle(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 1716 + return 1; // L: 1717 } else { - var6 = (Client.field924 - Client.field727) * var5 / 100 + Client.field727; + return 2; // L: 1719 } - - int var7 = var3 * var6 * 512 / (var2 * 334); - int var8; - int var9; - short var10; - if (var7 < Client.field685) { - var10 = Client.field685; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 > Client.field928) { - var6 = Client.field928; - var8 = var3 * var6 * 512 / (var10 * 334); - var9 = (var2 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); - } - - var0 += var9; - var2 -= var9 * 2; - } - } else if (var7 > Client.field861) { - var10 = Client.field861; - var6 = var10 * var2 * 334 / (var3 * 512); - if (var6 < Client.field927) { - var6 = Client.field927; - var8 = var10 * var2 * 334 / (var6 * 512); - var9 = (var3 - var8) / 2; - if (var4) { - Rasterizer2D.Rasterizer2D_resetClip(); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); - } - - var1 += var9; - var3 -= var9 * 2; - } - } - - Client.viewportZoom = var3 * var6 / 334; - if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { - class23.method230(var2, var3); - } - - Client.viewportOffsetX = var0; - Client.viewportOffsetY = var1; - Client.viewportWidth = var2; - Client.viewportHeight = var3; } + + @ObfuscatedName("gd") + @ObfuscatedSignature( + descriptor = "(IIIII)V", + garbageValue = "1747274457" + ) + static final void method616(int var0, int var1, int var2, int var3) { + Client.overheadTextCount = 0; // L: 4841 + boolean var4 = false; // L: 4842 + int var5 = -1; // L: 4843 + int var6 = -1; // L: 4844 + int var7 = Players.Players_count; // L: 4845 + int[] var8 = Players.Players_indices; // L: 4846 + + int var9; + for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) { // L: 4847 + Object var20; + if (var9 < var7) { // L: 4849 + var20 = Client.players[var8[var9]]; // L: 4850 + if (var8[var9] == Client.combatTargetPlayerIndex) { // L: 4851 + var4 = true; // L: 4852 + var5 = var9; // L: 4853 + continue; + } + + if (var20 == WorldMapLabelSize.localPlayer) { // L: 4856 + var6 = var9; // L: 4857 + continue; // L: 4858 + } + } else { + var20 = Client.npcs[Client.npcIndices[var9 - var7]]; // L: 4861 + } + + GrandExchangeOfferNameComparator.drawActor2d((Actor)var20, var9, var0, var1, var2, var3); // L: 4862 + } + + if (Client.renderSelf && var6 != -1) { // L: 4864 + GrandExchangeOfferNameComparator.drawActor2d(WorldMapLabelSize.localPlayer, var6, var0, var1, var2, var3); // L: 4865 + } + + if (var4) { // L: 4867 + GrandExchangeOfferNameComparator.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3); // L: 4868 + } + + for (var9 = 0; var9 < Client.overheadTextCount; ++var9) { // L: 4870 + int var10 = Client.overheadTextXs[var9]; // L: 4871 + int var11 = Client.overheadTextYs[var9]; // L: 4872 + int var12 = Client.overheadTextXOffsets[var9]; // L: 4873 + int var13 = Client.overheadTextAscents[var9]; // L: 4874 + boolean var14 = true; // L: 4875 + + while (var14) { + var14 = false; // L: 4877 + + for (int var19 = 0; var19 < var9; ++var19) { // L: 4878 + if (var11 + 2 > Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] && var11 - var13 < Client.overheadTextYs[var19] + 2 && var10 - var12 < Client.overheadTextXs[var19] + Client.overheadTextXOffsets[var19] && var12 + var10 > Client.overheadTextXs[var19] - Client.overheadTextXOffsets[var19] && Client.overheadTextYs[var19] - Client.overheadTextAscents[var19] < var11) { // L: 4879 4880 + var11 = Client.overheadTextYs[var19] - Client.overheadTextAscents[var19]; // L: 4881 + var14 = true; // L: 4882 + } + } + } + + Client.viewportTempX = Client.overheadTextXs[var9]; // L: 4887 + Client.viewportTempY = Client.overheadTextYs[var9] = var11; // L: 4888 + String var15 = Client.overheadText[var9]; // L: 4889 + if (Client.chatEffects == 0) { // L: 4890 + int var16 = 16776960; // L: 4891 + if (Client.overheadTextColors[var9] < 6) { // L: 4892 + var16 = Client.field892[Client.overheadTextColors[var9]]; + } + + if (Client.overheadTextColors[var9] == 6) { // L: 4893 + var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960; + } + + if (Client.overheadTextColors[var9] == 7) { // L: 4894 + var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff'; + } + + if (Client.overheadTextColors[var9] == 8) { // L: 4895 + var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016; + } + + int var17; + if (Client.overheadTextColors[var9] == 9) { // L: 4896 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4897 + if (var17 < 50) { // L: 4898 + var16 = var17 * 1280 + 16711680; + } else if (var17 < 100) { // L: 4899 + var16 = 16776960 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 4900 + var16 = (var17 - 100) * 5 + 65280; + } + } + + if (Client.overheadTextColors[var9] == 10) { // L: 4902 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4903 + if (var17 < 50) { // L: 4904 + var16 = var17 * 5 + 16711680; + } else if (var17 < 100) { // L: 4905 + var16 = 16711935 - (var17 - 50) * 327680; + } else if (var17 < 150) { // L: 4906 + var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5; + } + } + + if (Client.overheadTextColors[var9] == 11) { // L: 4908 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4909 + if (var17 < 50) { // L: 4910 + var16 = 16777215 - var17 * 327685; + } else if (var17 < 100) { // L: 4911 + var16 = (var17 - 50) * 327685 + 65280; + } else if (var17 < 150) { // L: 4912 + var16 = 16777215 - (var17 - 100) * 327680; + } + } + + if (Client.overheadTextEffects[var9] == 0) { // L: 4914 + class4.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0); + } + + if (Client.overheadTextEffects[var9] == 1) { // L: 4915 + class4.fontBold12.drawCenteredWave(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 2) { // L: 4916 + class4.fontBold12.drawCenteredWave2(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount); + } + + if (Client.overheadTextEffects[var9] == 3) { // L: 4917 + class4.fontBold12.drawCenteredShake(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]); + } + + if (Client.overheadTextEffects[var9] == 4) { // L: 4918 + var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class4.fontBold12.stringWidth(var15) + 100) / 150; // L: 4919 + Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1); // L: 4920 + class4.fontBold12.draw(var15, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0); // L: 4921 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4922 + } + + if (Client.overheadTextEffects[var9] == 5) { // L: 4924 + var17 = 150 - Client.overheadTextCyclesRemaining[var9]; // L: 4925 + int var18 = 0; // L: 4926 + if (var17 < 25) { // L: 4927 + var18 = var17 - 25; + } else if (var17 > 125) { // L: 4928 + var18 = var17 - 125; + } + + Rasterizer2D.Rasterizer2D_expandClip(var0, Client.viewportTempY + var1 - class4.fontBold12.ascent - 1, var0 + var2, Client.viewportTempY + var1 + 5); // L: 4929 + class4.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, var18 + Client.viewportTempY + var1, var16, 0); // L: 4930 + Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1); // L: 4931 + } + } else { + class4.fontBold12.drawCentered(var15, var0 + Client.viewportTempX, Client.viewportTempY + var1, 16776960, 0); // L: 4935 + } + } + + } // L: 4938 + + @ObfuscatedName("gt") + @ObfuscatedSignature( + descriptor = "(ZLky;B)V", + garbageValue = "45" + ) + @Export("loadRegions") + static final void loadRegions(boolean var0, PacketBuffer var1) { + Client.isInInstance = var0; // L: 4988 + int var2; + int var3; + int var5; + int var6; + int var7; + int var8; + if (!Client.isInInstance) { // L: 4989 + var2 = var1.method5655(); // L: 4990 + var3 = var1.method5656(); // L: 4991 + int var4 = var1.readUnsignedShort(); // L: 4992 + BoundaryObject.xteaKeys = new int[var4][4]; // L: 4993 + + for (var5 = 0; var5 < var4; ++var5) { // L: 4994 + for (var6 = 0; var6 < 4; ++var6) { // L: 4995 + BoundaryObject.xteaKeys[var5][var6] = var1.readInt(); // L: 4996 + } + } + + class90.regions = new int[var4]; // L: 4999 + GrandExchangeEvents.regionMapArchiveIds = new int[var4]; // L: 5000 + Skeleton.regionLandArchiveIds = new int[var4]; // L: 5001 + AbstractUserComparator.regionLandArchives = new byte[var4][]; // L: 5002 + AbstractWorldMapData.regionMapArchives = new byte[var4][]; // L: 5003 + boolean var16 = false; // L: 5004 + if ((var2 / 8 == 48 || var2 / 8 == 49) && var3 / 8 == 48) { // L: 5005 + var16 = true; + } + + if (var2 / 8 == 48 && var3 / 8 == 148) { // L: 5006 + var16 = true; + } + + var4 = 0; // L: 5007 + + for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) { // L: 5008 + for (var7 = (var3 - 6) / 8; var7 <= (var3 + 6) / 8; ++var7) { // L: 5009 + var8 = var7 + (var6 << 8); // L: 5010 + if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5011 + class90.regions[var4] = var8; // L: 5012 + GrandExchangeEvents.regionMapArchiveIds[var4] = WorldMapLabel.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5013 + Skeleton.regionLandArchiveIds[var4] = WorldMapLabel.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5014 + ++var4; // L: 5015 + } + } + } + + Varps.method4067(var2, var3, true); // L: 5018 + } else { + var2 = var1.readUnsignedShort(); // L: 5021 + var3 = var1.method5656(); // L: 5022 + boolean var15 = var1.method5646() == 1; // L: 5023 + var5 = var1.readUnsignedShort(); // L: 5024 + var1.importIndex(); // L: 5025 + + int var9; + for (var6 = 0; var6 < 4; ++var6) { // L: 5026 + for (var7 = 0; var7 < 13; ++var7) { // L: 5027 + for (var8 = 0; var8 < 13; ++var8) { // L: 5028 + var9 = var1.readBits(1); // L: 5029 + if (var9 == 1) { + Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); // L: 5030 + } else { + Client.instanceChunkTemplates[var6][var7][var8] = -1; // L: 5031 + } + } + } + } + + var1.exportIndex(); // L: 5035 + BoundaryObject.xteaKeys = new int[var5][4]; // L: 5036 + + for (var6 = 0; var6 < var5; ++var6) { // L: 5037 + for (var7 = 0; var7 < 4; ++var7) { // L: 5038 + BoundaryObject.xteaKeys[var6][var7] = var1.readInt(); // L: 5039 + } + } + + class90.regions = new int[var5]; // L: 5042 + GrandExchangeEvents.regionMapArchiveIds = new int[var5]; // L: 5043 + Skeleton.regionLandArchiveIds = new int[var5]; // L: 5044 + AbstractUserComparator.regionLandArchives = new byte[var5][]; // L: 5045 + AbstractWorldMapData.regionMapArchives = new byte[var5][]; // L: 5046 + var5 = 0; // L: 5047 + + for (var6 = 0; var6 < 4; ++var6) { // L: 5048 + for (var7 = 0; var7 < 13; ++var7) { // L: 5049 + for (var8 = 0; var8 < 13; ++var8) { // L: 5050 + var9 = Client.instanceChunkTemplates[var6][var7][var8]; // L: 5051 + if (var9 != -1) { // L: 5052 + int var10 = var9 >> 14 & 1023; // L: 5053 + int var11 = var9 >> 3 & 2047; // L: 5054 + int var12 = (var10 / 8 << 8) + var11 / 8; // L: 5055 + + int var13; + for (var13 = 0; var13 < var5; ++var13) { // L: 5056 + if (class90.regions[var13] == var12) { + var12 = -1; // L: 5057 + break; // L: 5058 + } + } + + if (var12 != -1) { // L: 5060 + class90.regions[var5] = var12; // L: 5061 + var13 = var12 >> 8 & 255; // L: 5062 + int var14 = var12 & 255; // L: 5063 + GrandExchangeEvents.regionMapArchiveIds[var5] = WorldMapLabel.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5064 + Skeleton.regionLandArchiveIds[var5] = WorldMapLabel.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5065 + ++var5; // L: 5066 + } + } + } + } + } + + Varps.method4067(var3, var2, !var15); // L: 5072 + } + + } // L: 5074 } diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index 56ecb8d441..c8eee089c5 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -1,524 +1,119 @@ +import java.lang.management.GarbageCollectorMXBean; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ai") +@ObfuscatedName("ag") @Implements("WorldMapIcon_0") public class WorldMapIcon_0 extends AbstractWorldMapIcon { - @ObfuscatedName("sq") + @ObfuscatedName("ay") + @Export("garbageCollector") + static GarbageCollectorMXBean garbageCollector; + @ObfuscatedName("bu") @ObfuscatedSignature( - descriptor = "Lr;" + descriptor = "Lls;" ) - @Export("grandExchangeEvents") - static GrandExchangeEvents grandExchangeEvents; - @ObfuscatedName("m") + @Export("worldSelectLeftSprite") + static IndexedSprite worldSelectLeftSprite; + @ObfuscatedName("gl") @ObfuscatedGetter( - intValue = -2054953485 + intValue = 1560558325 + ) + static int field154; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -68382233 ) @Export("element") final int element; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Laq;" ) @Export("label") final WorldMapLabel label; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 841547123 + intValue = -1820517903 ) @Export("subWidth") final int subWidth; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -826275661 + intValue = 877531577 ) @Export("subHeight") final int subHeight; @ObfuscatedSignature( - descriptor = "(Lhg;Lhg;ILar;)V" + descriptor = "(Lhg;Lhg;ILaq;)V" ) WorldMapIcon_0(Coord var1, Coord var2, int var3, WorldMapLabel var4) { - super(var1, var2); - this.element = var3; - this.label = var4; - WorldMapElement var5 = Client.WorldMapElement_get(this.getElement()); - Sprite var6 = var5.getSpriteBool(false); - if (var6 != null) { - this.subWidth = var6.subWidth; - this.subHeight = var6.subHeight; + super(var1, var2); // L: 14 + this.element = var3; // L: 15 + this.label = var4; // L: 16 + WorldMapElement var5 = WorldMapSection0.WorldMapElement_get(this.getElement()); // L: 17 + Sprite var6 = var5.getSpriteBool(false); // L: 18 + if (var6 != null) { // L: 19 + this.subWidth = var6.subWidth; // L: 20 + this.subHeight = var6.subHeight; // L: 21 } else { - this.subWidth = 0; - this.subHeight = 0; + this.subWidth = 0; // L: 24 + this.subHeight = 0; // L: 25 } - } + } // L: 27 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-1613828162" ) @Export("getElement") public int getElement() { - return this.element; + return this.element; // L: 30 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)Lar;", - garbageValue = "35" + descriptor = "(I)Laq;", + garbageValue = "499378708" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; + return this.label; // L: 34 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1804331962" + garbageValue = "182515130" ) @Export("getSubWidth") int getSubWidth() { - return this.subWidth; + return this.subWidth; // L: 38 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1265869629" + garbageValue = "-2001682063" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; + return this.subHeight; // L: 42 } - @ObfuscatedName("q") + @ObfuscatedName("ko") @ObfuscatedSignature( - descriptor = "(II)[B", - garbageValue = "-116765930" + descriptor = "(Lhq;B)I", + garbageValue = "-82" ) - @Export("ByteArrayPool_getArray") - public static synchronized byte[] ByteArrayPool_getArray(int var0) { - return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); - } - - @ObfuscatedName("af") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1354105347" - ) - static int method265(int var0, Script var1, boolean var2) { - int var3; - if (var0 == 6600) { - var3 = TileItemPile.Client_plane; - int var9 = (class60.localPlayer.x >> 7) + class182.baseX; - int var5 = (class60.localPlayer.y >> 7) + SecureRandomFuture.baseY; - ClanChat.getWorldMap().method6532(var3, var9, var5, true); - return 1; - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - String var16 = ""; - var11 = ClanChat.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - ClanChat.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - ClanChat.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var15; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - ClanChat.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - ClanChat.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - ClanChat.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - ClanChat.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var13; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var13 = ClanChat.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var13 = ClanChat.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var13 = ClanChat.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var13 = ClanChat.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var15 = ClanChat.getWorldMap().getDisplayCoord(); - if (var15 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var15.y; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - var13 = ClanChat.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - if (var14 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var14[1]; - } - - return 1; - } - } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - var13 = ClanChat.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } - } else { - Coord var12; - if (var0 == 6619) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); - WorldMapElement.method4566(var3, var12, false); - return 1; - } else if (var0 == 6620) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); - WorldMapElement.method4566(var3, var12, true); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); - var11 = ClanChat.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - var13 = ClanChat.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } else if (var0 == 6624) { - ClanChat.getWorldMap().setMaxFlashCount(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - ClanChat.getWorldMap().resetMaxFlashCount(); - return 1; - } else if (var0 == 6626) { - ClanChat.getWorldMap().setCyclesPerFlash(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - ClanChat.getWorldMap().resetCyclesPerFlash(); - return 1; - } else { - boolean var10; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ClanChat.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - ClanChat.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - ClanChat.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - ClanChat.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var10 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ClanChat.getWorldMap().setElementsDisabled(var10); - return 1; - } else { - boolean var4; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1] == 1; - ClanChat.getWorldMap().disableElement(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1] == 1; - ClanChat.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClanChat.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]); - var7 = ClanChat.getWorldMap().method6575(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var8 = ClanChat.getWorldMap().iconStart(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var8 = ClanChat.getWorldMap().iconNext(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var6; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var6 = Client.WorldMapElement_get(var3); - if (var6.name == null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var6 = Client.WorldMapElement_get(var3); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var6 = Client.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - var6 = Client.WorldMapElement_get(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection3.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection3.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapSection3.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } - } - } - } - - @ObfuscatedName("gc") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-63078339" - ) - @Export("addNpcsToScene") - static final void addNpcsToScene(boolean var0) { - for (int var1 = 0; var1 < Client.npcCount; ++var1) { - NPC var2 = Client.npcs[Client.npcIndices[var1]]; - if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.transformIsVisible()) { - int var3 = var2.x >> 7; - int var4 = var2.y >> 7; - if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) { - if (var2.field967 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) { - if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) { - continue; - } - - Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount; - } - - long var5 = class206.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]); - var2.playerCycle = Client.cycle; - UserComparator3.scene.drawEntity(TileItemPile.Client_plane, var2.x, var2.y, Language.getTileHeight(var2.field967 * 64 - 64 + var2.x, var2.field967 * 64 - 64 + var2.y, TileItemPile.Client_plane), var2.field967 * 64 - 64 + 60, var2, var2.rotation, var5, var2.isWalking); - } - } - } - - } - - @ObfuscatedName("it") - @ObfuscatedSignature( - descriptor = "([Lhd;Lhd;ZS)V", - garbageValue = "-3141" - ) - @Export("revalidateWidgetScroll") - static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { - int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * 1772823043 * -897574741 : var1.width * 1667004247 * -75340697; - int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * -519746393 * -962880745 : var1.height * -2125257181 * 1991883147; - GrandExchangeOfferUnitPriceComparator.resizeInterface(var0, var1.id, var3, var4, var2); - if (var1.children != null) { - GrandExchangeOfferUnitPriceComparator.resizeInterface(var1.children, var1.id, var3, var4, var2); - } - - InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); - if (var5 != null) { - int var6 = var5.group; - if (UserComparator4.loadInterface(var6)) { - GrandExchangeOfferUnitPriceComparator.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); - } - } - - if (var1.contentType == 1337) { - } - + @Export("getWidgetFlags") + static int getWidgetFlags(Widget var0) { + IntegerNode var1 = (IntegerNode)Client.widgetFlags.get(((long)var0.id << 32) + (long)var0.childIndex); // L: 10711 + return var1 != null ? var1.integer : var0.flags; // L: 10712 10713 } } diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index 819956398d..029200d6d9 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -1,239 +1,268 @@ -import java.security.SecureRandom; +import java.applet.Applet; +import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; +import netscape.javascript.JSObject; -@ObfuscatedName("ab") +@ObfuscatedName("ap") @Implements("WorldMapIcon_1") public class WorldMapIcon_1 extends AbstractWorldMapIcon { - @ObfuscatedName("bc") - @ObfuscatedSignature( - descriptor = "Llh;" - ) - static IndexedSprite field206; - @ObfuscatedName("dj") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive14") - static Archive archive14; - @ObfuscatedName("m") + @ObfuscatedName("ew") @ObfuscatedGetter( - intValue = 1169931065 + intValue = 1433563031 + ) + static int field212; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = -18311555 ) @Export("objectDefId") final int objectDefId; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lap;" + descriptor = "Lal;" ) @Export("region") final WorldMapRegion region; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -278806663 + intValue = -2141926567 ) @Export("element") int element; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lar;" + descriptor = "Laq;" ) @Export("label") WorldMapLabel label; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -475422811 + intValue = 578089951 ) @Export("subWidth") int subWidth; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -463998497 + intValue = -258563275 ) @Export("subHeight") int subHeight; @ObfuscatedSignature( - descriptor = "(Lhg;Lhg;ILap;)V" + descriptor = "(Lhg;Lhg;ILal;)V" ) WorldMapIcon_1(Coord var1, Coord var2, int var3, WorldMapRegion var4) { - super(var1, var2); - this.objectDefId = var3; - this.region = var4; - this.init(); - } + super(var1, var2); // L: 17 + this.objectDefId = var3; // L: 18 + this.region = var4; // L: 19 + this.init(); // L: 20 + } // L: 21 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "0" + descriptor = "(I)I", + garbageValue = "-1613828162" ) @Export("getElement") public int getElement() { - return this.element; + return this.element; // L: 39 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(B)Lar;", - garbageValue = "35" + descriptor = "(I)Laq;", + garbageValue = "499378708" ) @Export("getLabel") WorldMapLabel getLabel() { - return this.label; + return this.label; // L: 43 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "1804331962" + garbageValue = "182515130" ) @Export("getSubWidth") int getSubWidth() { return this.subWidth; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-1265869629" + garbageValue = "-2001682063" ) @Export("getSubHeight") int getSubHeight() { - return this.subHeight; + return this.subHeight; // L: 51 } - @ObfuscatedName("d") + @ObfuscatedName("a") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "19136800" + garbageValue = "1388314285" ) @Export("init") void init() { - this.element = Canvas.getObjectDefinition(this.objectDefId).transform().mapIconId; - this.label = this.region.createMapLabel(Client.WorldMapElement_get(this.element)); - WorldMapElement var1 = Client.WorldMapElement_get(this.getElement()); - Sprite var2 = var1.getSpriteBool(false); - if (var2 != null) { - this.subWidth = var2.subWidth; - this.subHeight = var2.subHeight; + this.element = MidiPcmStream.getObjectDefinition(this.objectDefId).transform().mapIconId; // L: 24 + this.label = this.region.createMapLabel(WorldMapSection0.WorldMapElement_get(this.element)); // L: 25 + WorldMapElement var1 = WorldMapSection0.WorldMapElement_get(this.getElement()); // L: 26 + Sprite var2 = var1.getSpriteBool(false); // L: 27 + if (var2 != null) { // L: 28 + this.subWidth = var2.subWidth; // L: 29 + this.subHeight = var2.subHeight; // L: 30 } else { - this.subWidth = 0; - this.subHeight = 0; + this.subWidth = 0; // L: 33 + this.subHeight = 0; // L: 34 } + } // L: 36 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1482054985" + ) + static void method377() { + WorldMapRegion.WorldMapRegion_cachedSprites.clear(); // L: 46 + } // L: 47 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-40638792" + ) + @Export("getSceneXForObjectUnderMouse") + public static int getSceneXForObjectUnderMouse(int var0) { + return TileItem.Entity_unpackSceneX(ViewportMouse.ViewportMouse_entityTags[var0]); } - @ObfuscatedName("o") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)Ljava/security/SecureRandom;", - garbageValue = "1486718795" + descriptor = "(Ljava/lang/String;ILjava/lang/String;B)Z", + garbageValue = "126" ) - static SecureRandom method348() { - SecureRandom var0 = new SecureRandom(); - var0.nextInt(); - return var0; - } + static boolean method380(String var0, int var1, String var2) { + if (var1 == 0) { // L: 61 + try { + if (!class60.field451.startsWith("win")) { // L: 63 + throw new Exception(); + } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { // L: 64 + throw new Exception(); + } else { + String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; // L: 65 - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "([BIIIIIIILem;[Lfz;I)V", - garbageValue = "1704898412" - ) - static final void method365(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, Scene var8, CollisionMap[] var9) { - Buffer var10 = new Buffer(var0); - int var11 = -1; + for (int var4 = 0; var4 < var0.length(); ++var4) { // L: 66 + if (var11.indexOf(var0.charAt(var4)) == -1) { // L: 67 + throw new Exception(); + } + } - while (true) { - int var12 = var10.method5732(); - if (var12 == 0) { - return; + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); // L: 69 + return true; // L: 70 + } + } catch (Throwable var5) { // L: 72 + return false; // L: 73 + } + } else if (var1 == 1) { // L: 76 + try { + Object var10 = class56.method899(class60.applet, var2, new Object[]{(new URL(class60.applet.getCodeBase(), var0)).toString()}); // L: 78 + return var10 != null; // L: 79 + } catch (Throwable var6) { // L: 81 + return false; // L: 82 + } + } else if (var1 == 2) { // L: 85 + try { + class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_blank"); // L: 87 + return true; // L: 88 + } catch (Exception var7) { // L: 90 + return false; // L: 91 + } + } else if (var1 == 3) { // L: 94 + try { + Applet var3 = class60.applet; // L: 96 + JSObject.getWindow(var3).call("loggedout", (Object[])null); // L: 99 + } catch (Throwable var9) { // L: 102 } - var11 += var12; - int var13 = 0; - - while (true) { - int var14 = var10.readUShortSmart(); - if (var14 == 0) { - break; - } - - var13 += var14 - 1; - int var15 = var13 & 63; - int var16 = var13 >> 6 & 63; - int var17 = var13 >> 12; - int var18 = var10.readUnsignedByte(); - int var19 = var18 >> 2; - int var20 = var18 & 3; - if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) { - ObjectDefinition var21 = Canvas.getObjectDefinition(var11); - int var24 = var16 & 7; - int var25 = var15 & 7; - int var27 = var21.sizeX; - int var28 = var21.sizeY; - int var29; - if ((var20 & 1) == 1) { - var29 = var27; - var27 = var28; - var28 = var29; - } - - int var26 = var7 & 3; - int var23; - if (var26 == 0) { - var23 = var24; - } else if (var26 == 1) { - var23 = var25; - } else if (var26 == 2) { - var23 = 7 - var24 - (var27 - 1); - } else { - var23 = 7 - var25 - (var28 - 1); - } - - var29 = var23 + var2; - int var32 = var16 & 7; - int var33 = var15 & 7; - int var35 = var21.sizeX; - int var36 = var21.sizeY; - int var37; - if ((var20 & 1) == 1) { - var37 = var35; - var35 = var36; - var36 = var37; - } - - int var34 = var7 & 3; - int var31; - if (var34 == 0) { - var31 = var33; - } else if (var34 == 1) { - var31 = 7 - var32 - (var35 - 1); - } else if (var34 == 2) { - var31 = 7 - var33 - (var36 - 1); - } else { - var31 = var32; - } - - var37 = var31 + var3; - if (var29 > 0 && var37 > 0 && var29 < 103 && var37 < 103) { - int var38 = var1; - if ((Tiles.Tiles_renderFlags[1][var29][var37] & 2) == 2) { - var38 = var1 - 1; - } - - CollisionMap var39 = null; - if (var38 >= 0) { - var39 = var9[var38]; - } - - class41.method623(var1, var29, var37, var11, var20 + var7 & 3, var19, var8, var39); - } - } + try { + class60.applet.getAppletContext().showDocument(new URL(class60.applet.getCodeBase(), var0), "_top"); // L: 104 + return true; // L: 105 + } catch (Exception var8) { // L: 107 + return false; // L: 108 } + } else { + throw new IllegalArgumentException(); // L: 111 } } + + @ObfuscatedName("q") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "-1976803623" + ) + static int method378(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Canvas.field438 : class3.field12; // L: 1104 + if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1105 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId; // L: 1106 + return 1; // L: 1107 + } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { // L: 1109 + if (var3.itemId != -1) { // L: 1110 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1111 + } + + return 1; // L: 1112 + } else if (var0 == ScriptOpcodes.CC_GETID) { // L: 1114 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex; // L: 1115 + return 1; // L: 1116 + } else { + return 2; // L: 1118 + } + } + + @ObfuscatedName("go") + @ObfuscatedSignature( + descriptor = "(Lbs;I)V", + garbageValue = "777785142" + ) + static final void method375(PendingSpawn var0) { + long var1 = 0L; // L: 6635 + int var3 = -1; // L: 6636 + int var4 = 0; // L: 6637 + int var5 = 0; // L: 6638 + if (var0.type == 0) { // L: 6639 + var1 = ScriptEvent.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 1) { // L: 6640 + var1 = ScriptEvent.scene.getWallDecorationTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 2) { // L: 6641 + var1 = ScriptEvent.scene.getGameObjectTag(var0.plane, var0.x, var0.y); + } + + if (var0.type == 3) { // L: 6642 + var1 = ScriptEvent.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y); + } + + if (0L != var1) { // L: 6643 + int var6 = ScriptEvent.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1); // L: 6644 + var3 = UserComparator9.Entity_unpackID(var1); // L: 6645 + var4 = var6 & 31; // L: 6646 + var5 = var6 >> 6 & 3; // L: 6647 + } + + var0.objectId = var3; // L: 6649 + var0.field961 = var4; // L: 6650 + var0.field960 = var5; // L: 6651 + } // L: 6652 } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index 732a7317af..b9531c594e 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -5,623 +5,259 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ar") +@ObfuscatedName("aq") @Implements("WorldMapLabel") public class WorldMapLabel { - @ObfuscatedName("re") + @ObfuscatedName("do") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive5") + static Archive archive5; + @ObfuscatedName("gx") @ObfuscatedGetter( - intValue = 1522349817 + intValue = 2023281377 ) - static int field275; - @ObfuscatedName("n") - static byte[][][] field269; - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - @Export("Widget_fontsArchive") - static AbstractArchive Widget_fontsArchive; - @ObfuscatedName("ek") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive15") - static Archive archive15; - @ObfuscatedName("ez") - @ObfuscatedGetter( - intValue = -1537954811 - ) - @Export("port3") - static int port3; - @ObfuscatedName("fm") - @ObfuscatedSignature( - descriptor = "Lko;" - ) - @Export("fontPlain11") - static Font fontPlain11; - @ObfuscatedName("m") + @Export("baseY") + static int baseY; + @ObfuscatedName("z") @Export("text") String text; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1110407141 + intValue = 1365255333 ) @Export("width") int width; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = 1740933995 + intValue = 2029280505 ) @Export("height") int height; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Lab;" ) @Export("size") WorldMapLabelSize size; @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;IILah;)V" + descriptor = "(Ljava/lang/String;IILab;)V" ) WorldMapLabel(String var1, int var2, int var3, WorldMapLabelSize var4) { - this.text = var1; - this.width = var2; - this.height = var3; - this.size = var4; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "578317705" - ) - @Export("Widget_hasContinueOption") - public static boolean Widget_hasContinueOption(int var0) { - return (var0 & 1) != 0; - } + this.text = var1; // L: 10 + this.width = var2; // L: 11 + this.height = var3; // L: 12 + this.size = var4; // L: 13 + } // L: 14 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lbu;II)V", - garbageValue = "1472646677" + descriptor = "(ILcy;ZI)I", + garbageValue = "-1281997654" ) - @Export("runScript") - static void runScript(ScriptEvent var0, int var1) { - Object[] var2 = var0.args; - Script var3; - int var17; - if (ArchiveDiskActionHandler.isWorldMapEvent(var0.type)) { - WorldMapSection3.worldMapEvent = (WorldMapEvent)var2[0]; - WorldMapElement var4 = Client.WorldMapElement_get(WorldMapSection3.worldMapEvent.mapElement); - var3 = class4.getWorldMapScript(var0.type, var4.objectId, var4.category); + static int method497(int var0, Script var1, boolean var2) { + int var4 = -1; // L: 548 + Widget var3; + if (var0 >= 2000) { // L: 549 + var0 -= 1000; // L: 550 + var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 551 + var3 = TileItem.getWidget(var4); // L: 552 } else { - var17 = (Integer)var2[0]; - var3 = WorldMapSection0.getScript(var17); + var3 = var2 ? Canvas.field438 : class3.field12; // L: 554 } - if (var3 != null) { - UrlRequester.Interpreter_intStackSize = 0; - WorldMapEvent.Interpreter_stringStackSize = 0; - var17 = -1; - int[] var5 = var3.opcodes; - int[] var6 = var3.intOperands; - byte var7 = -1; - Interpreter.Interpreter_frameDepth = 0; - Interpreter.field1125 = false; + if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 555 + Interpreter.Interpreter_intStackSize -= 2; // L: 556 + var3.scrollX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 557 + if (var3.scrollX > var3.scrollWidth - var3.width) { // L: 558 + var3.scrollX = var3.scrollWidth - var3.width; + } - try { - int var10; - try { - Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; - int var8 = 0; - Interpreter.Interpreter_stringLocals = new String[var3.localStringCount]; - int var9 = 0; + if (var3.scrollX < 0) { // L: 559 + var3.scrollX = 0; + } - int var11; - String var18; - for (var10 = 1; var10 < var2.length; ++var10) { - if (var2[var10] instanceof Integer) { - var11 = (Integer)var2[var10]; - if (var11 == -2147483647) { - var11 = var0.mouseX; - } + var3.scrollY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 560 + if (var3.scrollY > var3.scrollHeight - var3.height) { // L: 561 + var3.scrollY = var3.scrollHeight - var3.height; + } - if (var11 == -2147483646) { - var11 = var0.mouseY; - } + if (var3.scrollY < 0) { // L: 562 + var3.scrollY = 0; + } - if (var11 == -2147483645) { - var11 = var0.widget != null ? var0.widget.id * 40459347 * 1532053467 : -1; - } - - if (var11 == -2147483644) { - var11 = var0.opIndex; - } - - if (var11 == -2147483643) { - var11 = var0.widget != null ? var0.widget.childIndex * 1593342751 * 94060767 : -1; - } - - if (var11 == -2147483642) { - var11 = var0.dragTarget != null ? var0.dragTarget.id * 40459347 * 1532053467 : -1; - } - - if (var11 == -2147483641) { - var11 = var0.dragTarget != null ? var0.dragTarget.childIndex * 1593342751 * 94060767 : -1; - } - - if (var11 == -2147483640) { - var11 = var0.keyTyped; - } - - if (var11 == -2147483639) { - var11 = var0.keyPressed; - } - - Interpreter.Interpreter_intLocals[var8++] = var11; - } else if (var2[var10] instanceof String) { - var18 = (String)var2[var10]; - if (var18.equals("event_opbase")) { - var18 = var0.targetName; - } - - Interpreter.Interpreter_stringLocals[var9++] = var18; - } - } - - var10 = 0; - Interpreter.field1132 = var0.field600; - - while (true) { - ++var10; - if (var10 > var1) { - throw new RuntimeException(); - } - - ++var17; - int var29 = var5[var17]; - int var20; - if (var29 >= 100) { - boolean var32; - if (var3.intOperands[var17] == 1) { - var32 = true; - } else { - var32 = false; - } - - var20 = class307.method5650(var29, var3, var32); - switch(var20) { - case 0: - return; - case 1: - default: - break; - case 2: - throw new IllegalStateException(); - } - } else if (var29 == 0) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = var6[var17]; - } else if (var29 == ScriptOpcodes.GET_VARP) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; - } else if (var29 == ScriptOpcodes.SET_VARP) { - var11 = var6[var17]; - Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - WorldMapSection0.changeGameOptions(var11); - } else if (var29 == ScriptOpcodes.SCONST) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; - } else if (var29 == ScriptOpcodes.JUMP) { - var17 += var6[var17]; - } else if (var29 == ScriptOpcodes.IF_ICMPNE) { - UrlRequester.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { - UrlRequester.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPLT) { - UrlRequester.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGT) { - UrlRequester.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.RETURN) { - if (Interpreter.Interpreter_frameDepth == 0) { - return; - } - - ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; - var3 = var34.script; - var5 = var3.opcodes; - var6 = var3.intOperands; - var17 = var34.pc; - Interpreter.Interpreter_intLocals = var34.intLocals; - Interpreter.Interpreter_stringLocals = var34.stringLocals; - } else if (var29 == ScriptOpcodes.GET_VARBIT) { - var11 = var6[var17]; - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Widget.getVarbit(var11); - } else if (var29 == ScriptOpcodes.SET_VARBIT) { - var11 = var6[var17]; - class257.method4679(var11, Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.IF_ICMPLE) { - UrlRequester.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.IF_ICMPGE) { - UrlRequester.Interpreter_intStackSize -= 2; - if (Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]) { - var17 += var6[var17]; - } - } else if (var29 == ScriptOpcodes.ILOAD) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.ISTORE) { - Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - } else if (var29 == ScriptOpcodes.SLOAD) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]]; - } else if (var29 == ScriptOpcodes.SSTORE) { - Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - } else if (var29 == ScriptOpcodes.JOIN_STRING) { - var11 = var6[var17]; - WorldMapEvent.Interpreter_stringStackSize -= var11; - String var31 = StructDefinition.method4718(Interpreter.Interpreter_stringStack, WorldMapEvent.Interpreter_stringStackSize, var11); - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var31; - } else if (var29 == ScriptOpcodes.POP_INT) { - --UrlRequester.Interpreter_intStackSize; - } else if (var29 == ScriptOpcodes.POP_STRING) { - --WorldMapEvent.Interpreter_stringStackSize; - } else { - int var15; - if (var29 != ScriptOpcodes.INVOKE) { - if (var29 == ScriptOpcodes.GET_VARC_INT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = AttackOption.varcs.getInt(var6[var17]); - } else if (var29 == ScriptOpcodes.SET_VARC_INT) { - AttackOption.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { - var11 = var6[var17] >> 16; - var20 = var6[var17] & 65535; - int var21 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (var21 < 0 || var21 > 5000) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrayLengths[var11] = var21; - byte var22 = -1; - if (var20 == 105) { - var22 = 0; - } - - for (var15 = 0; var15 < var21; ++var15) { - Interpreter.Interpreter_arrays[var11][var15] = var22; - } - } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { - var11 = var6[var17]; - var20 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; - } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { - var11 = var6[var17]; - UrlRequester.Interpreter_intStackSize -= 2; - var20 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { - throw new RuntimeException(); - } - - Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { - var18 = AttackOption.varcs.getStringOld(var6[var17]); - if (var18 == null) { - var18 = "null"; - } - - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { - AttackOption.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]); - } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { - var18 = AttackOption.varcs.getString(var6[var17]); - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var18; - } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { - AttackOption.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]); - } else { - if (var29 != ScriptOpcodes.SWITCH) { - throw new IllegalStateException(); - } - - IterableNodeHashTable var33 = var3.switches[var6[var17]]; - IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - if (var30 != null) { - var17 += var30.integer; - } - } - } else { - var11 = var6[var17]; - Script var12 = WorldMapSection0.getScript(var11); - int[] var13 = new int[var12.localIntCount]; - String[] var14 = new String[var12.localStringCount]; - - for (var15 = 0; var15 < var12.intArgumentCount; ++var15) { - var13[var15] = Interpreter.Interpreter_intStack[var15 + (UrlRequester.Interpreter_intStackSize - var12.intArgumentCount)]; - } - - for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { - var14[var15] = Interpreter.Interpreter_stringStack[var15 + (WorldMapEvent.Interpreter_stringStackSize - var12.stringArgumentCount)]; - } - - UrlRequester.Interpreter_intStackSize -= var12.intArgumentCount; - WorldMapEvent.Interpreter_stringStackSize -= var12.stringArgumentCount; - ScriptFrame var19 = new ScriptFrame(); - var19.script = var3; - var19.pc = var17; - var19.intLocals = Interpreter.Interpreter_intLocals; - var19.stringLocals = Interpreter.Interpreter_stringLocals; - Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; - var3 = var12; - var5 = var12.opcodes; - var6 = var12.intOperands; - var17 = -1; - Interpreter.Interpreter_intLocals = var13; - Interpreter.Interpreter_stringLocals = var14; - } - } - } - } catch (Exception var27) { - StringBuilder var24 = new StringBuilder(30); - var24.append("").append(var3.key).append(" "); - - for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { - var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); - } - - var24.append("").append(var7); - class197.RunException_sendStackTrace(var24.toString(), var27); - } - } finally { - if (Interpreter.field1125) { - Interpreter.field1118 = true; - class217.method4092(); - Interpreter.field1118 = false; - Interpreter.field1125 = false; + class52.invalidateWidget(var3); // L: 563 + return 1; // L: 564 + } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { // L: 566 + var3.color = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 567 + class52.invalidateWidget(var3); // L: 568 + return 1; // L: 569 + } else if (var0 == ScriptOpcodes.CC_SETFILL) { // L: 571 + var3.fill = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 572 + class52.invalidateWidget(var3); // L: 573 + return 1; // L: 574 + } else if (var0 == ScriptOpcodes.CC_SETTRANS) { // L: 576 + var3.transparencyTop = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 577 + class52.invalidateWidget(var3); // L: 578 + return 1; // L: 579 + } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { // L: 581 + var3.lineWid = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 582 + class52.invalidateWidget(var3); // L: 583 + return 1; // L: 584 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { // L: 586 + var3.spriteId2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 587 + class52.invalidateWidget(var3); // L: 588 + return 1; // L: 589 + } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { // L: 591 + var3.spriteAngle = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 592 + class52.invalidateWidget(var3); // L: 593 + return 1; // L: 594 + } else if (var0 == ScriptOpcodes.CC_SETTILING) { // L: 596 + var3.spriteTiling = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 597 + class52.invalidateWidget(var3); // L: 598 + return 1; // L: 599 + } else if (var0 == ScriptOpcodes.CC_SETMODEL) { // L: 601 + var3.modelType = 1; // L: 602 + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 603 + class52.invalidateWidget(var3); // L: 604 + return 1; // L: 605 + } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { // L: 607 + Interpreter.Interpreter_intStackSize -= 6; // L: 608 + var3.modelOffsetX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 609 + var3.modelOffsetY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 610 + var3.modelAngleX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 611 + var3.modelAngleY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 612 + var3.modelAngleZ = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 613 + var3.modelZoom = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 5]; // L: 614 + class52.invalidateWidget(var3); // L: 615 + return 1; // L: 616 + } else { + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { // L: 618 + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 619 + if (var8 != var3.sequenceId) { // L: 620 + var3.sequenceId = var8; // L: 621 + var3.modelFrame = 0; // L: 622 + var3.modelFrameCycle = 0; // L: 623 + class52.invalidateWidget(var3); // L: 624 } + return 1; // L: 626 + } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { // L: 628 + var3.modelOrthog = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 629 + class52.invalidateWidget(var3); // L: 630 + return 1; // L: 631 + } else if (var0 == ScriptOpcodes.CC_SETTEXT) { // L: 633 + String var7 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 634 + if (!var7.equals(var3.text)) { // L: 635 + var3.text = var7; // L: 636 + class52.invalidateWidget(var3); // L: 637 + } + + return 1; // L: 639 + } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { // L: 641 + var3.fontId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 642 + class52.invalidateWidget(var3); // L: 643 + return 1; // L: 644 + } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { // L: 646 + Interpreter.Interpreter_intStackSize -= 3; // L: 647 + var3.textXAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 648 + var3.textYAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 649 + var3.textLineHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 650 + class52.invalidateWidget(var3); // L: 651 + return 1; // L: 652 + } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { // L: 654 + var3.textShadowed = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 655 + class52.invalidateWidget(var3); // L: 656 + return 1; // L: 657 + } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { // L: 659 + var3.outline = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 660 + class52.invalidateWidget(var3); // L: 661 + return 1; // L: 662 + } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { // L: 664 + var3.spriteShadow = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 665 + class52.invalidateWidget(var3); // L: 666 + return 1; // L: 667 + } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { // L: 669 + var3.spriteFlipV = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 670 + class52.invalidateWidget(var3); // L: 671 + return 1; // L: 672 + } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { // L: 674 + var3.spriteFlipH = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 675 + class52.invalidateWidget(var3); // L: 676 + return 1; // L: 677 + } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { // L: 679 + Interpreter.Interpreter_intStackSize -= 2; // L: 680 + var3.scrollWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 681 + var3.scrollHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 682 + class52.invalidateWidget(var3); // L: 683 + if (var4 != -1 && var3.type == 0) { // L: 684 + class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; // L: 685 + } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { // L: 687 + AbstractSocket.resumePauseWidget(var3.id, var3.childIndex); // L: 688 + Client.meslayerContinueWidget = var3; // L: 689 + class52.invalidateWidget(var3); // L: 690 + return 1; // L: 691 + } else if (var0 == 1122) { // L: 693 + var3.spriteId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 694 + class52.invalidateWidget(var3); // L: 695 + return 1; // L: 696 + } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { // L: 698 + var3.color2 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 699 + class52.invalidateWidget(var3); // L: 700 + return 1; // L: 701 + } else if (var0 == 1124) { // L: 703 + var3.transparencyBot = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 704 + class52.invalidateWidget(var3); // L: 705 + return 1; // L: 706 + } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 708 + var8 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 709 + FillMode var6 = (FillMode)TextureProvider.findEnumerated(class25.FillMode_values(), var8); // L: 710 + if (var6 != null) { // L: 711 + var3.fillMode = var6; // L: 712 + class52.invalidateWidget(var3); // L: 713 + } + + return 1; // L: 715 + } else { + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { // L: 717 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 718 + var3.field2639 = var5; // L: 719 + return 1; // L: 720 + } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { // L: 722 + var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1; // L: 723 + var3.modelTransparency = var5; // L: 724 + return 1; // L: 725 + } else { + return 2; // L: 727 + } } } } - @ObfuscatedName("q") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IB)J", + descriptor = "(B)V", garbageValue = "88" ) - @Export("getEntityUnderMouse") - public static long getEntityUnderMouse(int var0) { - return ViewportMouse.ViewportMouse_entityTags[var0]; - } + protected static final void method498() { + AbstractWorldMapIcon.clock.mark(); // L: 404 - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "807704553" - ) - @Export("Messages_getLastChatID") - static int Messages_getLastChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; - } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; - } - } - - @ObfuscatedName("ff") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1944038316" - ) - static final void method488() { - int var0 = class204.field2420 * 128 + 64; - int var1 = WorldMapManager.field348 * 128 + 64; - int var2 = Language.getTileHeight(var0, var1, TileItemPile.Client_plane) - field275; - if (MouseHandler.cameraX < var0) { - MouseHandler.cameraX = (var0 - MouseHandler.cameraX) * ScriptEvent.field604 / 1000 + MouseHandler.cameraX + class25.field122; - if (MouseHandler.cameraX > var0) { - MouseHandler.cameraX = var0; - } + int var0; + for (var0 = 0; var0 < 32; ++var0) { // L: 405 + GameShell.graphicsTickTimes[var0] = 0L; } - if (MouseHandler.cameraX > var0) { - MouseHandler.cameraX -= ScriptEvent.field604 * (MouseHandler.cameraX - var0) / 1000 + class25.field122; - if (MouseHandler.cameraX < var0) { - MouseHandler.cameraX = var0; - } + for (var0 = 0; var0 < 32; ++var0) { // L: 406 + GameShell.clientTickTimes[var0] = 0L; } - if (WorldMapSection3.cameraY < var2) { - WorldMapSection3.cameraY = (var2 - WorldMapSection3.cameraY) * ScriptEvent.field604 / 1000 + WorldMapSection3.cameraY + class25.field122; - if (WorldMapSection3.cameraY > var2) { - WorldMapSection3.cameraY = var2; - } - } - - if (WorldMapSection3.cameraY > var2) { - WorldMapSection3.cameraY -= ScriptEvent.field604 * (WorldMapSection3.cameraY - var2) / 1000 + class25.field122; - if (WorldMapSection3.cameraY < var2) { - WorldMapSection3.cameraY = var2; - } - } - - if (ObjectSound.cameraZ < var1) { - ObjectSound.cameraZ = (var1 - ObjectSound.cameraZ) * ScriptEvent.field604 / 1000 + ObjectSound.cameraZ + class25.field122; - if (ObjectSound.cameraZ > var1) { - ObjectSound.cameraZ = var1; - } - } - - if (ObjectSound.cameraZ > var1) { - ObjectSound.cameraZ -= ScriptEvent.field604 * (ObjectSound.cameraZ - var1) / 1000 + class25.field122; - if (ObjectSound.cameraZ < var1) { - ObjectSound.cameraZ = var1; - } - } - - var0 = DevicePcmPlayerProvider.field435 * 128 + 64; - var1 = class9.field42 * 128 + 64; - var2 = Language.getTileHeight(var0, var1, TileItemPile.Client_plane) - class206.field2446; - int var3 = var0 - MouseHandler.cameraX; - int var4 = var2 - WorldMapSection3.cameraY; - int var5 = var1 - ObjectSound.cameraZ; - int var6 = (int)Math.sqrt((double)(var3 * var3 + var5 * var5)); - int var7 = (int)(Math.atan2((double)var4, (double)var6) * 325.949D) & 2047; - int var8 = (int)(Math.atan2((double)var3, (double)var5) * -325.949D) & 2047; - if (var7 < 128) { - var7 = 128; - } - - if (var7 > 383) { - var7 = 383; - } - - if (TilePaint.cameraPitch < var7) { - TilePaint.cameraPitch = (var7 - TilePaint.cameraPitch) * WorldMapCacheName.field329 / 1000 + TilePaint.cameraPitch + class329.field3867; - if (TilePaint.cameraPitch > var7) { - TilePaint.cameraPitch = var7; - } - } - - if (TilePaint.cameraPitch > var7) { - TilePaint.cameraPitch -= WorldMapCacheName.field329 * (TilePaint.cameraPitch - var7) / 1000 + class329.field3867; - if (TilePaint.cameraPitch < var7) { - TilePaint.cameraPitch = var7; - } - } - - int var9 = var8 - Canvas.cameraYaw; - if (var9 > 1024) { - var9 -= 2048; - } - - if (var9 < -1024) { - var9 += 2048; - } - - if (var9 > 0) { - Canvas.cameraYaw = Canvas.cameraYaw + class329.field3867 + var9 * WorldMapCacheName.field329 / 1000; - Canvas.cameraYaw &= 2047; - } - - if (var9 < 0) { - Canvas.cameraYaw -= class329.field3867 + -var9 * WorldMapCacheName.field329 / 1000; - Canvas.cameraYaw &= 2047; - } - - int var10 = var8 - Canvas.cameraYaw; - if (var10 > 1024) { - var10 -= 2048; - } - - if (var10 < -1024) { - var10 += 2048; - } - - if (var10 < 0 && var9 > 0 || var10 > 0 && var9 < 0) { - Canvas.cameraYaw = var8; - } - - } - - @ObfuscatedName("il") - @ObfuscatedSignature( - descriptor = "(Lhd;III)V", - garbageValue = "-488696963" - ) - @Export("alignWidgetPosition") - static void alignWidgetPosition(Widget var0, int var1, int var2) { - if (var0.xAlignment == 0) { - var0.x = var0.rawX; - } else if (var0.xAlignment == 1) { - var0.x = var0.rawX + (var1 - var0.width) / 2; - } else if (var0.xAlignment == 2) { - var0.x = var1 - var0.width - var0.rawX; - } else if (var0.xAlignment == 3) { - var0.x = var0.rawX * var1 >> 14; - } else if (var0.xAlignment == 4) { - var0.x = (var1 - var0.width) / 2 + (var0.rawX * var1 >> 14); - } else { - var0.x = var1 - var0.width - (var0.rawX * var1 >> 14); - } - - if (var0.yAlignment == 0) { - var0.y = var0.rawY; - } else if (var0.yAlignment == 1) { - var0.y = (var2 - var0.height) / 2 + var0.rawY; - } else if (var0.yAlignment == 2) { - var0.y = var2 - var0.height - var0.rawY; - } else if (var0.yAlignment == 3) { - var0.y = var2 * var0.rawY >> 14; - } else if (var0.yAlignment == 4) { - var0.y = (var2 - var0.height) / 2 + (var2 * var0.rawY >> 14); - } else { - var0.y = var2 - var0.height - (var2 * var0.rawY >> 14); - } - - } - - @ObfuscatedName("jv") - @ObfuscatedSignature( - descriptor = "(IIII)Lbz;", - garbageValue = "1553809797" - ) - static final InterfaceParent method486(int var0, int var1, int var2) { - InterfaceParent var3 = new InterfaceParent(); - var3.group = var1; - var3.type = var2; - Client.interfaceParents.put(var3, (long)var0); - WorldMapSection3.Widget_resetModelFrames(var1); - Widget var4 = WorldMapSprite.getWidget(var0); - class234.invalidateWidget(var4); - if (Client.meslayerContinueWidget != null) { - class234.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - int var7 = Client.menuOpcodes[var5]; - boolean var6 = var7 == 57 || var7 == 58 || var7 == 1007 || var7 == 25 || var7 == 30; - if (var6) { - if (var5 < Client.menuOptionsCount - 1) { - for (int var8 = var5; var8 < Client.menuOptionsCount - 1; ++var8) { - Client.menuActions[var8] = Client.menuActions[var8 + 1]; - Client.menuTargets[var8] = Client.menuTargets[var8 + 1]; - Client.menuOpcodes[var8] = Client.menuOpcodes[var8 + 1]; - Client.menuIdentifiers[var8] = Client.menuIdentifiers[var8 + 1]; - Client.menuArguments1[var8] = Client.menuArguments1[var8 + 1]; - Client.menuArguments2[var8] = Client.menuArguments2[var8 + 1]; - Client.menuShiftClick[var8] = Client.menuShiftClick[var8 + 1]; - } - } - - --var5; - --Client.menuOptionsCount; - } - } - - WorldMapEvent.method840(class69.menuWidth / 2 + WorldMapRectangle.menuX, Frames.menuY); - WorldMapIcon_0.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); - UserComparator4.runWidgetOnLoadListener(var1); - if (Client.rootInterface != -1) { - Language.runIntfCloseListeners(Client.rootInterface, 1); - } - - return var3; - } + class58.gameCyclesToDo = 0; // L: 407 + } // L: 408 } diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java index b43e0e0bed..87a495f308 100644 --- a/runescape-client/src/main/java/WorldMapLabelSize.java +++ b/runescape-client/src/main/java/WorldMapLabelSize.java @@ -1,122 +1,375 @@ +import java.lang.reflect.Field; +import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ah") +@ObfuscatedName("ab") @Implements("WorldMapLabelSize") public class WorldMapLabelSize { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Lab;" ) @Export("WorldMapLabelSize_small") public static final WorldMapLabelSize WorldMapLabelSize_small; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Lab;" ) @Export("WorldMapLabelSize_medium") public static final WorldMapLabelSize WorldMapLabelSize_medium; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lah;" + descriptor = "Lab;" ) @Export("WorldMapLabelSize_large") public static final WorldMapLabelSize WorldMapLabelSize_large; - @ObfuscatedName("ey") - @ObfuscatedGetter( - intValue = 1573352615 - ) - static int field134; - @ObfuscatedName("fw") + @ObfuscatedName("bl") + @Export("otp") + static String otp; + @ObfuscatedName("km") @ObfuscatedSignature( - descriptor = "Leh;" + descriptor = "Lbf;" ) - @Export("urlRequester") - static UrlRequester urlRequester; - @ObfuscatedName("j") + @Export("localPlayer") + static Player localPlayer; + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 20574645 + intValue = 1823121257 ) - final int field130; - @ObfuscatedName("p") + final int field141; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1754805069 + intValue = -1477308657 ) - final int field132; - @ObfuscatedName("g") + final int field142; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 629937619 + intValue = -2124591757 ) - final int field133; + final int field143; static { - WorldMapLabelSize_small = new WorldMapLabelSize(1, 0, 4); - WorldMapLabelSize_medium = new WorldMapLabelSize(0, 1, 2); - WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); + WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4); // L: 7 + WorldMapLabelSize_medium = new WorldMapLabelSize(1, 1, 2); // L: 8 + WorldMapLabelSize_large = new WorldMapLabelSize(2, 2, 0); // L: 9 } WorldMapLabelSize(int var1, int var2, int var3) { - this.field130 = var1; - this.field132 = var2; - this.field133 = var3; - } + this.field141 = var1; // L: 19 + this.field142 = var2; // L: 20 + this.field143 = var3; // L: 21 + } // L: 22 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(FI)Z", - garbageValue = "-645861568" + garbageValue = "459902190" ) - boolean method246(float var1) { - return var1 >= (float)this.field133; + boolean method274(float var1) { + return var1 >= (float)this.field143; // L: 25 } - @ObfuscatedName("q") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Lhd;", - garbageValue = "-756668004" + descriptor = "(I)[Lab;", + garbageValue = "-681769299" ) - @Export("getWidgetChild") - public static Widget getWidgetChild(int var0, int var1) { - Widget var2 = WorldMapSprite.getWidget(var0); - if (var1 == -1) { - return var2; + static WorldMapLabelSize[] method272() { + return new WorldMapLabelSize[]{WorldMapLabelSize_large, WorldMapLabelSize_small, WorldMapLabelSize_medium}; // L: 15 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)Lab;", + garbageValue = "-1798165696" + ) + static WorldMapLabelSize method270(int var0) { + WorldMapLabelSize[] var1 = method272(); // L: 30 + + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 31 + WorldMapLabelSize var3 = var1[var2]; // L: 32 + if (var0 == var3.field142) { // L: 34 + return var3; // L: 35 + } + } + + return null; // L: 40 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(Lkf;IB)V", + garbageValue = "-8" + ) + @Export("readReflectionCheck") + public static void readReflectionCheck(Buffer var0, int var1) { + ReflectionCheck var2 = new ReflectionCheck(); // L: 127 + var2.size = var0.readUnsignedByte(); // L: 128 + var2.id = var0.readInt(); // L: 129 + var2.operations = new int[var2.size]; // L: 130 + var2.creationErrors = new int[var2.size]; // L: 131 + var2.fields = new Field[var2.size]; // L: 132 + var2.intReplaceValues = new int[var2.size]; // L: 133 + var2.methods = new Method[var2.size]; // L: 134 + var2.arguments = new byte[var2.size][][]; // L: 135 + + for (int var3 = 0; var3 < var2.size; ++var3) { // L: 136 + try { + int var4 = var0.readUnsignedByte(); // L: 138 + String var5; + String var6; + int var7; + if (var4 != 0 && var4 != 1 && var4 != 2) { // L: 139 + if (var4 == 3 || var4 == 4) { // L: 149 + var5 = var0.readStringCp1252NullTerminated(); // L: 150 + var6 = var0.readStringCp1252NullTerminated(); // L: 151 + var7 = var0.readUnsignedByte(); // L: 152 + String[] var8 = new String[var7]; // L: 153 + + for (int var9 = 0; var9 < var7; ++var9) { // L: 154 + var8[var9] = var0.readStringCp1252NullTerminated(); + } + + String var20 = var0.readStringCp1252NullTerminated(); // L: 155 + byte[][] var10 = new byte[var7][]; // L: 156 + int var12; + if (var4 == 3) { // L: 157 + for (int var11 = 0; var11 < var7; ++var11) { // L: 158 + var12 = var0.readInt(); // L: 159 + var10[var11] = new byte[var12]; // L: 160 + var0.readBytes(var10[var11], 0, var12); // L: 161 + } + } + + var2.operations[var3] = var4; // L: 164 + Class[] var21 = new Class[var7]; // L: 165 + + for (var12 = 0; var12 < var7; ++var12) { // L: 166 + var21[var12] = class197.loadClassFromDescriptor(var8[var12]); + } + + Class var22 = class197.loadClassFromDescriptor(var20); // L: 167 + if (class197.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 168 + throw new SecurityException(); + } + + Method[] var13 = class197.loadClassFromDescriptor(var5).getDeclaredMethods(); // L: 169 + Method[] var14 = var13; // L: 171 + + for (int var15 = 0; var15 < var14.length; ++var15) { // L: 172 + Method var16 = var14[var15]; // L: 173 + if (Reflection.getMethodName(var16).equals(var6)) { // L: 175 + Class[] var17 = Reflection.getParameterTypes(var16); // L: 176 + if (var21.length == var17.length) { // L: 177 + boolean var18 = true; // L: 178 + + for (int var19 = 0; var19 < var21.length; ++var19) { // L: 179 + if (var17[var19] != var21[var19]) { // L: 180 + var18 = false; // L: 181 + break; // L: 182 + } + } + + if (var18 && var22 == var16.getReturnType()) { // L: 185 + var2.methods[var3] = var16; // L: 186 + } + } + } + } + + var2.arguments[var3] = var10; // L: 193 + } + } else { + var5 = var0.readStringCp1252NullTerminated(); // L: 140 + var6 = var0.readStringCp1252NullTerminated(); // L: 141 + var7 = 0; // L: 142 + if (var4 == 1) { // L: 143 + var7 = var0.readInt(); + } + + var2.operations[var3] = var4; // L: 144 + var2.intReplaceValues[var3] = var7; // L: 145 + if (class197.loadClassFromDescriptor(var5).getClassLoader() == null) { // L: 146 + throw new SecurityException(); + } + + var2.fields[var3] = Reflection.findField(class197.loadClassFromDescriptor(var5), var6); // L: 147 + } + } catch (ClassNotFoundException var24) { // L: 196 + var2.creationErrors[var3] = -1; // L: 197 + } catch (SecurityException var25) { // L: 199 + var2.creationErrors[var3] = -2; // L: 200 + } catch (NullPointerException var26) { // L: 202 + var2.creationErrors[var3] = -3; // L: 203 + } catch (Exception var27) { // L: 205 + var2.creationErrors[var3] = -4; // L: 206 + } catch (Throwable var28) { // L: 208 + var2.creationErrors[var3] = -5; // L: 209 + } + } + + class105.reflectionChecks.addFirst(var2); // L: 212 + } // L: 213 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(ILcy;ZB)I", + garbageValue = "-71" + ) + static int method279(int var0, Script var1, boolean var2) { + Widget var3 = var2 ? Canvas.field438 : class3.field12; // L: 1039 + if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1040 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1041 + return 1; // L: 1042 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { // L: 1044 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollY; // L: 1045 + return 1; // L: 1046 + } else if (var0 == ScriptOpcodes.CC_GETTEXT) { // L: 1048 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.text; // L: 1049 + return 1; // L: 1050 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { // L: 1052 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollWidth; // L: 1053 + return 1; // L: 1054 + } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { // L: 1056 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.scrollHeight; // L: 1057 + return 1; // L: 1058 + } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { // L: 1060 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelZoom; // L: 1061 + return 1; // L: 1062 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { // L: 1064 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleX; // L: 1065 + return 1; // L: 1066 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { // L: 1068 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleZ; // L: 1069 + return 1; // L: 1070 + } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { // L: 1072 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelAngleY; // L: 1073 + return 1; // L: 1074 + } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { // L: 1076 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyTop; // L: 1077 + return 1; // L: 1078 + } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { // L: 1080 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.transparencyBot; // L: 1081 + return 1; // L: 1082 + } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { // L: 1084 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color; // L: 1085 + return 1; // L: 1086 + } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { // L: 1088 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.color2; // L: 1089 + return 1; // L: 1090 + } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { // L: 1092 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); // L: 1093 + return 1; // L: 1094 + } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { // L: 1096 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; // L: 1097 + return 1; // L: 1098 } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; + return 2; // L: 1100 } } - @ObfuscatedName("g") + @ObfuscatedName("ev") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1950669116" + descriptor = "(IZZZI)Liw;", + garbageValue = "-1692884564" ) - public static boolean method251() { - return class206.field2439 != 0 ? true : WorldMapSprite.midiPcmStream.isReady(); - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1407102588" - ) - static final void method249() { - Object var10000 = null; - String var0 = "You can't add yourself to your own friend list"; - ObjectSound.addGameMessage(30, "", var0); - } - - @ObfuscatedName("kw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2140827250" - ) - static void method247() { - if (Client.oculusOrbState == 1) { - Client.field756 = true; + @Export("newArchive") + static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { + ArchiveDisk var4 = null; // L: 1847 + if (JagexCache.JagexCache_dat2File != null) { // L: 1848 + var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000); } + return new Archive(var4, Skeleton.masterDisk, var0, var1, var2, var3); // L: 1849 } + + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "(IIIIIIII)V", + garbageValue = "-775156313" + ) + @Export("addPendingSpawnToScene") + static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { // L: 6655 + if (Client.isLowDetail && var0 != Huffman.Client_plane) { // L: 6656 + return; + } + + long var7 = 0L; // L: 6657 + boolean var9 = true; // L: 6658 + boolean var10 = false; // L: 6659 + boolean var11 = false; // L: 6660 + if (var1 == 0) { // L: 6661 + var7 = ScriptEvent.scene.getBoundaryObjectTag(var0, var2, var3); + } + + if (var1 == 1) { // L: 6662 + var7 = ScriptEvent.scene.getWallDecorationTag(var0, var2, var3); + } + + if (var1 == 2) { // L: 6663 + var7 = ScriptEvent.scene.getGameObjectTag(var0, var2, var3); + } + + if (var1 == 3) { // L: 6664 + var7 = ScriptEvent.scene.getFloorDecorationTag(var0, var2, var3); + } + + int var12; + if (var7 != 0L) { // L: 6665 + var12 = ScriptEvent.scene.getObjectFlags(var0, var2, var3, var7); // L: 6666 + int var14 = UserComparator9.Entity_unpackID(var7); // L: 6667 + int var15 = var12 & 31; // L: 6668 + int var16 = var12 >> 6 & 3; // L: 6669 + ObjectDefinition var13; + if (var1 == 0) { // L: 6670 + ScriptEvent.scene.removeBoundaryObject(var0, var2, var3); // L: 6671 + var13 = MidiPcmStream.getObjectDefinition(var14); // L: 6672 + if (var13.interactType != 0) { // L: 6673 + Client.collisionMaps[var0].method3635(var2, var3, var15, var16, var13.boolean1); + } + } + + if (var1 == 1) { // L: 6675 + ScriptEvent.scene.removeWallDecoration(var0, var2, var3); + } + + if (var1 == 2) { // L: 6676 + ScriptEvent.scene.removeGameObject(var0, var2, var3); // L: 6677 + var13 = MidiPcmStream.getObjectDefinition(var14); // L: 6678 + if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { // L: 6679 + return; + } + + if (var13.interactType != 0) { // L: 6680 + Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1); + } + } + + if (var1 == 3) { // L: 6682 + ScriptEvent.scene.removeFloorDecoration(var0, var2, var3); // L: 6683 + var13 = MidiPcmStream.getObjectDefinition(var14); // L: 6684 + if (var13.interactType == 1) { // L: 6685 + Client.collisionMaps[var0].method3638(var2, var3); + } + } + } + + if (var4 >= 0) { // L: 6688 + var12 = var0; // L: 6689 + if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { // L: 6690 + var12 = var0 + 1; + } + + ObjectDefinition.method4699(var0, var12, var2, var3, var4, var5, var6, ScriptEvent.scene, Client.collisionMaps[var0]); // L: 6691 + } + } + + } // L: 6694 } diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 71c265c1d0..d7a23ce0d1 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -8,516 +8,496 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("aa") +@ObfuscatedName("ai") @Implements("WorldMapManager") public final class WorldMapManager { - @ObfuscatedName("rn") - @ObfuscatedGetter( - intValue = -1416304591 + @ObfuscatedName("qs") + @ObfuscatedSignature( + descriptor = "Ldr;" ) - static int field348; - @ObfuscatedName("m") + @Export("pcmPlayer0") + static PcmPlayer pcmPlayer0; + @ObfuscatedName("ft") + @ObfuscatedGetter( + intValue = 1798679755 + ) + @Export("baseX") + static int baseX; + @ObfuscatedName("lz") + @ObfuscatedGetter( + intValue = 495693627 + ) + @Export("menuHeight") + static int menuHeight; + @ObfuscatedName("z") @Export("loaded") boolean loaded; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("loadStarted") boolean loadStarted; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Laz;" + descriptor = "Laj;" ) @Export("mapAreaData") WorldMapAreaData mapAreaData; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Llp;" ) @Export("compositeTextureSprite") Sprite compositeTextureSprite; - @ObfuscatedName("p") + @ObfuscatedName("i") @Export("icons") HashMap icons; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "[[Lap;" + descriptor = "[[Lal;" ) @Export("regions") WorldMapRegion[][] regions; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("scaleHandlers") HashMap scaleHandlers; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "[Llh;" + descriptor = "[Lls;" ) @Export("mapSceneSprites") IndexedSprite[] mapSceneSprites; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("geographyArchive") final AbstractArchive geographyArchive; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("groundArchive") final AbstractArchive groundArchive; - @ObfuscatedName("w") + @ObfuscatedName("n") @Export("fonts") final HashMap fonts; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = 1626550247 + intValue = -822250353 ) @Export("tileX") int tileX; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = -265170969 + intValue = 47788579 ) @Export("tileY") int tileY; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = 2094787343 + intValue = -1367840659 ) @Export("tileWidth") int tileWidth; - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedGetter( - intValue = -750399835 + intValue = -989936121 ) @Export("tileHeight") int tileHeight; - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedGetter( - intValue = -963594831 + intValue = -1477799013 ) @Export("pixelsPerTile") public int pixelsPerTile; @ObfuscatedSignature( - descriptor = "([Llh;Ljava/util/HashMap;Lic;Lic;)V" + descriptor = "([Lls;Ljava/util/HashMap;Lic;Lic;)V" ) public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) { - this.loaded = false; - this.loadStarted = false; - this.scaleHandlers = new HashMap(); - this.pixelsPerTile = 0; - this.mapSceneSprites = var1; - this.fonts = var2; - this.geographyArchive = var3; - this.groundArchive = var4; - } + this.loaded = false; // L: 16 + this.loadStarted = false; // L: 17 + this.scaleHandlers = new HashMap(); // L: 22 + this.pixelsPerTile = 0; // L: 31 + this.mapSceneSprites = var1; // L: 34 + this.fonts = var2; // L: 35 + this.geographyArchive = var3; // L: 36 + this.groundArchive = var4; // L: 37 + } // L: 38 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(Lic;Ljava/lang/String;ZI)V", - garbageValue = "2141843540" + garbageValue = "1563820048" ) @Export("load") public void load(AbstractArchive var1, String var2, boolean var3) { - if (!this.loadStarted) { - this.loaded = false; - this.loadStarted = true; - System.nanoTime(); - int var4 = var1.getGroupId(WorldMapCacheName.field322.name); - int var5 = var1.getFileId(var4, var2); - Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field322.name, var2)); - Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field325.name, var2)); - System.nanoTime(); - System.nanoTime(); - this.mapAreaData = new WorldMapAreaData(); + if (!this.loadStarted) { // L: 41 + this.loaded = false; // L: 44 + this.loadStarted = true; // L: 45 + System.nanoTime(); // L: 46 + int var4 = var1.getGroupId(WorldMapCacheName.field322.name); // L: 47 + int var5 = var1.getFileId(var4, var2); // L: 48 + Buffer var6 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field322.name, var2)); // L: 49 + Buffer var7 = new Buffer(var1.takeFileByNames(WorldMapCacheName.field318.name, var2)); // L: 50 + System.nanoTime(); // L: 51 + System.nanoTime(); // L: 52 + this.mapAreaData = new WorldMapAreaData(); // L: 53 try { - this.mapAreaData.init(var6, var7, var5, var3); - } catch (IllegalStateException var19) { - return; + this.mapAreaData.init(var6, var7, var5, var3); // L: 55 + } catch (IllegalStateException var19) { // L: 57 + return; // L: 58 } - this.mapAreaData.getOriginX(); - this.mapAreaData.getOriginPlane(); - this.mapAreaData.getOriginY(); - this.tileX = this.mapAreaData.getRegionLowX() * 64; - this.tileY = this.mapAreaData.getRegionLowY() * 64; - this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; - this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; - int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; - int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; - System.nanoTime(); - System.nanoTime(); - WorldMapRegion.WorldMapRegion_cachedSprites.clear(); - this.regions = new WorldMapRegion[var16][var9]; - Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); + this.mapAreaData.getOriginX(); // L: 60 + this.mapAreaData.getOriginPlane(); // L: 61 + this.mapAreaData.getOriginY(); // L: 62 + this.tileX = this.mapAreaData.getRegionLowX() * 64; // L: 63 + this.tileY = this.mapAreaData.getRegionLowY() * 64; // L: 64 + this.tileWidth = (this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1) * 64; // L: 65 + this.tileHeight = (this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1) * 64; // L: 66 + int var16 = this.mapAreaData.getRegionHighX() - this.mapAreaData.getRegionLowX() + 1; // L: 67 + int var9 = this.mapAreaData.getRegionHighY() - this.mapAreaData.getRegionLowY() + 1; // L: 68 + System.nanoTime(); // L: 69 + System.nanoTime(); // L: 70 + WorldMapIcon_1.method377(); // L: 71 + this.regions = new WorldMapRegion[var16][var9]; // L: 72 + Iterator var10 = this.mapAreaData.worldMapData0Set.iterator(); // L: 73 while (var10.hasNext()) { - WorldMapData_0 var11 = (WorldMapData_0)var10.next(); - int var12 = var11.regionX; - int var13 = var11.regionY; - int var14 = var12 - this.mapAreaData.getRegionLowX(); - int var15 = var13 - this.mapAreaData.getRegionLowY(); - this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); - this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); + WorldMapData_0 var11 = (WorldMapData_0)var10.next(); // L: 74 + int var12 = var11.regionX; // L: 76 + int var13 = var11.regionY; // L: 77 + int var14 = var12 - this.mapAreaData.getRegionLowX(); // L: 78 + int var15 = var13 - this.mapAreaData.getRegionLowY(); // L: 79 + this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 80 + this.regions[var14][var15].initWorldMapData0(var11, this.mapAreaData.iconList); // L: 81 } - for (int var17 = 0; var17 < var16; ++var17) { - for (int var18 = 0; var18 < var9; ++var18) { - if (this.regions[var17][var18] == null) { - this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); - this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); + for (int var17 = 0; var17 < var16; ++var17) { // L: 84 + for (int var18 = 0; var18 < var9; ++var18) { // L: 85 + if (this.regions[var17][var18] == null) { // L: 86 + this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.getRegionLowX() + var17, this.mapAreaData.getRegionLowY() + var18, this.mapAreaData.getBackGroundColor(), this.fonts); // L: 87 + this.regions[var17][var18].initWorldMapData1(this.mapAreaData.worldMapData1Set, this.mapAreaData.iconList); // L: 88 } } } - System.nanoTime(); - System.nanoTime(); - if (var1.isValidFileName(WorldMapCacheName.field324.name, var2)) { - byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field324.name, var2); - this.compositeTextureSprite = FloorUnderlayDefinition.convertJpgToSprite(var20); + System.nanoTime(); // L: 92 + System.nanoTime(); // L: 93 + if (var1.isValidFileName(WorldMapCacheName.field327.name, var2)) { // L: 94 + byte[] var20 = var1.takeFileByNames(WorldMapCacheName.field327.name, var2); // L: 95 + this.compositeTextureSprite = MouseHandler.convertJpgToSprite(var20); // L: 96 } - System.nanoTime(); - var1.clearGroups(); - var1.clearFiles(); - this.loaded = true; + System.nanoTime(); // L: 98 + var1.clearGroups(); // L: 99 + var1.clearFiles(); // L: 100 + this.loaded = true; // L: 101 } - } + } // L: 42 102 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1532053467" + garbageValue = "-1887133174" ) @Export("clearIcons") public final void clearIcons() { - this.icons = null; - } + this.icons = null; // L: 105 + } // L: 106 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIIIIIIII)V", - garbageValue = "-2041483003" + descriptor = "(IIIIIIIIB)V", + garbageValue = "-33" ) @Export("drawTiles") public final void drawTiles(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - int[] var9 = Rasterizer2D.Rasterizer2D_pixels; - int var10 = Rasterizer2D.Rasterizer2D_width; - int var11 = Rasterizer2D.Rasterizer2D_height; - int[] var12 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var12); - WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); - float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); - int var15 = (int)Math.ceil((double)var14); - this.pixelsPerTile = var15; - if (!this.scaleHandlers.containsKey(var15)) { - WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); - var16.init(); - this.scaleHandlers.put(var15, var16); + int[] var9 = Rasterizer2D.Rasterizer2D_pixels; // L: 109 + int var10 = Rasterizer2D.Rasterizer2D_width; // L: 110 + int var11 = Rasterizer2D.Rasterizer2D_height; // L: 111 + int[] var12 = new int[4]; // L: 112 + Rasterizer2D.Rasterizer2D_getClipArray(var12); // L: 113 + WorldMapRectangle var13 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 114 + float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 115 + int var15 = (int)Math.ceil((double)var14); // L: 116 + this.pixelsPerTile = var15; // L: 117 + if (!this.scaleHandlers.containsKey(var15)) { // L: 118 + WorldMapScaleHandler var16 = new WorldMapScaleHandler(var15); // L: 119 + var16.init(); // L: 120 + this.scaleHandlers.put(var15, var16); // L: 121 } - int var23 = var13.width + var13.x - 1; - int var17 = var13.y + var13.height - 1; + int var23 = var13.width + var13.x - 1; // L: 123 + int var17 = var13.y + var13.height - 1; // L: 124 int var18; int var19; - for (var18 = var13.x; var18 <= var23; ++var18) { - for (var19 = var13.y; var19 <= var17; ++var19) { - this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); + for (var18 = var13.x; var18 <= var23; ++var18) { // L: 125 + for (var19 = var13.y; var19 <= var17; ++var19) { // L: 126 + this.regions[var18][var19].drawTile(var15, (WorldMapScaleHandler)this.scaleHandlers.get(var15), this.mapSceneSprites, this.geographyArchive, this.groundArchive); // L: 127 } } - Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); - Rasterizer2D.Rasterizer2D_setClipArray(var12); - var18 = (int)(var14 * 64.0F); - var19 = this.tileX + var1; - int var20 = var2 + this.tileY; + Rasterizer2D.Rasterizer2D_replace(var9, var10, var11); // L: 130 + Rasterizer2D.Rasterizer2D_setClipArray(var12); // L: 131 + var18 = (int)(var14 * 64.0F); // L: 132 + var19 = this.tileX + var1; // L: 133 + int var20 = var2 + this.tileY; // L: 134 - for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { - for (int var22 = var13.y; var22 < var13.y + var13.height; ++var22) { - this.regions[var21][var22].method490(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); + for (int var21 = var13.x; var21 < var13.width + var13.x; ++var21) { // L: 135 + for (int var22 = var13.y; var22 < var13.height + var13.y; ++var22) { // L: 136 + this.regions[var21][var22].method505(var5 + (this.regions[var21][var22].regionX * 64 - var19) * var18 / 64, var8 - (this.regions[var21][var22].regionY * 64 - var20 + 64) * var18 / 64, var18); // L: 137 } } - } + } // L: 140 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZI)V", - garbageValue = "531249052" + descriptor = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V", + garbageValue = "84" ) @Export("drawElements") public final void drawElements(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, HashSet var9, HashSet var10, int var11, int var12, boolean var13) { - WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); - float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); - int var16 = (int)(var15 * 64.0F); - int var17 = this.tileX + var1; - int var18 = var2 + this.tileY; + WorldMapRectangle var14 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 143 + float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1); // L: 144 + int var16 = (int)(var15 * 64.0F); // L: 145 + int var17 = this.tileX + var1; // L: 146 + int var18 = var2 + this.tileY; // L: 147 int var19; int var20; - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { - for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { - if (var13) { - this.regions[var19][var20].initWorldMapIcon1s(); + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 148 + for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { // L: 149 + if (var13) { // L: 150 + this.regions[var19][var20].initWorldMapIcon1s(); // L: 151 } - this.regions[var19][var20].method514(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); + this.regions[var19][var20].method569(var5 + (this.regions[var19][var20].regionX * 64 - var17) * var16 / 64, var8 - (this.regions[var19][var20].regionY * 64 - var18 + 64) * var16 / 64, var16, var9); // L: 153 } } - if (var10 != null && var11 > 0) { - for (var19 = var14.x; var19 < var14.width + var14.x; ++var19) { - for (var20 = var14.y; var20 < var14.y + var14.height; ++var20) { - this.regions[var19][var20].flashElements(var10, var11, var12); + if (var10 != null && var11 > 0) { // L: 156 + for (var19 = var14.x; var19 < var14.x + var14.width; ++var19) { // L: 157 + for (var20 = var14.y; var20 < var14.height + var14.y; ++var20) { // L: 158 + this.regions[var19][var20].flashElements(var10, var11, var12); // L: 159 } } } - } + } // L: 163 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IIIILjava/util/HashSet;IIB)V", - garbageValue = "-52" + descriptor = "(IIIILjava/util/HashSet;III)V", + garbageValue = "-1439979069" ) @Export("drawOverview") public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) { - if (this.compositeTextureSprite != null) { - this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); - if (var6 > 0 && var6 % var7 < var7 / 2) { - if (this.icons == null) { - this.buildIcons0(); + if (this.compositeTextureSprite != null) { // L: 166 + this.compositeTextureSprite.drawScaledAt(var1, var2, var3, var4); // L: 169 + if (var6 > 0 && var6 % var7 < var7 / 2) { // L: 170 + if (this.icons == null) { // L: 173 + this.buildIcons0(); // L: 174 } - Iterator var8 = var5.iterator(); + Iterator var8 = var5.iterator(); // L: 176 while (true) { List var10; do { if (!var8.hasNext()) { - return; + return; // L: 193 } - int var9 = (Integer)var8.next(); - var10 = (List)this.icons.get(var9); - } while(var10 == null); + int var9 = (Integer)var8.next(); // L: 177 + var10 = (List)this.icons.get(var9); // L: 179 + } while(var10 == null); // L: 180 - Iterator var11 = var10.iterator(); + Iterator var11 = var10.iterator(); // L: 183 while (var11.hasNext()) { - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); - int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; - int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next(); // L: 184 + int var13 = var3 * (var12.coord2.x - this.tileX) / this.tileWidth; // L: 186 + int var14 = var4 - (var12.coord2.y - this.tileY) * var4 / this.tileHeight; // L: 187 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256); // L: 188 } } } } - } + } // L: 167 171 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(IIIIIIIIIIB)Ljava/util/List;", - garbageValue = "7" + garbageValue = "19" ) - public List method695(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { - LinkedList var11 = new LinkedList(); - if (!this.loaded) { - return var11; + public List method721(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { + LinkedList var11 = new LinkedList(); // L: 196 + if (!this.loaded) { // L: 197 + return var11; // L: 198 } else { - WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); - float var13 = this.getPixelsPerTile(var7, var3 - var1); - int var14 = (int)(var13 * 64.0F); - int var15 = this.tileX + var1; - int var16 = var2 + this.tileY; + WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); // L: 200 + float var13 = this.getPixelsPerTile(var7, var3 - var1); // L: 201 + int var14 = (int)(var13 * 64.0F); // L: 202 + int var15 = this.tileX + var1; // L: 203 + int var16 = var2 + this.tileY; // L: 204 - for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { - for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { - List var19 = this.regions[var17][var18].method544(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); - if (!var19.isEmpty()) { - var11.addAll(var19); + for (int var17 = var12.x; var17 < var12.x + var12.width; ++var17) { // L: 205 + for (int var18 = var12.y; var18 < var12.height + var12.y; ++var18) { // L: 206 + List var19 = this.regions[var17][var18].method531(var5 + (this.regions[var17][var18].regionX * 64 - var15) * var14 / 64, var8 + var6 - (this.regions[var17][var18].regionY * 64 - var16 + 64) * var14 / 64, var14, var9, var10); // L: 207 + if (!var19.isEmpty()) { // L: 208 + var11.addAll(var19); // L: 209 } } } - return var11; + return var11; // L: 213 } } - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIIII)Lag;", - garbageValue = "-1190093558" + descriptor = "(IIIII)Lam;", + garbageValue = "1560413650" ) @Export("createWorldMapRectangle") WorldMapRectangle createWorldMapRectangle(int var1, int var2, int var3, int var4) { - WorldMapRectangle var5 = new WorldMapRectangle(this); - int var6 = this.tileX + var1; - int var7 = var2 + this.tileY; - int var8 = var3 + this.tileX; - int var9 = var4 + this.tileY; - int var10 = var6 / 64; - int var11 = var7 / 64; - int var12 = var8 / 64; - int var13 = var9 / 64; - var5.width = var12 - var10 + 1; - var5.height = var13 - var11 + 1; - var5.x = var10 - this.mapAreaData.getRegionLowX(); - var5.y = var11 - this.mapAreaData.getRegionLowY(); - if (var5.x < 0) { - var5.width += var5.x; - var5.x = 0; + WorldMapRectangle var5 = new WorldMapRectangle(this); // L: 217 + int var6 = this.tileX + var1; // L: 218 + int var7 = var2 + this.tileY; // L: 219 + int var8 = var3 + this.tileX; // L: 220 + int var9 = var4 + this.tileY; // L: 221 + int var10 = var6 / 64; // L: 222 + int var11 = var7 / 64; // L: 223 + int var12 = var8 / 64; // L: 224 + int var13 = var9 / 64; // L: 225 + var5.width = var12 - var10 + 1; // L: 226 + var5.height = var13 - var11 + 1; // L: 227 + var5.x = var10 - this.mapAreaData.getRegionLowX(); // L: 228 + var5.y = var11 - this.mapAreaData.getRegionLowY(); // L: 229 + if (var5.x < 0) { // L: 230 + var5.width += var5.x; // L: 231 + var5.x = 0; // L: 232 } - if (var5.x > this.regions.length - var5.width) { - var5.width = this.regions.length - var5.x; + if (var5.x > this.regions.length - var5.width) { // L: 234 + var5.width = this.regions.length - var5.x; // L: 235 } - if (var5.y < 0) { - var5.height += var5.y; - var5.y = 0; + if (var5.y < 0) { // L: 237 + var5.height += var5.y; // L: 238 + var5.y = 0; // L: 239 } - if (var5.y > this.regions[0].length - var5.height) { - var5.height = this.regions[0].length - var5.y; + if (var5.y > this.regions[0].length - var5.height) { // L: 241 + var5.height = this.regions[0].length - var5.y; // L: 242 } - var5.width = Math.min(var5.width, this.regions.length); - var5.height = Math.min(var5.height, this.regions[0].length); - return var5; + var5.width = Math.min(var5.width, this.regions.length); // L: 244 + var5.height = Math.min(var5.height, this.regions[0].length); // L: 245 + return var5; // L: 246 } - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(B)Z", garbageValue = "0" ) @Export("isLoaded") public boolean isLoaded() { - return this.loaded; + return this.loaded; // L: 250 } - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)Ljava/util/HashMap;", - garbageValue = "-518296380" + garbageValue = "-391367086" ) @Export("buildIcons") public HashMap buildIcons() { - this.buildIcons0(); - return this.icons; + this.buildIcons0(); // L: 254 + return this.icons; // L: 255 } - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-84" + descriptor = "(I)V", + garbageValue = "2109869337" ) @Export("buildIcons0") void buildIcons0() { - if (this.icons == null) { - this.icons = new HashMap(); + if (this.icons == null) { // L: 259 + this.icons = new HashMap(); // L: 260 } - this.icons.clear(); + this.icons.clear(); // L: 262 - for (int var1 = 0; var1 < this.regions.length; ++var1) { - for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { - List var3 = this.regions[var1][var2].icons(); - Iterator var4 = var3.iterator(); + for (int var1 = 0; var1 < this.regions.length; ++var1) { // L: 263 + for (int var2 = 0; var2 < this.regions[var1].length; ++var2) { // L: 264 + List var3 = this.regions[var1][var2].icons(); // L: 265 + Iterator var4 = var3.iterator(); // L: 266 while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if (var5.hasValidElement()) { - int var6 = var5.getElement(); - if (!this.icons.containsKey(var6)) { - LinkedList var7 = new LinkedList(); - var7.add(var5); - this.icons.put(var6, var7); + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 267 + if (var5.hasValidElement()) { // L: 269 + int var6 = var5.getElement(); // L: 270 + if (!this.icons.containsKey(var6)) { // L: 271 + LinkedList var7 = new LinkedList(); // L: 272 + var7.add(var5); // L: 273 + this.icons.put(var6, var7); // L: 274 } else { - List var8 = (List)this.icons.get(var6); - var8.add(var5); + List var8 = (List)this.icons.get(var6); // L: 277 + var8.add(var5); // L: 278 } } } } } - } + } // L: 284 - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IIB)F", - garbageValue = "-11" + descriptor = "(III)F", + garbageValue = "-1667086517" ) @Export("getPixelsPerTile") float getPixelsPerTile(int var1, int var2) { - float var3 = (float)var1 / (float)var2; - if (var3 > 8.0F) { + float var3 = (float)var1 / (float)var2; // L: 287 + if (var3 > 8.0F) { // L: 288 return 8.0F; - } else if (var3 < 1.0F) { + } else if (var3 < 1.0F) { // L: 289 return 1.0F; } else { - int var4 = Math.round(var3); - return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; + int var4 = Math.round(var3); // L: 290 + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; // L: 291 292 } } - @ObfuscatedName("j") + @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1960710050" + descriptor = "(ZB)V", + garbageValue = "15" ) - @Export("isKeyDown") - public static final boolean isKeyDown() { - synchronized(KeyHandler.KeyHandler_instance) { - if (KeyHandler.field416 == KeyHandler.field421) { - return false; - } else { - SecureRandomCallable.field546 = KeyHandler.field413[KeyHandler.field416]; - class58.field442 = KeyHandler.field415[KeyHandler.field416]; - KeyHandler.field416 = KeyHandler.field416 + 1 & 127; - return true; - } + public static void method726(boolean var0) { + if (var0 != ItemDefinition.ItemDefinition_inMembersWorld) { // L: 557 + GameObject.method3412(); // L: 558 + ItemDefinition.ItemDefinition_inMembersWorld = var0; // L: 559 } - } - @ObfuscatedName("x") + } // L: 561 + + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "(ILcs;ZB)I", - garbageValue = "-25" + descriptor = "(IB)I", + garbageValue = "8" ) - static int method717(int var0, Script var1, boolean var2) { - Widget var3 = WorldMapSprite.getWidget(Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]); - if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var3)); - return 1; - } else if (var0 != ScriptOpcodes.IF_GETOP) { - if (var0 == ScriptOpcodes.IF_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } + static int method725(int var0) { + return (int)((Math.log((double)var0) / Interpreter.field1120 - 7.0D) * 256.0D); // L: 3197 } } diff --git a/runescape-client/src/main/java/WorldMapRectangle.java b/runescape-client/src/main/java/WorldMapRectangle.java index 33f760caa6..5264f17d8f 100644 --- a/runescape-client/src/main/java/WorldMapRectangle.java +++ b/runescape-client/src/main/java/WorldMapRectangle.java @@ -4,135 +4,102 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ag") +@ObfuscatedName("am") @Implements("WorldMapRectangle") public final class WorldMapRectangle { - @ObfuscatedName("h") - static int[] field198; - @ObfuscatedName("de") - @ObfuscatedSignature( - descriptor = "Lig;" - ) - @Export("archive5") - static Archive archive5; - @ObfuscatedName("lj") + @ObfuscatedName("d") + @Export("Tiles_lightness") + static int[] Tiles_lightness; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 677341381 - ) - @Export("menuX") - static int menuX; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 2128861857 + intValue = 743023489 ) @Export("width") int width; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -1397318075 + intValue = 995076797 ) @Export("height") int height; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -2033449825 + intValue = -1102925233 ) @Export("x") int x; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 2045769543 + intValue = -1014669257 ) @Export("y") int y; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Laa;" + descriptor = "Lai;" ) final WorldMapManager this$0; @ObfuscatedSignature( - descriptor = "(Laa;)V" + descriptor = "(Lai;)V" ) WorldMapRectangle(WorldMapManager var1) { - this.this$0 = var1; - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-429068240" - ) - public static int method347(int var0, int var1) { - int var2 = var0 >>> 31; - return (var0 + var2) / var1 - var2; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-349989095" - ) - @Export("Login_promptCredentials") - static void Login_promptCredentials(boolean var0) { - Login.Login_response1 = ""; - Login.Login_response2 = "Enter your username/email & password."; - Login.Login_response3 = ""; - Login.loginIndex = 2; - if (var0) { - Login.Login_password = ""; - } - - if (Login.Login_username == null || Login.Login_username.length() <= 0) { - if (NetSocket.clientPreferences.rememberedUsername != null) { - Login.Login_username = NetSocket.clientPreferences.rememberedUsername; - Client.Login_isUsernameRemembered = true; - } else { - Client.Login_isUsernameRemembered = false; - } - } - - class22.method225(); + this.this$0 = var1; // L: 303 } @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lhd;IIII)V", - garbageValue = "-127200615" + descriptor = "(ILjava/lang/String;Ljava/lang/String;S)V", + garbageValue = "128" ) - @Export("Widget_setKeyRate") - static final void Widget_setKeyRate(Widget var0, int var1, int var2, int var3) { - if (var0.field2679 == null) { - throw new RuntimeException(); - } else { - var0.field2679[var1] = var2; - var0.field2680[var1] = var3; - } - } + @Export("addGameMessage") + static void addGameMessage(int var0, String var1, String var2) { + WorldMapData_0.addChatMessage(var0, var1, var2, (String)null); // L: 19 + } // L: 20 - @ObfuscatedName("ji") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IIIILlz;Lhh;I)V", - garbageValue = "866321883" + descriptor = "(II)Lcy;", + garbageValue = "-1672146154" ) - @Export("worldToMinimap") - static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) { - int var6 = var3 * var3 + var2 * var2; - if (var6 > 4225 && var6 < 90000) { - int var7 = Client.camAngleY & 2047; - int var8 = Rasterizer3D.Rasterizer3D_sine[var7]; - int var9 = Rasterizer3D.Rasterizer3D_cosine[var7]; - int var10 = var3 * var8 + var9 * var2 >> 16; - int var11 = var3 * var9 - var8 * var2 >> 16; - double var12 = Math.atan2((double)var10, (double)var11); - int var14 = var5.width / 2 - 25; - int var15 = (int)(Math.sin(var12) * (double)var14); - int var16 = (int)(Math.cos(var12) * (double)var14); - byte var17 = 20; - UrlRequester.redHintArrowSprite.method6435(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256); + @Export("getScript") + static Script getScript(int var0) { + Script var1 = (Script)Script.Script_cached.get((long)var0); // L: 25 + if (var1 != null) { // L: 26 + return var1; } else { - GrandExchangeOffer.drawSpriteOnMinimap(var0, var1, var2, var3, var4, var5); + byte[] var2 = ApproximateRouteStrategy.archive12.takeFile(var0, 0); // L: 27 + if (var2 == null) { // L: 28 + return null; // L: 29 + } else { + var1 = UserComparator7.newScript(var2); // L: 31 + Script.Script_cached.put(var1, (long)var0); // L: 32 + return var1; // L: 33 + } + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(I)Ljava/lang/String;", + garbageValue = "-2081056745" + ) + static String method359() { + return Tile.clientPreferences.hideUsername ? FontName.method5445(Login.Login_username) : Login.Login_username; // L: 213 + } + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1970592993" + ) + static void method361() { + Players.Players_count = 0; // L: 616 + + for (int var0 = 0; var0 < 2048; ++var0) { // L: 617 + Players.field1277[var0] = null; // L: 618 + Players.field1284[var0] = 1; // L: 619 } - } + } // L: 621 } diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 6d58711719..42c5baf94e 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -10,142 +10,169 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ap") +@ObfuscatedName("al") @Implements("WorldMapRegion") public class WorldMapRegion { - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lfr;" + descriptor = "Lfp;" ) @Export("WorldMapRegion_cachedSprites") - static DemotingHashTable WorldMapRegion_cachedSprites; - @ObfuscatedName("g") + public static DemotingHashTable WorldMapRegion_cachedSprites; + @ObfuscatedName("u") + static String field277; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 224644345 + intValue = 1185290071 ) @Export("regionX") int regionX; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -2039655483 + intValue = -1059284245 ) @Export("regionY") int regionY; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "Li;" + descriptor = "Ll;" ) @Export("worldMapData_0") WorldMapData_0 worldMapData_0; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("worldMapData1List") LinkedList worldMapData1List; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = -1539368261 + intValue = 1881987389 ) @Export("backgroundColor") int backgroundColor; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = -484140581 + intValue = -1196076883 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("y") + @ObfuscatedName("d") @Export("icon0List") List icon0List; - @ObfuscatedName("c") + @ObfuscatedName("h") @Export("iconMap") HashMap iconMap; - @ObfuscatedName("h") + @ObfuscatedName("a") @Export("fonts") final HashMap fonts; static { - WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); + WorldMapRegion_cachedSprites = new DemotingHashTable(37748736, 256); // L: 26 } WorldMapRegion(int var1, int var2, int var3, HashMap var4) { - this.regionX = var1; - this.regionY = var2; - this.worldMapData1List = new LinkedList(); - this.icon0List = new LinkedList(); - this.iconMap = new HashMap(); - this.backgroundColor = var3 | -16777216; - this.fonts = var4; - } + this.regionX = var1; // L: 50 + this.regionY = var2; // L: 51 + this.worldMapData1List = new LinkedList(); // L: 52 + this.icon0List = new LinkedList(); // L: 53 + this.iconMap = new HashMap(); // L: 54 + this.backgroundColor = var3 | -16777216; // L: 55 + this.fonts = var4; // L: 56 + } // L: 57 - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIII)V", - garbageValue = "-323473463" + garbageValue = "-1575156019" ) - void method490(int var1, int var2, int var3) { - Sprite var4 = InterfaceParent.method1233(this.regionX, this.regionY, this.pixelsPerTile); - if (var4 != null) { - if (var3 == this.pixelsPerTile * 64) { - var4.drawAt(var1, var2); + void method505(int var1, int var2, int var3) { + int var5 = this.regionX; // L: 61 + int var6 = this.regionY; // L: 62 + int var7 = this.pixelsPerTile; // L: 63 + Sprite var4 = (Sprite)WorldMapRegion_cachedSprites.get(MenuAction.method2139(var5, var6, var7)); // L: 65 + if (var4 != null) { // L: 68 + if (var3 == this.pixelsPerTile * 64) { // L: 69 + var4.drawAt(var1, var2); // L: 70 } else { - var4.drawScaledWorldmap(var1, var2, var3, var3); + var4.drawScaledWorldmap(var1, var2, var3, var3); // L: 73 } } - } + } // L: 75 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(Li;Ljava/util/List;I)V", - garbageValue = "-1392873276" + descriptor = "(Ll;Ljava/util/List;I)V", + garbageValue = "-1730892204" ) @Export("initWorldMapData0") void initWorldMapData0(WorldMapData_0 var1, List var2) { - this.iconMap.clear(); - this.worldMapData_0 = var1; - this.addAllToIconList(var2); - } + this.iconMap.clear(); // L: 78 + this.worldMapData_0 = var1; // L: 79 + this.addAllToIconList(var2); // L: 80 + } // L: 81 - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;Ljava/util/List;B)V", - garbageValue = "114" + garbageValue = "1" ) @Export("initWorldMapData1") void initWorldMapData1(HashSet var1, List var2) { - this.iconMap.clear(); - Iterator var3 = var1.iterator(); + this.iconMap.clear(); // L: 84 + Iterator var3 = var1.iterator(); // L: 85 while (var3.hasNext()) { - WorldMapData_1 var4 = (WorldMapData_1)var3.next(); - if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { - this.worldMapData1List.add(var4); + WorldMapData_1 var4 = (WorldMapData_1)var3.next(); // L: 86 + if (var4.getRegionX() == this.regionX && var4.getRegionY() == this.regionY) { // L: 88 + this.worldMapData1List.add(var4); // L: 89 } } - this.addAllToIconList(var2); - } + this.addAllToIconList(var2); // L: 93 + } // L: 94 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(IIIILax;I)V", - garbageValue = "513799457" + descriptor = "(IIIILan;I)V", + garbageValue = "121581751" ) @Export("getIconsForTiles") void getIconsForTiles(int var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - for (int var6 = var1; var6 < var3 + var1; ++var6) { - label48: - for (int var7 = var2; var7 < var2 + var4; ++var7) { - for (int var8 = 0; var8 < var5.planes; ++var8) { - WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; - if (var9 != null && var9.length != 0) { - WorldMapDecoration[] var10 = var9; + for (int var6 = var1; var6 < var3 + var1; ++var6) { // L: 97 + label74: + for (int var7 = var2; var7 < var2 + var4; ++var7) { // L: 98 + for (int var8 = 0; var8 < var5.planes; ++var8) { // L: 99 + WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7]; // L: 100 + if (var9 != null && var9.length != 0) { // L: 101 + WorldMapDecoration[] var10 = var9; // L: 105 - for (int var11 = 0; var11 < var10.length; ++var11) { - WorldMapDecoration var12 = var10[var11]; - ObjectDefinition var13 = Canvas.getObjectDefinition(var12.objectDefinitionId); - if (GrandExchangeOfferUnitPriceComparator.method202(var13)) { - this.getIcon(var13, var8, var6, var7, var5); - continue label48; + for (int var11 = 0; var11 < var10.length; ++var11) { // L: 106 + ObjectDefinition var13; + boolean var14; + label65: { + WorldMapDecoration var12 = var10[var11]; // L: 107 + var13 = MidiPcmStream.getObjectDefinition(var12.objectDefinitionId); // L: 109 + if (var13.transforms != null) { // L: 112 + int[] var15 = var13.transforms; // L: 114 + + for (int var16 = 0; var16 < var15.length; ++var16) { // L: 115 + int var17 = var15[var16]; // L: 116 + ObjectDefinition var18 = MidiPcmStream.getObjectDefinition(var17); // L: 118 + if (var18.mapIconId != -1) { + var14 = true; // L: 120 + break label65; + } + } + } else if (var13.mapIconId != -1) { // L: 127 + var14 = true; // L: 128 + break label65; // L: 129 + } + + var14 = false; // L: 131 + } + + if (var14) { // L: 133 + this.getIcon(var13, var8, var6, var7, var5); // L: 136 + continue label74; // L: 137 } } } @@ -153,57 +180,57 @@ public class WorldMapRegion { } } - } + } // L: 144 - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(Ljg;IIILax;I)V", - garbageValue = "1752488167" + descriptor = "(Ljg;IIILan;I)V", + garbageValue = "329414981" ) @Export("getIcon") void getIcon(ObjectDefinition var1, int var2, int var3, int var4, AbstractWorldMapData var5) { - Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); - Coord var7 = null; - if (this.worldMapData_0 != null) { - var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); + Coord var6 = new Coord(var2, var3 + this.regionX * 64, this.regionY * 64 + var4); // L: 147 + Coord var7 = null; // L: 148 + if (this.worldMapData_0 != null) { // L: 149 + var7 = new Coord(this.worldMapData_0.minPlane + var2, var3 + this.worldMapData_0.regionXLow * 64, var4 + this.worldMapData_0.regionYLow * 64); // L: 150 } else { - WorldMapData_1 var8 = (WorldMapData_1)var5; - var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); + WorldMapData_1 var8 = (WorldMapData_1)var5; // L: 153 + var7 = new Coord(var2 + var8.minPlane, var8.regionXLow * 64 + var3 + var8.getChunkXLow() * 8, var8.regionYLow * 64 + var4 + var8.getChunkYLow() * 8); // L: 154 } Object var10; - if (var1.transforms != null) { - var10 = new WorldMapIcon_1(var7, var6, var1.id, this); + if (var1.transforms != null) { // L: 157 + var10 = new WorldMapIcon_1(var7, var6, var1.id, this); // L: 158 } else { - WorldMapElement var9 = Client.WorldMapElement_get(var1.mapIconId); - var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); + WorldMapElement var9 = WorldMapSection0.WorldMapElement_get(var1.mapIconId); // L: 161 + var10 = new WorldMapIcon_0(var7, var6, var9.objectId, this.createMapLabel(var9)); // L: 162 } - this.iconMap.put(new Coord(0, var3, var4), var10); - } + this.iconMap.put(new Coord(0, var3, var4), var10); // L: 164 + } // L: 165 - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1939037740" + garbageValue = "1946946990" ) @Export("initWorldMapIcon1s") void initWorldMapIcon1s() { - Iterator var1 = this.iconMap.values().iterator(); + Iterator var1 = this.iconMap.values().iterator(); // L: 168 while (var1.hasNext()) { - AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); - if (var2 instanceof WorldMapIcon_1) { - ((WorldMapIcon_1)var2).init(); + AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next(); // L: 169 + if (var2 instanceof WorldMapIcon_1) { // L: 171 + ((WorldMapIcon_1)var2).init(); // L: 172 } } - } + } // L: 176 - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedSignature( descriptor = "(Ljava/util/List;I)V", - garbageValue = "-1366696532" + garbageValue = "-2052830022" ) @Export("addAllToIconList") void addAllToIconList(List var1) { @@ -212,370 +239,440 @@ public class WorldMapRegion { while (var2.hasNext()) { WorldMapIcon_0 var3 = (WorldMapIcon_0)var2.next(); if (var3.coord2.x >> 6 == this.regionX && var3.coord2.y >> 6 == this.regionY) { - WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method518(var3.element)); + WorldMapIcon_0 var4 = new WorldMapIcon_0(var3.coord2, var3.coord2, var3.element, this.method529(var3.element)); this.icon0List.add(var4); } } - } + } // L: 188 - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1391400259" + garbageValue = "478350201" ) - void method580() { + void method507() { if (this.worldMapData_0 != null) { this.worldMapData_0.reset(); } else { - Iterator var1 = this.worldMapData1List.iterator(); + Iterator var1 = this.worldMapData1List.iterator(); // L: 195 while (var1.hasNext()) { WorldMapData_1 var2 = (WorldMapData_1)var1.next(); - var2.reset(); + var2.reset(); // L: 198 } } - } + } // L: 202 - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( - descriptor = "(Lic;I)Z", - garbageValue = "-1165934913" + descriptor = "(Lic;B)Z", + garbageValue = "-62" ) @Export("loadGeography") boolean loadGeography(AbstractArchive var1) { - this.iconMap.clear(); - if (this.worldMapData_0 != null) { - this.worldMapData_0.loadGeography(var1); - if (this.worldMapData_0.isFullyLoaded()) { - this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); - return true; + this.iconMap.clear(); // L: 205 + if (this.worldMapData_0 != null) { // L: 206 + this.worldMapData_0.loadGeography(var1); // L: 207 + if (this.worldMapData_0.isFullyLoaded()) { // L: 208 + this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); // L: 209 + return true; // L: 210 } else { - return false; + return false; // L: 212 } } else { - boolean var2 = true; + boolean var2 = true; // L: 215 Iterator var3; WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { - var4 = (WorldMapData_1)var3.next(); - var4.loadGeography(var1); + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { // L: 216 220 + var4 = (WorldMapData_1)var3.next(); // L: 217 + var4.loadGeography(var1); // L: 219 } - if (var2) { - var3 = this.worldMapData1List.iterator(); + if (var2) { // L: 223 + var3 = this.worldMapData1List.iterator(); // L: 224 while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); + var4 = (WorldMapData_1)var3.next(); // L: 225 + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); // L: 227 } } - return var2; - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(ILay;[Llh;Lic;Lic;I)V", - garbageValue = "-799383237" - ) - @Export("drawTile") - void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { - this.pixelsPerTile = var1; - if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { - if (InterfaceParent.method1233(this.regionX, this.regionY, var1) == null) { - boolean var6 = true; - var6 &= this.loadGeography(var4); - int var8; - if (this.worldMapData_0 != null) { - var8 = this.worldMapData_0.groupId; - } else { - var8 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; - } - - var6 &= var5.tryLoadGroup(var8); - if (var6) { - byte[] var7 = var5.takeFileFlat(var8); - WorldMapSprite var9; - if (var7 == null) { - var9 = new WorldMapSprite(); - } else { - var9 = new WorldMapSprite(FloorUnderlayDefinition.convertJpgToSprite(var7).pixels); - } - - Sprite var11 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); - var11.setRaster(); - if (this.worldMapData_0 != null) { - this.method501(var2, var3, var9); - } else { - this.method502(var2, var3, var9); - } - - class90.method2166(var11, this.regionX, this.regionY, this.pixelsPerTile); - this.method580(); - } - } + return var2; // L: 231 } } @ObfuscatedName("h") @ObfuscatedSignature( - descriptor = "(IIILjava/util/HashSet;I)V", - garbageValue = "830003997" + descriptor = "(ILaf;[Lls;Lic;Lic;B)V", + garbageValue = "-79" ) - void method514(int var1, int var2, int var3, HashSet var4) { - if (var4 == null) { - var4 = new HashSet(); + @Export("drawTile") + void drawTile(int var1, WorldMapScaleHandler var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) { + this.pixelsPerTile = var1; // L: 236 + if (this.worldMapData_0 != null || !this.worldMapData1List.isEmpty()) { // L: 237 + int var7 = this.regionX; // L: 241 + int var8 = this.regionY; // L: 242 + Sprite var6 = (Sprite)WorldMapRegion_cachedSprites.get(MenuAction.method2139(var7, var8, var1)); // L: 244 + if (var6 == null) { // L: 246 + boolean var9 = true; // L: 249 + var9 &= this.loadGeography(var4); // L: 250 + int var11; + if (this.worldMapData_0 != null) { // L: 253 + var11 = this.worldMapData_0.groupId; // L: 254 + } else { + var11 = ((AbstractWorldMapData)this.worldMapData1List.getFirst()).groupId; // L: 257 + } + + var9 &= var5.tryLoadGroup(var11); // L: 259 + if (var9) { // L: 260 + byte[] var10 = var5.takeFileFlat(var11); // L: 261 + WorldMapSprite var12 = class39.method613(var10); // L: 262 + Sprite var13 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64); // L: 263 + var13.setRaster(); // L: 264 + if (this.worldMapData_0 != null) { // L: 265 + this.method553(var2, var3, var12); // L: 266 + } else { + this.method502(var2, var3, var12); // L: 269 + } + + AbstractWorldMapData.method353(var13, this.regionX, this.regionY, this.pixelsPerTile); // L: 271 + this.method507(); // L: 272 + } + } + } + } // L: 238 247 273 + + @ObfuscatedName("a") + @ObfuscatedSignature( + descriptor = "(IIILjava/util/HashSet;I)V", + garbageValue = "1940218585" + ) + void method569(int var1, int var2, int var3, HashSet var4) { + if (var4 == null) { // L: 276 + var4 = new HashSet(); // L: 277 } - this.drawNonLinkMapIcons(var1, var2, var4, var3); - this.drawMapLinks(var1, var2, var4, var3); - } + this.drawNonLinkMapIcons(var1, var2, var4, var3); // L: 279 + this.drawMapLinks(var1, var2, var4, var3); // L: 280 + } // L: 281 - @ObfuscatedName("k") + @ObfuscatedName("q") @ObfuscatedSignature( descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "-850649722" + garbageValue = "2015143479" ) @Export("flashElements") void flashElements(HashSet var1, int var2, int var3) { - Iterator var4 = this.iconMap.values().iterator(); + Iterator var4 = this.iconMap.values().iterator(); // L: 284 while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if (var5.hasValidElement()) { - int var6 = var5.getElement(); - if (var1.contains(var6)) { - WorldMapElement var7 = Client.WorldMapElement_get(var6); - this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 285 + if (var5.hasValidElement()) { // L: 287 + int var6 = var5.getElement(); // L: 288 + if (var1.contains(var6)) { // L: 289 + WorldMapElement var7 = WorldMapSection0.WorldMapElement_get(var6); // L: 290 + this.drawBackgroundCircle(var7, var5.screenX, var5.screenY, var2, var3); // L: 291 } } } - this.method497(var1, var2, var3); - } + this.method521(var1, var2, var3); // L: 295 + } // L: 296 - @ObfuscatedName("r") + @ObfuscatedName("c") @ObfuscatedSignature( - descriptor = "(Lay;[Llh;Las;B)V", - garbageValue = "-41" + descriptor = "(Laf;[Lls;Lat;I)V", + garbageValue = "-1361448318" ) - void method501(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { + void method553(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { int var4; int var5; - for (var4 = 0; var4 < 64; ++var4) { - for (var5 = 0; var5 < 64; ++var5) { - this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); - this.method511(var4, var5, this.worldMapData_0, var1); + for (var4 = 0; var4 < 64; ++var4) { // L: 299 + for (var5 = 0; var5 < 64; ++var5) { // L: 300 + this.drawTileGround(var4, var5, this.worldMapData_0, var1, var3); // L: 301 + this.method499(var4, var5, this.worldMapData_0, var1); // L: 302 } } - for (var4 = 0; var4 < 64; ++var4) { - for (var5 = 0; var5 < 64; ++var5) { - this.method503(var4, var5, this.worldMapData_0, var1, var2); + for (var4 = 0; var4 < 64; ++var4) { // L: 305 + for (var5 = 0; var5 < 64; ++var5) { // L: 306 + this.method545(var4, var5, this.worldMapData_0, var1, var2); // L: 307 } } - } + } // L: 310 - @ObfuscatedName("d") + @ObfuscatedName("j") @ObfuscatedSignature( - descriptor = "(Lay;[Llh;Las;B)V", - garbageValue = "-26" + descriptor = "(Laf;[Lls;Lat;B)V", + garbageValue = "-121" ) void method502(WorldMapScaleHandler var1, IndexedSprite[] var2, WorldMapSprite var3) { - Iterator var4 = this.worldMapData1List.iterator(); + Iterator var4 = this.worldMapData1List.iterator(); // L: 313 WorldMapData_1 var5; int var6; int var7; while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); + var5 = (WorldMapData_1)var4.next(); // L: 314 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { - this.drawTileGround(var6, var7, var5, var1, var3); - this.method511(var6, var7, var5, var1); + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 316 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 317 + this.drawTileGround(var6, var7, var5, var1, var3); // L: 318 + this.method499(var6, var7, var5, var1); // L: 319 } } } - var4 = this.worldMapData1List.iterator(); + var4 = this.worldMapData1List.iterator(); // L: 324 while (var4.hasNext()) { - var5 = (WorldMapData_1)var4.next(); + var5 = (WorldMapData_1)var4.next(); // L: 325 - for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { - for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { - this.method503(var6, var7, var5, var1, var2); + for (var6 = var5.getChunkX() * 8; var6 < var5.getChunkX() * 8 + 8; ++var6) { // L: 327 + for (var7 = var5.getChunkY() * 8; var7 < var5.getChunkY() * 8 + 8; ++var7) { // L: 328 + this.method545(var6, var7, var5, var1, var2); // L: 329 } } } - } + } // L: 334 - @ObfuscatedName("e") + @ObfuscatedName("r") @ObfuscatedSignature( - descriptor = "(IILax;Lay;[Llh;I)V", - garbageValue = "-248826960" + descriptor = "(IILan;Laf;[Lls;I)V", + garbageValue = "553934135" ) - void method503(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { - this.method527(var1, var2, var3); - this.method507(var1, var2, var3, var5); + void method545(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, IndexedSprite[] var5) { + this.method519(var1, var2, var3); // L: 337 + this.method533(var1, var2, var3, var5); // L: 338 + } // L: 339 + + @ObfuscatedName("u") + @ObfuscatedSignature( + descriptor = "(IILan;Laf;Lat;I)V", + garbageValue = "-1873495133" + ) + @Export("drawTileGround") + void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { + int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; // L: 342 + int var7 = var3.floorOverlayIds[0][var1][var2] - 1; // L: 343 + if (var6 == -1 && var7 == -1) { // L: 344 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); // L: 345 + } + + int var8 = 16711935; // L: 347 + int var9; + if (var7 != -1) { // L: 348 + int var10 = this.backgroundColor; // L: 350 + FloorOverlayDefinition var11 = SoundSystem.method2594(var7); // L: 352 + if (var11 == null) { // L: 353 + var9 = var10; // L: 354 + } else if (var11.secondaryRgb >= 0) { // L: 357 + var9 = var11.secondaryRgb | -16777216; // L: 358 + } else if (var11.texture >= 0) { // L: 360 + int var12 = GrandExchangeOfferTotalQuantityComparator.method172(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var11.texture), 96); // L: 361 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var12] | -16777216; // L: 362 + } else if (var11.primaryRgb == 16711935) { // L: 364 + var9 = var10; // L: 365 + } else { + int var13 = var11.hue; // L: 369 + int var14 = var11.saturation; // L: 370 + int var15 = var11.lightness; // L: 371 + if (var15 > 179) { // L: 373 + var14 /= 2; + } + + if (var15 > 192) { // L: 374 + var14 /= 2; + } + + if (var15 > 217) { // L: 375 + var14 /= 2; + } + + if (var15 > 243) { // L: 376 + var14 /= 2; + } + + int var16 = (var14 / 32 << 7) + var15 / 2 + (var13 / 4 << 10); // L: 377 + int var17 = GrandExchangeOfferTotalQuantityComparator.method172(var16, 96); // L: 381 + var9 = Rasterizer3D.Rasterizer3D_colorPalette[var17] | -16777216; // L: 382 + } + + var8 = var9; // L: 385 + } + + if (var7 > -1 && var3.field198[0][var1][var2] == 0) { // L: 387 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); // L: 388 + } else { + var9 = this.method517(var1, var2, var3, var5); // L: 391 + if (var7 == -1) { // L: 392 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); // L: 393 + } else { + var4.method802(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field198[0][var1][var2], var3.field191[0][var1][var2]); // L: 396 + } + } + } // L: 389 394 397 + + @ObfuscatedName("p") + @ObfuscatedSignature( + descriptor = "(IILan;Laf;I)V", + garbageValue = "-100065860" + ) + void method499(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { + for (int var5 = 1; var5 < var3.planes; ++var5) { // L: 400 + int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; // L: 401 + if (var6 > -1) { // L: 402 + int var8 = this.backgroundColor; // L: 404 + FloorOverlayDefinition var9 = SoundSystem.method2594(var6); // L: 406 + int var7; + if (var9 == null) { // L: 407 + var7 = var8; // L: 408 + } else if (var9.secondaryRgb >= 0) { // L: 411 + var7 = var9.secondaryRgb | -16777216; // L: 412 + } else if (var9.texture >= 0) { // L: 414 + int var10 = GrandExchangeOfferTotalQuantityComparator.method172(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96); // L: 415 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var10] | -16777216; // L: 416 + } else if (var9.primaryRgb == 16711935) { // L: 418 + var7 = var8; // L: 419 + } else { + int var11 = var9.hue; // L: 423 + int var12 = var9.saturation; // L: 424 + int var13 = var9.lightness; // L: 425 + if (var13 > 179) { // L: 427 + var12 /= 2; + } + + if (var13 > 192) { // L: 428 + var12 /= 2; + } + + if (var13 > 217) { // L: 429 + var12 /= 2; + } + + if (var13 > 243) { // L: 430 + var12 /= 2; + } + + int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10); // L: 431 + int var15 = GrandExchangeOfferTotalQuantityComparator.method172(var14, 96); // L: 435 + var7 = Rasterizer3D.Rasterizer3D_colorPalette[var15] | -16777216; // L: 436 + } + + if (var3.field198[var5][var1][var2] == 0) { // L: 440 + Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); // L: 441 + } else { + var4.method802(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field198[var5][var1][var2], var3.field191[var5][var1][var2]); // L: 444 + } + } + } + + } // L: 448 + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IILan;Lat;I)I", + garbageValue = "1234221167" + ) + int method517(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { + return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); // L: 451 452 454 } @ObfuscatedName("l") @ObfuscatedSignature( - descriptor = "(IILax;Lay;Las;I)V", - garbageValue = "1979978658" + descriptor = "(IILan;[Lls;B)V", + garbageValue = "-109" ) - @Export("drawTileGround") - void drawTileGround(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4, WorldMapSprite var5) { - int var6 = var3.floorUnderlayIds[0][var1][var2] - 1; - int var7 = var3.floorOverlayIds[0][var1][var2] - 1; - if (var6 == -1 && var7 == -1) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.backgroundColor); - } + void method533(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { + for (int var5 = 0; var5 < var3.planes; ++var5) { // L: 458 + WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; // L: 459 + if (var6 != null && var6.length != 0) { // L: 460 + WorldMapDecoration[] var7 = var6; // L: 464 - int var8 = 16711935; - if (var7 != -1) { - var8 = Buddy.method5363(var7, this.backgroundColor); - } - - if (var7 > -1 && var3.field185[0][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8); - } else { - int var9 = this.method506(var1, var2, var3, var5); - if (var7 == -1) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9); - } else { - var4.method798(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field185[0][var1][var2], var3.field175[0][var1][var2]); - } - } - } - - @ObfuscatedName("t") - @ObfuscatedSignature( - descriptor = "(IILax;Lay;I)V", - garbageValue = "-946989025" - ) - void method511(int var1, int var2, AbstractWorldMapData var3, WorldMapScaleHandler var4) { - for (int var5 = 1; var5 < var3.planes; ++var5) { - int var6 = var3.floorOverlayIds[var5][var1][var2] - 1; - if (var6 > -1) { - int var7 = Buddy.method5363(var6, this.backgroundColor); - if (var3.field185[var5][var1][var2] == 0) { - Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var7); - } else { - var4.method798(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var7, this.pixelsPerTile, this.pixelsPerTile, var3.field185[var5][var1][var2], var3.field175[var5][var1][var2]); - } - } - } - - } - - @ObfuscatedName("x") - @ObfuscatedSignature( - descriptor = "(IILax;Las;B)I", - garbageValue = "76" - ) - int method506(int var1, int var2, AbstractWorldMapData var3, WorldMapSprite var4) { - return var3.floorUnderlayIds[0][var1][var2] == 0 ? this.backgroundColor : var4.getTileColor(var1, var2); - } - - @ObfuscatedName("ah") - @ObfuscatedSignature( - descriptor = "(IILax;[Llh;I)V", - garbageValue = "-388606552" - ) - void method507(int var1, int var2, AbstractWorldMapData var3, IndexedSprite[] var4) { - for (int var5 = 0; var5 < var3.planes; ++var5) { - WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2]; - if (var6 != null && var6.length != 0) { - WorldMapDecoration[] var7 = var6; - - for (int var8 = 0; var8 < var7.length; ++var8) { - WorldMapDecoration var9 = var7[var8]; - if (!WorldMapData_1.method784(var9.decoration)) { - int var11 = var9.decoration; - boolean var10 = var11 == WorldMapDecorationType.field2777.id; - if (!var10) { + for (int var8 = 0; var8 < var7.length; ++var8) { // L: 465 + WorldMapDecoration var9 = var7[var8]; // L: 466 + int var11 = var9.decoration; // L: 469 + boolean var10 = var11 >= WorldMapDecorationType.field2777.id && var11 <= WorldMapDecorationType.field2778.id; // L: 471 + if (!var10) { // L: 474 + int var13 = var9.decoration; // L: 476 + boolean var12 = var13 == WorldMapDecorationType.field2779.id; // L: 478 + if (!var12) { // L: 480 continue; } } - ObjectDefinition var12 = Canvas.getObjectDefinition(var9.objectDefinitionId); - if (var12.mapSceneId != -1) { - if (var12.mapSceneId != 46 && var12.mapSceneId != 52) { - var4[var12.mapSceneId].method6322(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); + ObjectDefinition var14 = MidiPcmStream.getObjectDefinition(var9.objectDefinitionId); // L: 482 + if (var14.mapSceneId != -1) { // L: 483 + if (var14.mapSceneId != 46 && var14.mapSceneId != 52) { // L: 484 + var4[var14.mapSceneId].method6217(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2); // L: 488 } else { - var4[var12.mapSceneId].method6322(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); + var4[var14.mapSceneId].method6217(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1); // L: 485 } } } } } - } + } // L: 496 - @ObfuscatedName("ai") + @ObfuscatedName("e") @ObfuscatedSignature( - descriptor = "(IILax;B)V", - garbageValue = "101" + descriptor = "(IILan;B)V", + garbageValue = "-118" ) - void method527(int var1, int var2, AbstractWorldMapData var3) { - for (int var4 = 0; var4 < var3.planes; ++var4) { - WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; - if (var5 != null && var5.length != 0) { - WorldMapDecoration[] var6 = var5; + void method519(int var1, int var2, AbstractWorldMapData var3) { + for (int var4 = 0; var4 < var3.planes; ++var4) { // L: 499 + WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2]; // L: 500 + if (var5 != null && var5.length != 0) { // L: 501 + WorldMapDecoration[] var6 = var5; // L: 505 - for (int var7 = 0; var7 < var6.length; ++var7) { - WorldMapDecoration var8 = var6[var7]; - int var10 = var8.decoration; - boolean var9 = var10 >= WorldMapDecorationType.field2756.id && var10 <= WorldMapDecorationType.field2758.id || var10 == WorldMapDecorationType.field2759.id; - if (var9) { - ObjectDefinition var11 = Canvas.getObjectDefinition(var8.objectDefinitionId); - int var12 = var11.int1 != 0 ? -3407872 : -3355444; - if (var8.decoration == WorldMapDecorationType.field2756.id) { - this.method522(var1, var2, var8.rotation, var12); + for (int var7 = 0; var7 < var6.length; ++var7) { // L: 506 + WorldMapDecoration var8 = var6[var7]; // L: 507 + if (TextureProvider.method2876(var8.decoration)) { // L: 509 + ObjectDefinition var9 = MidiPcmStream.getObjectDefinition(var8.objectDefinitionId); // L: 510 + int var10 = var9.int1 != 0 ? -3407872 : -3355444; // L: 511 + if (var8.decoration == WorldMapDecorationType.field2760.id) { // L: 512 + this.method585(var1, var2, var8.rotation, var10); // L: 513 } - if (var8.decoration == WorldMapDecorationType.field2755.id) { - this.method522(var1, var2, var8.rotation, -3355444); - this.method522(var1, var2, var8.rotation + 1, var12); + if (var8.decoration == WorldMapDecorationType.field2763.id) { // L: 515 + this.method585(var1, var2, var8.rotation, -3355444); // L: 516 + this.method585(var1, var2, var8.rotation + 1, var10); // L: 517 } - if (var8.decoration == WorldMapDecorationType.field2758.id) { - if (var8.rotation == 0) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12); + if (var8.decoration == WorldMapDecorationType.field2757.id) { // L: 519 + if (var8.rotation == 0) { // L: 520 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var10); } if (var8.rotation == 1) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), 1, var10); // L: 521 } - if (var8.rotation == 2) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + if (var8.rotation == 2) { // L: 522 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } - if (var8.rotation == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12); + if (var8.rotation == 3) { // L: 523 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var10); } } - if (var8.decoration == WorldMapDecorationType.field2759.id) { - int var13 = var8.rotation % 2; - int var14; - if (var13 == 0) { - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12); + if (var8.decoration == WorldMapDecorationType.field2761.id) { // L: 525 + int var11 = var8.rotation % 2; // L: 526 + int var12; + if (var11 == 0) { // L: 527 + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 528 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var12, 1, var10); // L: 529 } } else { - for (var14 = 0; var14 < this.pixelsPerTile; ++var14) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12); + for (var12 = 0; var12 < this.pixelsPerTile; ++var12) { // L: 533 + Rasterizer2D.Rasterizer2D_drawHorizontalLine(var12 + this.pixelsPerTile * var1, var12 + this.pixelsPerTile * (63 - var2), 1, var10); // L: 534 } } } @@ -584,472 +681,379 @@ public class WorldMapRegion { } } - } - - @ObfuscatedName("ao") - @ObfuscatedSignature( - descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "-1066971556" - ) - @Export("drawNonLinkMapIcons") - void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; - float var6 = var5 / 2.0F; - Iterator var7 = this.iconMap.entrySet().iterator(); - - while (var7.hasNext()) { - Entry var8 = (Entry)var7.next(); - Coord var9 = (Coord)var8.getKey(); - int var10 = (int)((float)var1 + var5 * (float)var9.x - var6); - int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); - AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); - if (var12 != null && var12.hasValidElement()) { - var12.screenX = var10; - var12.screenY = var11; - WorldMapElement var13 = Client.WorldMapElement_get(var12.getElement()); - if (!var3.contains(var13.getObjectId())) { - this.method512(var12, var10, var11, var5); - } - } - } - - } - - @ObfuscatedName("ae") - @ObfuscatedSignature( - descriptor = "(Ljava/util/HashSet;III)V", - garbageValue = "-545046717" - ) - void method497(HashSet var1, int var2, int var3) { - Iterator var4 = this.icon0List.iterator(); - - while (var4.hasNext()) { - AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); - if (var5.hasValidElement()) { - WorldMapElement var6 = Client.WorldMapElement_get(var5.getElement()); - if (var6 != null && var1.contains(var6.getObjectId())) { - this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); - } - } - } - - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(Lih;IIIII)V", - garbageValue = "1074456567" - ) - @Export("drawBackgroundCircle") - void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { - Sprite var6 = var1.getSpriteBool(false); - if (var6 != null) { - var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); - if (var4 % var5 < var5 / 2) { - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); - Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); - } - - } - } - - @ObfuscatedName("ag") - @ObfuscatedSignature( - descriptor = "(Laf;IIFI)V", - garbageValue = "-591534558" - ) - void method512(AbstractWorldMapIcon var1, int var2, int var3, float var4) { - WorldMapElement var5 = Client.WorldMapElement_get(var1.getElement()); - this.method494(var5, var2, var3); - this.method604(var1, var5, var2, var3, var4); - } + } // L: 543 @ObfuscatedName("ab") - @ObfuscatedSignature( - descriptor = "(Lih;IIB)V", - garbageValue = "34" - ) - void method494(WorldMapElement var1, int var2, int var3) { - Sprite var4 = var1.getSpriteBool(false); - if (var4 != null) { - int var5 = this.method516(var4, var1.horizontalAlignment); - int var6 = this.method517(var4, var1.verticalAlignment); - var4.drawTransBgAt(var5 + var2, var3 + var6); - } - - } - - @ObfuscatedName("am") - @ObfuscatedSignature( - descriptor = "(Laf;Lih;IIFB)V", - garbageValue = "81" - ) - void method604(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { - WorldMapLabel var6 = var1.getLabel(); - if (var6 != null) { - if (var6.size.method246(var5)) { - Font var7 = (Font)this.fonts.get(var6.size); - var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3251, 0, 1, 0, var7.ascent / 2); - } - } - } - - @ObfuscatedName("ak") @ObfuscatedSignature( descriptor = "(IILjava/util/HashSet;II)V", - garbageValue = "-109418068" + garbageValue = "-473063416" ) - @Export("drawMapLinks") - void drawMapLinks(int var1, int var2, HashSet var3, int var4) { - float var5 = (float)var4 / 64.0F; - Iterator var6 = this.icon0List.iterator(); + @Export("drawNonLinkMapIcons") + void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 546 + float var6 = var5 / 2.0F; // L: 547 + Iterator var7 = this.iconMap.entrySet().iterator(); // L: 548 - while (var6.hasNext()) { - AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); - if (var7.hasValidElement()) { - int var8 = var7.coord2.x % 64; - int var9 = var7.coord2.y % 64; - var7.screenX = (int)(var5 * (float)var8 + (float)var1); - var7.screenY = (int)((float)var2 + var5 * (float)(63 - var9)); - if (!var3.contains(var7.getElement())) { - this.method512(var7, var7.screenX, var7.screenY, var5); + while (var7.hasNext()) { + Entry var8 = (Entry)var7.next(); // L: 549 + Coord var9 = (Coord)var8.getKey(); // L: 551 + int var10 = (int)((float)var1 + (float)var9.x * var5 - var6); // L: 552 + int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6); // L: 553 + AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue(); // L: 554 + if (var12 != null && var12.hasValidElement()) { // L: 555 + var12.screenX = var10; // L: 556 + var12.screenY = var11; // L: 557 + WorldMapElement var13 = WorldMapSection0.WorldMapElement_get(var12.getElement()); // L: 558 + if (!var3.contains(var13.getObjectId())) { // L: 559 + this.method523(var12, var10, var11, var5); // L: 560 } } } - } + } // L: 565 - @ObfuscatedName("ad") + @ObfuscatedName("ag") @ObfuscatedSignature( - descriptor = "(Llz;Ljc;I)I", - garbageValue = "-1624159662" + descriptor = "(Ljava/util/HashSet;III)V", + garbageValue = "-1020675379" ) - int method516(Sprite var1, HorizontalAlignment var2) { - switch(var2.value) { - case 1: - return -var1.subWidth / 2; - case 2: - return 0; - default: - return -var1.subWidth; - } - } + void method521(HashSet var1, int var2, int var3) { + Iterator var4 = this.icon0List.iterator(); // L: 568 - @ObfuscatedName("as") - @ObfuscatedSignature( - descriptor = "(Llz;Lif;I)I", - garbageValue = "1330408949" - ) - int method517(Sprite var1, VerticalAlignment var2) { - switch(var2.value) { - case 1: - return -var1.subHeight / 2; - case 2: - return 0; - default: - return -var1.subHeight; + while (var4.hasNext()) { + AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next(); // L: 569 + if (var5.hasValidElement()) { // L: 571 + WorldMapElement var6 = WorldMapSection0.WorldMapElement_get(var5.getElement()); // L: 572 + if (var6 != null && var1.contains(var6.getObjectId())) { // L: 573 + this.drawBackgroundCircle(var6, var5.screenX, var5.screenY, var2, var3); // L: 574 + } + } } - } + + } // L: 578 + + @ObfuscatedName("ao") + @ObfuscatedSignature( + descriptor = "(Liv;IIIII)V", + garbageValue = "-1177603152" + ) + @Export("drawBackgroundCircle") + void drawBackgroundCircle(WorldMapElement var1, int var2, int var3, int var4, int var5) { + Sprite var6 = var1.getSpriteBool(false); // L: 581 + if (var6 != null) { // L: 582 + var6.drawTransBgAt(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2); // L: 585 + if (var4 % var5 < var5 / 2) { // L: 586 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128); // L: 587 + Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256); // L: 588 + } + + } + } // L: 583 590 + + @ObfuscatedName("ae") + @ObfuscatedSignature( + descriptor = "(Laz;IIFI)V", + garbageValue = "-1943029754" + ) + void method523(AbstractWorldMapIcon var1, int var2, int var3, float var4) { + WorldMapElement var5 = WorldMapSection0.WorldMapElement_get(var1.getElement()); // L: 593 + this.method524(var5, var2, var3); // L: 594 + this.method567(var1, var5, var2, var3, var4); // L: 595 + } // L: 596 @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(IB)Lar;", - garbageValue = "15" + descriptor = "(Liv;III)V", + garbageValue = "1650240142" ) - WorldMapLabel method518(int var1) { - WorldMapElement var2 = Client.WorldMapElement_get(var1); - return this.createMapLabel(var2); + void method524(WorldMapElement var1, int var2, int var3) { + Sprite var4 = var1.getSpriteBool(false); // L: 599 + if (var4 != null) { // L: 600 + int var5 = this.method527(var4, var1.horizontalAlignment); // L: 601 + int var6 = this.method528(var4, var1.verticalAlignment); // L: 602 + var4.drawTransBgAt(var5 + var2, var3 + var6); // L: 603 + } + + } // L: 605 + + @ObfuscatedName("au") + @ObfuscatedSignature( + descriptor = "(Laz;Liv;IIFB)V", + garbageValue = "-60" + ) + void method567(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) { + WorldMapLabel var6 = var1.getLabel(); // L: 608 + if (var6 != null) { // L: 609 + if (var6.size.method274(var5)) { // L: 612 + Font var7 = (Font)this.fonts.get(var6.size); // L: 615 + var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field3243, 0, 1, 0, var7.ascent / 2); // L: 616 + } + } + } // L: 610 613 617 + + @ObfuscatedName("aa") + @ObfuscatedSignature( + descriptor = "(IILjava/util/HashSet;II)V", + garbageValue = "-1868522380" + ) + @Export("drawMapLinks") + void drawMapLinks(int var1, int var2, HashSet var3, int var4) { + float var5 = (float)var4 / 64.0F; // L: 620 + Iterator var6 = this.icon0List.iterator(); // L: 621 + + while (var6.hasNext()) { + AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next(); // L: 622 + if (var7.hasValidElement()) { // L: 624 + int var8 = var7.coord2.x % 64; // L: 625 + int var9 = var7.coord2.y % 64; // L: 626 + var7.screenX = (int)((float)var1 + var5 * (float)var8); // L: 627 + var7.screenY = (int)((float)(63 - var9) * var5 + (float)var2); // L: 628 + if (!var3.contains(var7.getElement())) { // L: 629 + this.method523(var7, var7.screenX, var7.screenY, var5); // L: 632 + } + } + } + + } // L: 635 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(Llp;Lju;I)I", + garbageValue = "-249160527" + ) + int method527(Sprite var1, HorizontalAlignment var2) { + switch(var2.value) { // L: 638 + case 0: + return -var1.subWidth / 2; // L: 649 + case 1: + return 0; // L: 641 + default: + return -var1.subWidth; // L: 645 + } + } + + @ObfuscatedName("at") + @ObfuscatedSignature( + descriptor = "(Llp;Lit;I)I", + garbageValue = "-74495504" + ) + int method528(Sprite var1, VerticalAlignment var2) { + switch(var2.value) { // L: 655 + case 0: + return -var1.subHeight / 2; // L: 658 + case 1: + return 0; // L: 662 + default: + return -var1.subHeight; // L: 666 + } + } + + @ObfuscatedName("aq") + @ObfuscatedSignature( + descriptor = "(II)Laq;", + garbageValue = "-576832449" + ) + WorldMapLabel method529(int var1) { + WorldMapElement var2 = WorldMapSection0.WorldMapElement_get(var1); // L: 672 + return this.createMapLabel(var2); // L: 673 } @ObfuscatedName("al") @ObfuscatedSignature( - descriptor = "(Lih;I)Lar;", - garbageValue = "-1165001445" + descriptor = "(Liv;I)Laq;", + garbageValue = "-1919467673" ) @Export("createMapLabel") WorldMapLabel createMapLabel(WorldMapElement var1) { - if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { - int var3 = var1.textSize; - WorldMapLabelSize[] var4 = new WorldMapLabelSize[]{WorldMapLabelSize.WorldMapLabelSize_medium, WorldMapLabelSize.WorldMapLabelSize_large, WorldMapLabelSize.WorldMapLabelSize_small}; - WorldMapLabelSize[] var5 = var4; - int var6 = 0; - - WorldMapLabelSize var2; - while (true) { - if (var6 >= var5.length) { - var2 = null; - break; - } - - WorldMapLabelSize var7 = var5[var6]; - if (var3 == var7.field132) { - var2 = var7; - break; - } - - ++var6; - } - - if (var2 == null) { - return null; + if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) { // L: 677 + WorldMapLabelSize var2 = WorldMapLabelSize.method270(var1.textSize); // L: 680 + if (var2 == null) { // L: 681 + return null; // L: 682 } else { - Font var14 = (Font)this.fonts.get(var2); - if (var14 == null) { - return null; + Font var3 = (Font)this.fonts.get(var2); // L: 684 + if (var3 == null) { // L: 685 + return null; // L: 686 } else { - var6 = var14.lineCount(var1.name, 1000000); - String[] var15 = new String[var6]; - var14.breakLines(var1.name, (int[])null, var15); - int var8 = var15.length * var14.ascent / 2; - int var9 = 0; - String[] var10 = var15; + int var4 = var3.lineCount(var1.name, 1000000); // L: 688 + String[] var5 = new String[var4]; // L: 689 + var3.breakLines(var1.name, (int[])null, var5); // L: 690 + int var6 = var5.length * var3.ascent / 2; // L: 691 + int var7 = 0; // L: 692 + String[] var8 = var5; // L: 694 - for (int var11 = 0; var11 < var10.length; ++var11) { - String var12 = var10[var11]; - int var13 = var14.stringWidth(var12); - if (var13 > var9) { - var9 = var13; + for (int var9 = 0; var9 < var8.length; ++var9) { // L: 695 + String var10 = var8[var9]; // L: 696 + int var11 = var3.stringWidth(var10); // L: 698 + if (var11 > var7) { // L: 699 + var7 = var11; // L: 700 } } - return new WorldMapLabel(var1.name, var9, var8, var2); + return new WorldMapLabel(var1.name, var7, var6, var2); // L: 705 } } } else { - return null; + return null; // L: 678 } } - @ObfuscatedName("an") + @ObfuscatedName("ah") @ObfuscatedSignature( descriptor = "(IIIIII)Ljava/util/List;", - garbageValue = "1872285307" + garbageValue = "-2065951782" ) - List method544(int var1, int var2, int var3, int var4, int var5) { - LinkedList var6 = new LinkedList(); - if (var4 >= var1 && var5 >= var2) { - if (var4 < var3 + var1 && var5 < var3 + var2) { + List method531(int var1, int var2, int var3, int var4, int var5) { + LinkedList var6 = new LinkedList(); // L: 709 + if (var4 >= var1 && var5 >= var2) { // L: 710 + if (var4 < var3 + var1 && var5 < var3 + var2) { // L: 711 Iterator var7 = this.iconMap.values().iterator(); AbstractWorldMapIcon var8; - while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { - var6.add(var8); + while (var7.hasNext()) { // L: 712 + var8 = (AbstractWorldMapIcon)var7.next(); // L: 713 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 715 + var6.add(var8); // L: 716 } } - var7 = this.icon0List.iterator(); + var7 = this.icon0List.iterator(); // L: 720 while (var7.hasNext()) { - var8 = (AbstractWorldMapIcon)var7.next(); - if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { - var6.add(var8); + var8 = (AbstractWorldMapIcon)var7.next(); // L: 721 + if (var8.hasValidElement() && var8.fitsScreen(var4, var5)) { // L: 723 + var6.add(var8); // L: 724 } } - return var6; + return var6; // L: 728 } else { - return var6; + return var6; // L: 719 } } else { return var6; } } - @ObfuscatedName("ac") + @ObfuscatedName("av") @ObfuscatedSignature( descriptor = "(I)Ljava/util/List;", - garbageValue = "-2023703181" + garbageValue = "-715702618" ) @Export("icons") List icons() { - LinkedList var1 = new LinkedList(); - var1.addAll(this.icon0List); - var1.addAll(this.iconMap.values()); - return var1; + LinkedList var1 = new LinkedList(); // L: 732 + var1.addAll(this.icon0List); // L: 733 + var1.addAll(this.iconMap.values()); // L: 734 + return var1; // L: 735 } - @ObfuscatedName("av") + @ObfuscatedName("ax") @ObfuscatedSignature( descriptor = "(IIIII)V", - garbageValue = "-637196231" + garbageValue = "-301130878" ) - void method522(int var1, int var2, int var3, int var4) { - var3 %= 4; - if (var3 == 0) { + void method585(int var1, int var2, int var3, int var4) { + var3 %= 4; // L: 739 + if (var3 == 0) { // L: 740 Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 1) { + if (var3 == 1) { // L: 741 Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } - if (var3 == 2) { - Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile + this.pixelsPerTile * var1 - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); + if (var3 == 2) { // L: 742 + Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4); } if (var3 == 3) { - Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); + Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4); // L: 743 } + } // L: 744 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IB)Ljm;", + garbageValue = "-91" + ) + @Export("SequenceDefinition_get") + public static SequenceDefinition SequenceDefinition_get(int var0) { + SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); // L: 35 + if (var1 != null) { // L: 36 + return var1; + } else { + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); // L: 37 + var1 = new SequenceDefinition(); // L: 38 + if (var2 != null) { // L: 39 + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; + } } + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lic;IIB)Lls;", + garbageValue = "20" + ) + static IndexedSprite method611(AbstractArchive var0, int var1, int var2) { + byte[] var4 = var0.takeFile(var1, var2); // L: 40 + boolean var3; + if (var4 == null) { // L: 41 + var3 = false; // L: 42 + } else { + Occluder.SpriteBuffer_decode(var4); // L: 45 + var3 = true; // L: 46 + } + + return !var3 ? null : InvDefinition.method4448(); // L: 48 49 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(IIIZIZI)V", + garbageValue = "783564244" + ) + @Export("doWorldSorting") + static void doWorldSorting(int var0, int var1, int var2, boolean var3, int var4, boolean var5) { + if (var0 < var1) { // L: 177 + int var6 = (var0 + var1) / 2; // L: 178 + int var7 = var0; // L: 179 + World var8 = AbstractByteArrayCopier.World_worlds[var6]; // L: 180 + AbstractByteArrayCopier.World_worlds[var6] = AbstractByteArrayCopier.World_worlds[var1]; // L: 181 + AbstractByteArrayCopier.World_worlds[var1] = var8; // L: 182 + + for (int var9 = var0; var9 < var1; ++var9) { // L: 183 + if (ModelData0.method3376(AbstractByteArrayCopier.World_worlds[var9], var8, var2, var3, var4, var5) <= 0) { // L: 184 + World var10 = AbstractByteArrayCopier.World_worlds[var9]; // L: 185 + AbstractByteArrayCopier.World_worlds[var9] = AbstractByteArrayCopier.World_worlds[var7]; // L: 186 + AbstractByteArrayCopier.World_worlds[var7++] = var10; // L: 187 + } + } + + AbstractByteArrayCopier.World_worlds[var1] = AbstractByteArrayCopier.World_worlds[var7]; // L: 191 + AbstractByteArrayCopier.World_worlds[var7] = var8; // L: 192 + doWorldSorting(var0, var7 - 1, var2, var3, var4, var5); // L: 193 + doWorldSorting(var7 + 1, var1, var2, var3, var4, var5); // L: 194 + } + + } // L: 196 + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IB)Ljava/lang/String;", - garbageValue = "0" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "1201601061" ) - static String method611(int var0) { - return ""; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Lic;Lic;ZIB)V", - garbageValue = "73" - ) - static void method541(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) { - if (GrandExchangeOfferAgeComparator.clearLoginScreen) { - if (var3 == 4) { - Login.loginIndex = 4; - } - - } else { - Login.loginIndex = var3; - Rasterizer2D.Rasterizer2D_clear(); - byte[] var4 = var0.takeFileByNames("title.jpg", ""); - Login.leftTitleSprite = FloorUnderlayDefinition.convertJpgToSprite(var4); - ItemContainer.rightTitleSprite = Login.leftTitleSprite.mirrorHorizontally(); - if ((Client.worldProperties & 536870912) != 0) { - Login.logoSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); - } else if ((Client.worldProperties & 1073741824) != 0) { - Login.logoSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "logo_seasonal_mode", ""); - } else { - Login.logoSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); - } - - HealthBar.titleboxSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); - Fonts.titlebuttonSprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); - Login.runesSprite = PendingSpawn.method1806(var1, "runes", ""); - Decimator.title_muteSprite = PendingSpawn.method1806(var1, "title_mute", ""); - Login.options_buttons_0Sprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - class336.field3912 = class329.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - GameShell.options_buttons_2Sprite = class329.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - ScriptEvent.field597 = class329.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); - ScriptEvent.field606 = Login.options_buttons_0Sprite.subWidth; - Skeleton.field1826 = Login.options_buttons_0Sprite.subHeight; - Login.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); - if (var2) { - Login.Login_username = ""; - Login.Login_password = ""; - } - - WorldMapSprite.field264 = 0; - ClanMate.otp = ""; - Login.field1223 = true; - Login.worldSelectOpen = false; - if (!NetSocket.clientPreferences.titleMusicDisabled) { - WorldMapSectionType.method306(2, UserComparator7.archive6, "scape main", "", 255, false); - } else { - class206.field2439 = 1; - Huffman.musicTrackArchive = null; - class206.musicTrackGroupId = -1; - MilliClock.musicTrackFileId = -1; - class206.musicTrackVolume = 0; - class336.musicTrackBoolean = false; - class206.field2442 = 2; - } - - class41.method624(false); - GrandExchangeOfferAgeComparator.clearLoginScreen = true; - Login.xPadding = (Varcs.canvasWidth - 765) / 2; - Login.loginBoxX = Login.xPadding + 202; - Login.loginBoxCenter = Login.loginBoxX + 180; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - ItemContainer.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "([BIILem;[Lfz;I)V", - garbageValue = "2110608618" - ) - static final void method520(byte[] var0, int var1, int var2, Scene var3, CollisionMap[] var4) { - Buffer var5 = new Buffer(var0); - int var6 = -1; - - while (true) { - int var7 = var5.method5732(); - if (var7 == 0) { - return; - } - - var6 += var7; - int var8 = 0; - - while (true) { - int var9 = var5.readUShortSmart(); - if (var9 == 0) { - break; - } - - var8 += var9 - 1; - int var10 = var8 & 63; - int var11 = var8 >> 6 & 63; - int var12 = var8 >> 12; - int var13 = var5.readUnsignedByte(); - int var14 = var13 >> 2; - int var15 = var13 & 3; - int var16 = var11 + var1; - int var17 = var10 + var2; - if (var16 > 0 && var17 > 0 && var16 < 103 && var17 < 103) { - int var18 = var12; - if ((Tiles.Tiles_renderFlags[1][var16][var17] & 2) == 2) { - var18 = var12 - 1; - } - - CollisionMap var19 = null; - if (var18 >= 0) { - var19 = var4[var18]; - } - - class41.method623(var12, var16, var17, var6, var15, var14, var3, var19); - } - } - } - } - - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", - garbageValue = "1188982051" - ) - public static String method613(CharSequence var0) { - int var2 = var0.length(); - char[] var3 = new char[var2]; - - for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = '*'; - } - - String var1 = new String(var3); - return var1; - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1729353044" - ) - static void method591() { - if (WorldMapSection3.loadWorlds()) { - Login.worldSelectOpen = true; - Login.worldSelectPage = 0; - Login.worldSelectPagesCount = 0; - } - - } + static final void method609(String var0) { + StringBuilder var10000 = new StringBuilder(); + Object var10001 = null; // L: 119 + var10000 = var10000.append("Please remove ").append(var0); + var10001 = null; + String var1 = var10000.append(" from your ignore list first").toString(); + WorldMapRectangle.addGameMessage(30, "", var1); // L: 121 + } // L: 123 } diff --git a/runescape-client/src/main/java/WorldMapScaleHandler.java b/runescape-client/src/main/java/WorldMapScaleHandler.java index dbbdb22e67..8c9b907c33 100644 --- a/runescape-client/src/main/java/WorldMapScaleHandler.java +++ b/runescape-client/src/main/java/WorldMapScaleHandler.java @@ -4,657 +4,657 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ay") +@ObfuscatedName("af") @Implements("WorldMapScaleHandler") public class WorldMapScaleHandler { - @ObfuscatedName("sy") - @Export("foundItemIds") - static short[] foundItemIds; @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lei;" + ) + @Export("World_request") + static UrlRequest World_request; + @ObfuscatedName("h") + @Export("Tiles_hueMultiplier") + static int[] Tiles_hueMultiplier; + @ObfuscatedName("eb") @ObfuscatedGetter( - intValue = 941345051 + intValue = -1388382927 + ) + @Export("port3") + static int port3; + @ObfuscatedName("z") + @ObfuscatedGetter( + intValue = 1114368907 ) @Export("pixelsPerTile") int pixelsPerTile; - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("tileTemplates") byte[][][] tileTemplates; WorldMapScaleHandler(int var1) { - this.pixelsPerTile = var1; - } + this.pixelsPerTile = var1; // L: 10 + } // L: 11 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "(IIIIIIIII)V", - garbageValue = "1923645128" + garbageValue = "315012939" ) - void method798(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { - if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { - var8 = this.method794(var8, var7); - var7 = this.method795(var7); - Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); + void method802(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { // L: 14 + var8 = this.method791(var8, var7); // L: 15 + var7 = this.method828(var7); // L: 16 + Rasterizer2D.Rasterizer2D_drawGradientPixels(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); // L: 17 } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "-1887787405" + garbageValue = "1896351316" ) - int method794(int var1, int var2) { - if (var2 == 9) { + int method791(int var1, int var2) { + if (var2 == 9) { // L: 21 var1 = var1 + 1 & 3; } - if (var2 == 10) { + if (var2 == 10) { // L: 22 var1 = var1 + 3 & 3; } if (var2 == 11) { - var1 = var1 + 3 & 3; + var1 = var1 + 3 & 3; // L: 23 } - return var1; + return var1; // L: 24 } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-1636996123" + descriptor = "(IB)I", + garbageValue = "107" ) - int method795(int var1) { - if (var1 != 9 && var1 != 10) { - return var1 == 11 ? 8 : var1; + int method828(int var1) { + if (var1 != 9 && var1 != 10) { // L: 28 + return var1 == 11 ? 8 : var1; // L: 29 } else { - return 1; + return 1; // L: 30 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1385757357" + garbageValue = "-1909065180" ) @Export("init") void init() { - if (this.tileTemplates == null) { - this.tileTemplates = new byte[8][4][]; - this.init0(); - this.init1(); - this.init2(); - this.init3(); - this.init4(); - this.init5(); - this.init6(); - this.init7(); + if (this.tileTemplates == null) { // L: 34 + this.tileTemplates = new byte[8][4][]; // L: 37 + this.init0(); // L: 38 + this.init1(); // L: 39 + this.init2(); // L: 40 + this.init3(); // L: 41 + this.init4(); // L: 42 + this.init5(); // L: 43 + this.init6(); // L: 44 + this.init7(); // L: 45 } - } + } // L: 35 46 - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1289637080" + descriptor = "(B)V", + garbageValue = "97" ) @Export("init0") void init0() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 49 + int var2 = 0; // L: 50 int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 51 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 52 + if (var4 <= var3) { // L: 53 + var1[var2] = -1; + } + + ++var2; // L: 54 + } + } + + this.tileTemplates[0][0] = var1; // L: 57 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 58 + var2 = 0; // L: 59 + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 60 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 61 if (var4 <= var3) { - var1[var2] = -1; + var1[var2] = -1; // L: 62 } - ++var2; + ++var2; // L: 63 } } - this.tileTemplates[0][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[0][1] = var1; // L: 66 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 67 + var2 = 0; // L: 68 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 69 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 70 + if (var4 >= var3) { // L: 71 var1[var2] = -1; } - ++var2; + ++var2; // L: 72 } } - this.tileTemplates[0][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[0][2] = var1; // L: 75 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 76 + var2 = 0; // L: 77 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 78 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 79 + if (var4 >= var3) { // L: 80 var1[var2] = -1; } - ++var2; + ++var2; // L: 81 } } - this.tileTemplates[0][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[0][3] = var1; // L: 84 + } // L: 85 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[0][3] = var1; - } - - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-112" + descriptor = "(I)V", + garbageValue = "-1716417605" ) @Export("init1") void init1() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 88 + int var2 = 0; // L: 89 int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 >> 1) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 90 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 91 + if (var4 <= var3 >> 1) { // L: 92 var1[var2] = -1; } - ++var2; + ++var2; // L: 93 } } - this.tileTemplates[1][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[1][0] = var1; // L: 96 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 97 + var2 = 0; // L: 98 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var2 >= 0 && var2 < var1.length) { - if (var4 >= var3 << 1) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 99 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 100 + if (var2 >= 0 && var2 < var1.length) { // L: 101 + if (var4 >= var3 << 1) { // L: 105 var1[var2] = -1; } - ++var2; + ++var2; // L: 106 } else { - ++var2; + ++var2; // L: 102 } } } - this.tileTemplates[1][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[1][1] = var1; // L: 109 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 110 + var2 = 0; // L: 111 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 >> 1) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 112 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 113 + if (var4 <= var3 >> 1) { // L: 114 var1[var2] = -1; } - ++var2; + ++var2; // L: 115 } } - this.tileTemplates[1][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[1][2] = var1; // L: 118 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 119 + var2 = 0; // L: 120 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 << 1) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 121 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 122 + if (var4 >= var3 << 1) { // L: 123 var1[var2] = -1; } - ++var2; + ++var2; // L: 124 } } - this.tileTemplates[1][3] = var1; - } + this.tileTemplates[1][3] = var1; // L: 127 + } // L: 128 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-1821713225" + garbageValue = "-1974218360" ) @Export("init2") void init2() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 131 + int var2 = 0; // L: 132 int var3; int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 >> 1) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 133 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 134 + if (var4 <= var3 >> 1) { // L: 135 var1[var2] = -1; } - ++var2; + ++var2; // L: 136 } } - this.tileTemplates[2][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[2][0] = var1; // L: 139 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 140 + var2 = 0; // L: 141 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 142 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 143 if (var4 >= var3 << 1) { + var1[var2] = -1; // L: 144 + } + + ++var2; // L: 145 + } + } + + this.tileTemplates[2][1] = var1; // L: 148 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 149 + var2 = 0; // L: 150 + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 151 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 152 + if (var4 <= var3 >> 1) { // L: 153 var1[var2] = -1; } - ++var2; + ++var2; // L: 154 } } - this.tileTemplates[2][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; + this.tileTemplates[2][2] = var1; // L: 157 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 158 + var2 = 0; // L: 159 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 >> 1) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 160 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 161 + if (var4 >= var3 << 1) { // L: 162 var1[var2] = -1; } - ++var2; + ++var2; // L: 163 } } - this.tileTemplates[2][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[2][3] = var1; - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-294529084" - ) - @Export("init3") - void init3() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[3][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[3][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[3][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[3][3] = var1; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1871993011" - ) - @Export("init4") - void init4() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var2 = 0; - - int var3; - int var4; - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[4][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[4][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 >> 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[4][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var2 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 << 1) { - var1[var2] = -1; - } - - ++var2; - } - } - - this.tileTemplates[4][3] = var1; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "13" - ) - @Export("init5") - void init5() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - boolean var2 = false; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var5 = 0; - - int var3; - int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[5][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var3 <= this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[5][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[5][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; - - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var3 >= this.pixelsPerTile / 2) { - var1[var5] = -1; - } - - ++var5; - } - } - - this.tileTemplates[5][3] = var1; - } + this.tileTemplates[2][3] = var1; // L: 166 + } // L: 167 @ObfuscatedName("w") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-437355569" + garbageValue = "922410315" + ) + @Export("init3") + void init3() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 170 + int var2 = 0; // L: 171 + + int var3; + int var4; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 172 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 173 + if (var4 >= var3 >> 1) { // L: 174 + var1[var2] = -1; + } + + ++var2; // L: 175 + } + } + + this.tileTemplates[3][0] = var1; // L: 178 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 179 + var2 = 0; // L: 180 + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 181 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 182 + if (var4 <= var3 << 1) { // L: 183 + var1[var2] = -1; + } + + ++var2; // L: 184 + } + } + + this.tileTemplates[3][1] = var1; // L: 187 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 188 + var2 = 0; // L: 189 + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 190 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 191 + if (var4 >= var3 >> 1) { // L: 192 + var1[var2] = -1; + } + + ++var2; // L: 193 + } + } + + this.tileTemplates[3][2] = var1; // L: 196 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 197 + var2 = 0; // L: 198 + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 199 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 200 + if (var4 <= var3 << 1) { // L: 201 + var1[var2] = -1; + } + + ++var2; // L: 202 + } + } + + this.tileTemplates[3][3] = var1; // L: 205 + } // L: 206 + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1095934607" + ) + @Export("init4") + void init4() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 209 + int var2 = 0; // L: 210 + + int var3; + int var4; + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 211 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 212 + if (var4 >= var3 >> 1) { // L: 213 + var1[var2] = -1; + } + + ++var2; // L: 214 + } + } + + this.tileTemplates[4][0] = var1; // L: 217 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 218 + var2 = 0; // L: 219 + + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 220 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 221 + if (var4 <= var3 << 1) { // L: 222 + var1[var2] = -1; + } + + ++var2; // L: 223 + } + } + + this.tileTemplates[4][1] = var1; // L: 226 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 227 + var2 = 0; // L: 228 + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 229 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 230 + if (var4 >= var3 >> 1) { // L: 231 + var1[var2] = -1; + } + + ++var2; // L: 232 + } + } + + this.tileTemplates[4][2] = var1; // L: 235 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 236 + var2 = 0; // L: 237 + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 238 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 239 + if (var4 <= var3 << 1) { // L: 240 + var1[var2] = -1; + } + + ++var2; // L: 241 + } + } + + this.tileTemplates[4][3] = var1; // L: 244 + } // L: 245 + + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1883920620" + ) + @Export("init5") + void init5() { + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 248 + boolean var2 = false; // L: 249 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 250 + int var5 = 0; // L: 251 + + int var3; + int var4; + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 252 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 253 + if (var4 <= this.pixelsPerTile / 2) { // L: 254 + var1[var5] = -1; + } + + ++var5; // L: 255 + } + } + + this.tileTemplates[5][0] = var1; // L: 258 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 259 + var5 = 0; // L: 260 + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 261 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 262 + if (var3 <= this.pixelsPerTile / 2) { // L: 263 + var1[var5] = -1; + } + + ++var5; // L: 264 + } + } + + this.tileTemplates[5][1] = var1; // L: 267 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 268 + var5 = 0; // L: 269 + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 270 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 271 + if (var4 >= this.pixelsPerTile / 2) { // L: 272 + var1[var5] = -1; + } + + ++var5; // L: 273 + } + } + + this.tileTemplates[5][2] = var1; // L: 276 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 277 + var5 = 0; // L: 278 + + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 279 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 280 + if (var3 >= this.pixelsPerTile / 2) { // L: 281 + var1[var5] = -1; + } + + ++var5; // L: 282 + } + } + + this.tileTemplates[5][3] = var1; // L: 285 + } // L: 286 + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1746576330" ) @Export("init6") void init6() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - boolean var2 = false; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var5 = 0; + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 289 + boolean var2 = false; // L: 290 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 291 + int var5 = 0; // L: 292 int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 293 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 294 + if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 295 var1[var5] = -1; } - ++var5; + ++var5; // L: 296 } } - this.tileTemplates[6][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[6][0] = var1; // L: 299 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 300 + var5 = 0; // L: 301 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 302 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 303 + if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 304 var1[var5] = -1; } - ++var5; + ++var5; // L: 305 } } - this.tileTemplates[6][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[6][1] = var1; // L: 308 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 309 + var5 = 0; // L: 310 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 311 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 312 + if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 313 var1[var5] = -1; } - ++var5; + ++var5; // L: 314 } } - this.tileTemplates[6][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[6][2] = var1; // L: 317 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 318 + var5 = 0; // L: 319 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 <= var3 - this.pixelsPerTile / 2) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 320 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 321 + if (var4 <= var3 - this.pixelsPerTile / 2) { // L: 322 var1[var5] = -1; } - ++var5; + ++var5; // L: 323 } } - this.tileTemplates[6][3] = var1; - } + this.tileTemplates[6][3] = var1; // L: 326 + } // L: 327 - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "959686276" + garbageValue = "1072905152" ) @Export("init7") void init7() { - byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - boolean var2 = false; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - int var5 = 0; + byte[] var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 330 + boolean var2 = false; // L: 331 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 332 + int var5 = 0; // L: 333 int var3; int var4; - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 334 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 335 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 336 var1[var5] = -1; } - ++var5; + ++var5; // L: 337 } } - this.tileTemplates[7][0] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[7][0] = var1; // L: 340 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 341 + var5 = 0; // L: 342 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 343 + for (var4 = 0; var4 < this.pixelsPerTile; ++var4) { // L: 344 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 345 var1[var5] = -1; } - ++var5; + ++var5; // L: 346 } } - this.tileTemplates[7][1] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[7][1] = var1; // L: 349 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 350 + var5 = 0; // L: 351 - for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { + for (var3 = this.pixelsPerTile - 1; var3 >= 0; --var3) { // L: 352 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 353 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 354 var1[var5] = -1; } - ++var5; + ++var5; // L: 355 } } - this.tileTemplates[7][2] = var1; - var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; - var5 = 0; + this.tileTemplates[7][2] = var1; // L: 358 + var1 = new byte[this.pixelsPerTile * this.pixelsPerTile]; // L: 359 + var5 = 0; // L: 360 - for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { - for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { - if (var4 >= var3 - this.pixelsPerTile / 2) { + for (var3 = 0; var3 < this.pixelsPerTile; ++var3) { // L: 361 + for (var4 = this.pixelsPerTile - 1; var4 >= 0; --var4) { // L: 362 + if (var4 >= var3 - this.pixelsPerTile / 2) { // L: 363 var1[var5] = -1; } - ++var5; + ++var5; // L: 364 } } - this.tileTemplates[7][3] = var1; - } + this.tileTemplates[7][3] = var1; // L: 367 + } // L: 368 - @ObfuscatedName("j") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IS)Z", - garbageValue = "180" + descriptor = "(II)Ljava/lang/String;", + garbageValue = "-1676022086" ) - public static boolean method819(int var0) { - return (var0 >> 20 & 1) != 0; - } - - @ObfuscatedName("gq") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1963467605" - ) - static void method812() { - if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) { - class9.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false); - } - + static String method824(int var0) { + return ""; // L: 18 } } diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java index 0c794f72dc..bb14240655 100644 --- a/runescape-client/src/main/java/WorldMapSection.java +++ b/runescape-client/src/main/java/WorldMapSection.java @@ -3,53 +3,53 @@ import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aw") +@ObfuscatedName("ay") @Implements("WorldMapSection") public interface WorldMapSection { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lad;I)V", - garbageValue = "411670415" + descriptor = "(Lar;B)V", + garbageValue = "100" ) @Export("expandBounds") void expandBounds(WorldMapArea var1); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "2" + descriptor = "(IIII)Z", + garbageValue = "-339896458" ) @Export("containsCoord") boolean containsCoord(int var1, int var2, int var3); - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "48" + descriptor = "(III)Z", + garbageValue = "-2135820245" ) @Export("containsPosition") boolean containsPosition(int var1, int var2); - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "459340529" + garbageValue = "-1761492451" ) @Export("getBorderTileLengths") int[] getBorderTileLengths(int var1, int var2, int var3); - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(III)Lhg;", - garbageValue = "1240901536" + garbageValue = "-1553504587" ) @Export("coord") Coord coord(int var1, int var2); - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "0" + descriptor = "(Lkf;I)V", + garbageValue = "2144381737" ) @Export("read") void read(Buffer var1); diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 1d00b442c4..566c3ae655 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -7,1193 +7,224 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ao") @Implements("WorldMapSection0") public class WorldMapSection0 implements WorldMapSection { - @ObfuscatedName("fa") - @ObfuscatedSignature( - descriptor = "Lkv;" - ) - @Export("WorldMapElement_fonts") - static Fonts WorldMapElement_fonts; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = -1853202427 + intValue = -465345147 ) @Export("oldZ") int oldZ; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1923822575 + intValue = -202719925 ) @Export("newZ") int newZ; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -34233439 + intValue = 47110693 ) @Export("oldX") int oldX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = -847595737 + intValue = -1315329307 ) @Export("oldY") int oldY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1218395603 + intValue = -445154313 ) @Export("newX") int newX; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = -1280825293 + intValue = -1054372917 ) @Export("newY") int newY; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -695848013 + intValue = 755868073 ) @Export("oldChunkXLow") int oldChunkXLow; - @ObfuscatedName("u") + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = 233992023 + intValue = -1795067773 ) @Export("oldChunkYLow") int oldChunkYLow; - @ObfuscatedName("a") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = -1605249157 + intValue = -662709525 ) @Export("oldChunkXHigh") int oldChunkXHigh; - @ObfuscatedName("z") + @ObfuscatedName("m") @ObfuscatedGetter( - intValue = 103883527 + intValue = -1849440565 ) @Export("oldChunkYHigh") int oldChunkYHigh; - @ObfuscatedName("w") + @ObfuscatedName("n") @ObfuscatedGetter( - intValue = 1800743497 + intValue = -1861847067 ) @Export("newChunkXLow") int newChunkXLow; - @ObfuscatedName("y") + @ObfuscatedName("d") @ObfuscatedGetter( - intValue = -1992325701 + intValue = 1830088993 ) @Export("newChunkYLow") int newChunkYLow; - @ObfuscatedName("c") + @ObfuscatedName("h") @ObfuscatedGetter( - intValue = 731618977 + intValue = -878235337 ) @Export("newChunkXHigh") int newChunkXHigh; - @ObfuscatedName("h") + @ObfuscatedName("a") @ObfuscatedGetter( - intValue = -1689147705 + intValue = -2049654615 ) @Export("newChunkYHigh") int newChunkYHigh; WorldMapSection0() { - } + } // L: 22 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lad;I)V", - garbageValue = "411670415" + descriptor = "(Lar;B)V", + garbageValue = "100" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.newX) { + if (var1.regionLowX > this.newX) { // L: 25 var1.regionLowX = this.newX; } if (var1.regionHighX < this.newX) { - var1.regionHighX = this.newX; + var1.regionHighX = this.newX; // L: 26 } - if (var1.regionLowY > this.newY) { + if (var1.regionLowY > this.newY) { // L: 27 var1.regionLowY = this.newY; } - if (var1.regionHighY < this.newY) { + if (var1.regionHighY < this.newY) { // L: 28 var1.regionHighY = this.newY; } - } + } // L: 29 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "2" + descriptor = "(IIII)Z", + garbageValue = "-339896458" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { - return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; + if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { // L: 32 + return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 35 } else { - return false; + return false; // L: 33 } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "48" + descriptor = "(III)Z", + garbageValue = "-2135820245" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { - return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; + return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 39 } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "459340529" + garbageValue = "-1761492451" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { - return null; + return null; // L: 44 } else { - int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; - return var4; + int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48 + return var4; // L: 49 } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(III)Lhg;", - garbageValue = "1240901536" + garbageValue = "-1553504587" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; + if (!this.containsPosition(var1, var2)) { // L: 53 + return null; // L: 54 } else { - int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; - int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); - return new Coord(this.oldZ, var3, var4); + int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56 + int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57 + return new Coord(this.oldZ, var3, var4); // L: 58 } } - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "0" + descriptor = "(Lkf;I)V", + garbageValue = "2144381737" ) @Export("read") public void read(Buffer var1) { - this.oldZ = var1.readUnsignedByte(); - this.newZ = var1.readUnsignedByte(); - this.oldX = var1.readUnsignedShort(); - this.oldChunkXLow = var1.readUnsignedByte(); - this.oldChunkXHigh = var1.readUnsignedByte(); - this.oldY = var1.readUnsignedShort(); - this.oldChunkYLow = var1.readUnsignedByte(); - this.oldChunkYHigh = var1.readUnsignedByte(); - this.newX = var1.readUnsignedShort(); - this.newChunkXLow = var1.readUnsignedByte(); - this.newChunkXHigh = var1.readUnsignedByte(); - this.newY = var1.readUnsignedShort(); - this.newChunkYLow = var1.readUnsignedByte(); - this.newChunkYHigh = var1.readUnsignedByte(); - this.postRead(); - } + this.oldZ = var1.readUnsignedByte(); // L: 62 + this.newZ = var1.readUnsignedByte(); // L: 63 + this.oldX = var1.readUnsignedShort(); // L: 64 + this.oldChunkXLow = var1.readUnsignedByte(); // L: 65 + this.oldChunkXHigh = var1.readUnsignedByte(); // L: 66 + this.oldY = var1.readUnsignedShort(); // L: 67 + this.oldChunkYLow = var1.readUnsignedByte(); // L: 68 + this.oldChunkYHigh = var1.readUnsignedByte(); // L: 69 + this.newX = var1.readUnsignedShort(); // L: 70 + this.newChunkXLow = var1.readUnsignedByte(); // L: 71 + this.newChunkXHigh = var1.readUnsignedByte(); // L: 72 + this.newY = var1.readUnsignedShort(); // L: 73 + this.newChunkYLow = var1.readUnsignedByte(); // L: 74 + this.newChunkYHigh = var1.readUnsignedByte(); // L: 75 + this.postRead(); // L: 76 + } // L: 77 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1040528661" + descriptor = "(B)V", + garbageValue = "60" ) @Export("postRead") void postRead() { - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(II)Lcs;", - garbageValue = "1805062826" - ) - @Export("getScript") - static Script getScript(int var0) { - Script var1 = (Script)Script.Script_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = Message.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } else { - var1 = WorldMapAreaData.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; - } - } - } + } // L: 79 @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1742384999" + descriptor = "(IS)Liv;", + garbageValue = "15751" ) - public static final void method299() { - ViewportMouse.ViewportMouse_isInViewport = false; - ViewportMouse.ViewportMouse_entityCount = 0; + @Export("WorldMapElement_get") + public static WorldMapElement WorldMapElement_get(int var0) { + return var0 >= 0 && var0 < WorldMapElement.WorldMapElement_cached.length && WorldMapElement.WorldMapElement_cached[var0] != null ? WorldMapElement.WorldMapElement_cached[var0] : new WorldMapElement(var0); // L: 42 43 } - @ObfuscatedName("an") + @ObfuscatedName("eh") @ObfuscatedSignature( - descriptor = "(IB)I", - garbageValue = "50" + descriptor = "(B)Lmx;", + garbageValue = "122" ) - static int method295(int var0) { - return (int)((Math.log((double)var0) / Interpreter.field1126 - 7.0D) * 256.0D); - } - - @ObfuscatedName("hd") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;Ljava/lang/String;IIB)V", - garbageValue = "89" - ) - @Export("menuAction") - static final void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7) { - if (var2 >= 2000) { - var2 -= 2000; - } - - PacketBufferNode var8; - if (var2 == 1) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2294, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5752(var0 + class182.baseX); - var8.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShortLE(AbstractUserComparator.selectedItemWidget); - var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); - var8.packetBuffer.writeShort(LoginScreenAnimation.selectedItemSlot); - var8.packetBuffer.writeShort(WorldMapSectionType.selectedItemId); - var8.packetBuffer.method5753(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 2) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2259, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var0 + class182.baseX); - var8.packetBuffer.method5764(ItemContainer.selectedSpellWidget); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5753(var3); - var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); - var8.packetBuffer.method5753(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var8); - } else if (var2 == 3) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2307, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5753(SecureRandomFuture.baseY + var1); - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var0 + class182.baseX); - var8.packetBuffer.method5898(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 4) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2282, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5898(SecureRandomFuture.baseY + var1); - var8.packetBuffer.method5753(var3); - var8.packetBuffer.method5898(var0 + class182.baseX); - Client.packetWriter.addNode(var8); - } else if (var2 == 5) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2313, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5752(var0 + class182.baseX); - var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - } else if (var2 == 6) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5753(var0 + class182.baseX); - var8.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5898(var3); - var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); - Client.packetWriter.addNode(var8); - } else { - PacketBufferNode var9; - NPC var13; - if (var2 == 7) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2322, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5764(AbstractUserComparator.selectedItemWidget); - var9.packetBuffer.method5752(var3); - var9.packetBuffer.method5753(LoginScreenAnimation.selectedItemSlot); - var9.packetBuffer.method5753(WorldMapSectionType.selectedItemId); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 8) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2295, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeInt(ItemContainer.selectedSpellWidget); - var9.packetBuffer.method5898(var3); - var9.packetBuffer.method5752(Client.selectedSpellChildIndex); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 9) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2274, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5752(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 10) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2251, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 11) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5753(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 12) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2317, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5898(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 13) { - var13 = Client.npcs[var3]; - if (var13 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2278, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5753(var3); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else { - Player var15; - if (var2 == 14) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5752(var3); - var9.packetBuffer.method5753(WorldMapSectionType.selectedItemId); - var9.packetBuffer.method5762(AbstractUserComparator.selectedItemWidget); - var9.packetBuffer.method5753(LoginScreenAnimation.selectedItemSlot); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 15) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2327, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5753(Client.selectedSpellChildIndex); - var9.packetBuffer.method5764(ItemContainer.selectedSpellWidget); - var9.packetBuffer.method5898(var3); - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 16) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5898(WorldMapSectionType.selectedItemId); - var8.packetBuffer.method5753(var3); - var8.packetBuffer.method5753(var0 + class182.baseX); - var8.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); - var8.packetBuffer.method5762(AbstractUserComparator.selectedItemWidget); - var8.packetBuffer.writeShort(LoginScreenAnimation.selectedItemSlot); - Client.packetWriter.addNode(var8); - } else if (var2 == 17) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2276, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5753(var0 + class182.baseX); - var8.packetBuffer.method5752(Client.selectedSpellChildIndex); - var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5898(var3); - var8.packetBuffer.writeShortLE(ItemContainer.selectedSpellWidget); - var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); - Client.packetWriter.addNode(var8); - } else if (var2 == 18) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2284, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5753(var0 + class182.baseX); - var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); - var8.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 19) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2280, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5898(var0 + class182.baseX); - var8.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); - var8.packetBuffer.method5752(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 20) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2300, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5752(var3); - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.writeShort(SecureRandomFuture.baseY + var1); - var8.packetBuffer.method5898(var0 + class182.baseX); - Client.packetWriter.addNode(var8); - } else if (var2 == 21) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5898(var0 + class182.baseX); - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5898(SecureRandomFuture.baseY + var1); - var8.packetBuffer.method5753(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 22) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2242, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5837(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var8.packetBuffer.method5752(var0 + class182.baseX); - var8.packetBuffer.method5752(SecureRandomFuture.baseY + var1); - var8.packetBuffer.method5898(var3); - Client.packetWriter.addNode(var8); - } else if (var2 == 23) { - if (Client.isMenuOpen) { - UserComparator3.scene.setViewportWalking(); - } else { - UserComparator3.scene.menuOpen(TileItemPile.Client_plane, var0, var1, true); - } - } else { - PacketBufferNode var10; - Widget var16; - if (var2 == 24) { - var16 = WorldMapSprite.getWidget(var1); - boolean var11 = true; - if (var16.contentType > 0) { - var11 = MilliClock.method3586(var16); - } - - if (var11) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var10); - } - } else { - if (var2 == 25) { - var16 = WorldMapLabelSize.getWidgetChild(var1, var0); - if (var16 != null) { - GrandExchangeOffer.Widget_runOnTargetLeave(); - AttackOption.selectSpell(var1, var0, WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var16)), var16.itemId); - Client.isItemSelected = 0; - Client.selectedSpellActionName = WorldMapAreaData.Widget_getSpellActionName(var16); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - if (var16.isIf3) { - Client.selectedSpellName = var16.dataText + ItemContainer.colorStartTag(16777215); - } else { - Client.selectedSpellName = ItemContainer.colorStartTag(65280) + var16.spellName + ItemContainer.colorStartTag(16777215); - } - } - - return; - } - - if (var2 == 26) { - class217.method4092(); - } else { - int var12; - Widget var14; - if (var2 == 28) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = WorldMapSprite.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var12 = var14.cs1Instructions[0][1]; - Varps.Varps_main[var12] = 1 - Varps.Varps_main[var12]; - changeGameOptions(var12); - } - } else if (var2 == 29) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2263, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - var14 = WorldMapSprite.getWidget(var1); - if (var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) { - var12 = var14.cs1Instructions[0][1]; - if (Varps.Varps_main[var12] != var14.cs1ComparisonValues[0]) { - Varps.Varps_main[var12] = var14.cs1ComparisonValues[0]; - changeGameOptions(var12); - } - } - } else if (var2 == 30) { - if (Client.meslayerContinueWidget == null) { - WorldMapArea.resumePauseWidget(var1, var0); - Client.meslayerContinueWidget = WorldMapLabelSize.getWidgetChild(var1, var0); - class234.invalidateWidget(Client.meslayerContinueWidget); - } - } else if (var2 == 31) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2335, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5753(var3); - var8.packetBuffer.writeInt(AbstractUserComparator.selectedItemWidget); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.method5753(LoginScreenAnimation.selectedItemSlot); - var8.packetBuffer.method5753(WorldMapSectionType.selectedItemId); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 32) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.method5764(ItemContainer.selectedSpellWidget); - var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var8.packetBuffer.method5752(var3); - var8.packetBuffer.method5764(var1); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 33) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2248, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5753(var3); - var8.packetBuffer.method5764(var1); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 34) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2315, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var1); - var8.packetBuffer.method5898(var0); - var8.packetBuffer.method5752(var3); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 35) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2319, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5762(var1); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.method5898(var3); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 36) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2334, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeShortLE(var1); - var8.packetBuffer.method5752(var0); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 37) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2328, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5753(var3); - var8.packetBuffer.writeShort(var0); - var8.packetBuffer.writeInt(var1); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else { - if (var2 == 38) { - GrandExchangeOffer.Widget_runOnTargetLeave(); - var16 = WorldMapSprite.getWidget(var1); - Client.isItemSelected = 1; - LoginScreenAnimation.selectedItemSlot = var0; - AbstractUserComparator.selectedItemWidget = var1; - WorldMapSectionType.selectedItemId = var3; - class234.invalidateWidget(var16); - Client.selectedItemName = ItemContainer.colorStartTag(16748608) + KitDefinition.ItemDefinition_get(var3).name + ItemContainer.colorStartTag(16777215); - if (Client.selectedItemName == null) { - Client.selectedItemName = "null"; - } - - return; - } - - if (var2 == 39) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2305, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShortLE(var1); - var8.packetBuffer.method5753(var3); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 40) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2344, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeShort(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5898(var0); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 41) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2293, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5898(var3); - var8.packetBuffer.method5753(var0); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 42) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2308, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5753(var3); - var8.packetBuffer.writeShort(var0); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 43) { - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2252, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5752(var3); - var8.packetBuffer.writeInt(var1); - var8.packetBuffer.method5898(var0); - Client.packetWriter.addNode(var8); - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - } else if (var2 == 44) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2271, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 45) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2338, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5752(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 46) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2250, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5752(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 47) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2261, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(var3); - var9.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 48) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 49) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2301, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5752(var3); - var9.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 50) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2337, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.method5753(var3); - Client.packetWriter.addNode(var9); - } - } else if (var2 == 51) { - var15 = Client.players[var3]; - if (var15 != null) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2287, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - var9.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var9); - } - } else { - label788: { - if (var2 != 57) { - if (var2 == 58) { - var16 = WorldMapLabelSize.getWidgetChild(var1, var0); - if (var16 != null) { - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2281, Client.packetWriter.isaacCipher); - var9.packetBuffer.writeShort(Client.selectedSpellChildIndex); - var9.packetBuffer.method5752(var0); - var9.packetBuffer.method5764(var1); - var9.packetBuffer.writeShortLE(ItemContainer.selectedSpellWidget); - var9.packetBuffer.method5753(var16.itemId); - var9.packetBuffer.method5752(Client.field830); - Client.packetWriter.addNode(var9); - } - break label788; - } - - if (var2 == 1001) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - Client.destinationX = var0; - Client.destinationY = var1; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2340, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5752(var3); - var8.packetBuffer.method5753(SecureRandomFuture.baseY + var1); - var8.packetBuffer.writeShort(var0 + class182.baseX); - var8.packetBuffer.writeIntME(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); - Client.packetWriter.addNode(var8); - break label788; - } - - if (var2 == 1002) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2302, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5753(var3); - Client.packetWriter.addNode(var8); - break label788; - } - - if (var2 == 1003) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var13 = Client.npcs[var3]; - if (var13 != null) { - NPCDefinition var17 = var13.definition; - if (var17.transforms != null) { - var17 = var17.transform(); - } - - if (var17 != null) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2267, Client.packetWriter.isaacCipher); - var10.packetBuffer.method5753(var17.id); - Client.packetWriter.addNode(var10); - } - } - break label788; - } - - if (var2 == 1004) { - Client.mouseCrossX = var6; - Client.mouseCrossY = var7; - Client.mouseCrossColor = 2; - Client.mouseCrossState = 0; - var8 = UserComparator4.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); - var8.packetBuffer.method5753(var3); - Client.packetWriter.addNode(var8); - break label788; - } - - if (var2 == 1005) { - var16 = WorldMapSprite.getWidget(var1); - if (var16 != null && var16.itemQuantities[var0] >= 100000) { - ObjectSound.addGameMessage(27, "", var16.itemQuantities[var0] + " x " + KitDefinition.ItemDefinition_get(var3).name); - } else { - var9 = UserComparator4.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); - var9.packetBuffer.method5753(var3); - Client.packetWriter.addNode(var9); - } - - Client.field808 = 0; - class194.field2356 = WorldMapSprite.getWidget(var1); - Client.field668 = var0; - break label788; - } - - if (var2 != 1007) { - if (var2 == 1008 || var2 == 1010 || var2 == 1009 || var2 == 1011 || var2 == 1012) { - class228.worldMap.worldMapMenuAction(var2, var3, new Coord(var0), new Coord(var1)); - } - break label788; - } - } - - var16 = WorldMapLabelSize.getWidgetChild(var1, var0); - if (var16 != null) { - class247.widgetDefaultMenuAction(var3, var1, var0, var16.itemId, var5); - } - } - } - } - } - } - } - } - } - - if (Client.isItemSelected != 0) { - Client.isItemSelected = 0; - class234.invalidateWidget(WorldMapSprite.getWidget(AbstractUserComparator.selectedItemWidget)); - } - - if (Client.isSpellSelected) { - GrandExchangeOffer.Widget_runOnTargetLeave(); - } - - if (class194.field2356 != null && Client.field808 == 0) { - class234.invalidateWidget(class194.field2356); - } - - } - - @ObfuscatedName("ju") - @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-2103133941" - ) - @Export("changeGameOptions") - static final void changeGameOptions(int var0) { - Buffer.method5950(); - Projectile.method2247(); - int var1 = class219.VarpDefinition_get(var0).type; - if (var1 != 0) { - int var2 = Varps.Varps_main[var0]; - if (var1 == 1) { - if (var2 == 1) { - Rasterizer3D.Rasterizer3D_setBrightness(0.9D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D); - } - - if (var2 == 2) { - Rasterizer3D.Rasterizer3D_setBrightness(0.8D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D); - } - - if (var2 == 3) { - Rasterizer3D.Rasterizer3D_setBrightness(0.7D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D); - } - - if (var2 == 4) { - Rasterizer3D.Rasterizer3D_setBrightness(0.6D); - ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D); - } - - MouseRecorder.method1251(); - } - - if (var1 == 3) { - short var3 = 0; - if (var2 == 0) { - var3 = 255; - } - - if (var2 == 1) { - var3 = 192; - } - - if (var2 == 2) { - var3 = 128; - } - - if (var2 == 3) { - var3 = 64; - } - - if (var2 == 4) { - var3 = 0; - } - - if (var3 != Client.musicVolume) { - if (Client.musicVolume == 0 && Client.currentTrackGroupId != -1) { - UserComparator9.method3513(UserComparator7.archive6, Client.currentTrackGroupId, 0, var3, false); - Client.field743 = false; - } else if (var3 == 0) { - class89.method2161(); - Client.field743 = false; - } else if (class206.field2439 != 0) { - class206.musicTrackVolume = var3; - } else { - WorldMapSprite.midiPcmStream.setPcmStreamVolume(var3); - } - - Client.musicVolume = var3; - } - } - - if (var1 == 4) { - if (var2 == 0) { - Client.soundEffectVolume = 127; - } - - if (var2 == 1) { - Client.soundEffectVolume = 96; - } - - if (var2 == 2) { - Client.soundEffectVolume = 64; - } - - if (var2 == 3) { - Client.soundEffectVolume = 32; - } - - if (var2 == 4) { - Client.soundEffectVolume = 0; - } - } - - if (var1 == 5) { - Client.leftClickOpensMenu = var2; - } - - if (var1 == 6) { - Client.chatEffects = var2; - } - - if (var1 == 9) { - Client.field838 = var2; - } - - if (var1 == 10) { - if (var2 == 0) { - Client.areaSoundEffectVolume = 127; - } - - if (var2 == 1) { - Client.areaSoundEffectVolume = 96; - } - - if (var2 == 2) { - Client.areaSoundEffectVolume = 64; - } - - if (var2 == 3) { - Client.areaSoundEffectVolume = 32; - } - - if (var2 == 4) { - Client.areaSoundEffectVolume = 0; - } - } - - if (var1 == 17) { - Client.followerIndex = var2 & 65535; - } - - AttackOption[] var4; - if (var1 == 18) { - var4 = new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels}; - Client.playerAttackOption = (AttackOption)FaceNormal.findEnumerated(var4, var2); - if (Client.playerAttackOption == null) { - Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - if (var1 == 19) { - if (var2 == -1) { - Client.combatTargetPlayerIndex = -1; - } else { - Client.combatTargetPlayerIndex = var2 & 2047; - } - } - - if (var1 == 22) { - var4 = new AttackOption[]{AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_dependsOnCombatLevels}; - Client.npcAttackOption = (AttackOption)FaceNormal.findEnumerated(var4, var2); - if (Client.npcAttackOption == null) { - Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels; - } - } - - } + @Export("getWorldMap") + static WorldMap getWorldMap() { + return Message.worldMap; // L: 665 } } diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index d841fc93df..82c5445019 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -1,87 +1,94 @@ +import java.util.Date; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("av") +@ObfuscatedName("as") @Implements("WorldMapSection1") public class WorldMapSection1 implements WorldMapSection { - @ObfuscatedName("lg") + @ObfuscatedName("sy") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lc;" ) - @Export("mousedOverWidgetIf1") - static Widget mousedOverWidgetIf1; - @ObfuscatedName("m") + @Export("grandExchangeEvents") + static GrandExchangeEvents grandExchangeEvents; + @ObfuscatedName("dm") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive7") + static Archive archive7; + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 421699515 + intValue = -2060258139 ) @Export("minPlane") int minPlane; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -758111591 + intValue = -1398963829 ) @Export("planes") int planes; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -796724619 + intValue = 682976363 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 843613977 + intValue = 38335685 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 670440885 + intValue = 1282107961 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 374420035 + intValue = -167107483 ) @Export("regionEndY") int regionEndY; WorldMapSection1() { - } + } // L: 14 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lad;I)V", - garbageValue = "411670415" + descriptor = "(Lar;B)V", + garbageValue = "100" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.regionEndX) { + if (var1.regionLowX > this.regionEndX) { // L: 17 var1.regionLowX = this.regionEndX; } if (var1.regionHighX < this.regionEndX) { - var1.regionHighX = this.regionEndX; + var1.regionHighX = this.regionEndX; // L: 18 } - if (var1.regionLowY > this.regionEndY) { + if (var1.regionLowY > this.regionEndY) { // L: 19 var1.regionLowY = this.regionEndY; } - if (var1.regionHighY < this.regionEndY) { + if (var1.regionHighY < this.regionEndY) { // L: 20 var1.regionHighY = this.regionEndY; } - } + } // L: 21 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "2" + descriptor = "(IIII)Z", + garbageValue = "-339896458" ) @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { @@ -92,119 +99,704 @@ public class WorldMapSection1 implements WorldMapSection { } } - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "48" + descriptor = "(III)Z", + garbageValue = "-2135820245" ) @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >> 6 == this.regionEndX && var2 >> 6 == this.regionEndY; } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(IIII)[I", - garbageValue = "459340529" + garbageValue = "-1761492451" ) @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; } else { - int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; - return var4; + int[] var4 = new int[]{var2 + (this.regionEndX * 64 - this.regionStartX * 64), var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; // L: 39 40 + return var4; // L: 41 } } - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedSignature( descriptor = "(III)Lhg;", - garbageValue = "1240901536" + garbageValue = "-1553504587" ) @Export("coord") public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; + if (!this.containsPosition(var1, var2)) { // L: 45 + return null; // L: 46 } else { - int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; - int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); - return new Coord(this.minPlane, var3, var4); + int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; // L: 48 + int var4 = var2 + (this.regionStartY * 64 - this.regionEndY * 64); // L: 49 + return new Coord(this.minPlane, var3, var4); // L: 50 } } - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "0" + descriptor = "(Lkf;I)V", + garbageValue = "2144381737" ) @Export("read") public void read(Buffer var1) { - this.minPlane = var1.readUnsignedByte(); - this.planes = var1.readUnsignedByte(); - this.regionStartX = var1.readUnsignedShort(); - this.regionStartY = var1.readUnsignedShort(); - this.regionEndX = var1.readUnsignedShort(); - this.regionEndY = var1.readUnsignedShort(); - this.postRead(); + this.minPlane = var1.readUnsignedByte(); // L: 54 + this.planes = var1.readUnsignedByte(); // L: 55 + this.regionStartX = var1.readUnsignedShort(); // L: 56 + this.regionStartY = var1.readUnsignedShort(); // L: 57 + this.regionEndX = var1.readUnsignedShort(); // L: 58 + this.regionEndY = var1.readUnsignedShort(); // L: 59 + this.postRead(); // L: 60 + } // L: 61 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1994421574" + ) + @Export("postRead") + void postRead() { + } // L: 63 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "1982002808" + ) + @Export("getVarbit") + public static int getVarbit(int var0) { + VarbitDefinition var1 = TaskHandler.method3567(var0); // L: 24 + int var2 = var1.baseVar; // L: 25 + int var3 = var1.startBit; // L: 26 + int var4 = var1.endBit; // L: 27 + int var5 = Varps.Varps_masks[var4 - var3]; // L: 28 + return Varps.Varps_main[var2] >> var3 & var5; // L: 29 + } + + @ObfuscatedName("z") + public static String method650(long var0) { + Calendar.Calendar_calendar.setTime(new Date(var0)); // L: 30 + int var2 = Calendar.Calendar_calendar.get(7); // L: 31 + int var3 = Calendar.Calendar_calendar.get(5); // L: 32 + int var4 = Calendar.Calendar_calendar.get(2); // L: 33 + int var5 = Calendar.Calendar_calendar.get(1); // L: 34 + int var6 = Calendar.Calendar_calendar.get(11); // L: 35 + int var7 = Calendar.Calendar_calendar.get(12); // L: 36 + int var8 = Calendar.Calendar_calendar.get(13); // L: 37 + return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT"; // L: 38 } @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-123" + descriptor = "(I)V", + garbageValue = "1996016917" ) - @Export("postRead") - void postRead() { - } + static final void method649() { + Object var10000 = null; // L: 126 + String var0 = "You can't add yourself to your own friend list"; + WorldMapRectangle.addGameMessage(30, "", var0); // L: 128 + } // L: 130 - @ObfuscatedName("m") + @ObfuscatedName("iq") @ObfuscatedSignature( - descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "-1968156146" + descriptor = "(Lhq;IIIIIIB)V", + garbageValue = "21" ) - public static void method656(AbstractArchive var0, String var1, String var2, int var3, boolean var4) { - int var5 = var0.getGroupId(var1); - int var6 = var0.getFileId(var5, var2); - UserComparator9.method3513(var0, var5, var6, var3, var4); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IZIZI)V", - garbageValue = "1727413002" - ) - @Export("sortWorldList") - static void sortWorldList(int var0, boolean var1, int var2, boolean var3) { - if (class13.World_worlds != null) { - Tiles.doWorldSorting(0, class13.World_worlds.length - 1, var0, var1, var2, var3); + static final void method648(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) { + if (Client.field743) { // L: 9277 + Client.alternativeScrollbarWidth = 32; + } else { + Client.alternativeScrollbarWidth = 0; // L: 9278 } - } + Client.field743 = false; // L: 9279 + int var7; + if (MouseHandler.MouseHandler_currentButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_currentButton == 4) { // L: 9280 + if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) { // L: 9281 + var0.scrollY -= 4; // L: 9282 + class52.invalidateWidget(var0); // L: 9283 + } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) { // L: 9285 + var0.scrollY += 4; // L: 9286 + class52.invalidateWidget(var0); // L: 9287 + } else if (var5 >= var1 - Client.alternativeScrollbarWidth && var5 < Client.alternativeScrollbarWidth + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) { // L: 9289 + var7 = var3 * (var3 - 32) / var4; // L: 9290 + if (var7 < 8) { // L: 9291 + var7 = 8; + } - @ObfuscatedName("k") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "-1443767280" - ) - static final void method655(String var0) { - StringBuilder var10000 = (new StringBuilder()).append(var0); - Object var10001 = null; - String var1 = var10000.append(" is already on your ignore list").toString(); - ObjectSound.addGameMessage(30, "", var1); - } + int var8 = var6 - var2 - 16 - var7 / 2; // L: 9292 + int var9 = var3 - 32 - var7; // L: 9293 + var0.scrollY = var8 * (var4 - var3) / var9; // L: 9294 + class52.invalidateWidget(var0); // L: 9295 + Client.field743 = true; // L: 9296 + } + } - @ObfuscatedName("jt") + if (Client.mouseWheelRotation != 0) { // L: 9299 + var7 = var0.width; // L: 9300 + if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) { // L: 9301 + var0.scrollY += Client.mouseWheelRotation * 45; // L: 9302 + class52.invalidateWidget(var0); // L: 9303 + } + } + + } // L: 9306 + + @ObfuscatedName("jj") @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "23" + descriptor = "([Lhq;IIIIIIIB)V", + garbageValue = "2" ) - static void method648(int var0) { - class169.tempMenuAction = new MenuAction(); - class169.tempMenuAction.param0 = Client.menuArguments1[var0]; - class169.tempMenuAction.param1 = Client.menuArguments2[var0]; - class169.tempMenuAction.opcode = Client.menuOpcodes[var0]; - class169.tempMenuAction.identifier = Client.menuIdentifiers[var0]; - class169.tempMenuAction.action = Client.menuActions[var0]; - } + @Export("updateInterface") + static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { + for (int var8 = 0; var8 < var0.length; ++var8) { // L: 9649 + Widget var9 = var0[var8]; // L: 9650 + if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || WorldMapIcon_0.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { // L: 9651 9652 9653 + if (var9.isIf3) { // L: 9654 + if (GrandExchangeOfferUnitPriceComparator.isComponentHidden(var9)) { // L: 9655 + continue; + } + } else if (var9.type == 0 && var9 != TriBool.mousedOverWidgetIf1 && GrandExchangeOfferUnitPriceComparator.isComponentHidden(var9)) { // L: 9658 + continue; + } + + int var10 = var9.x + var6; // L: 9660 + int var11 = var7 + var9.y; // L: 9661 + int var12; + int var13; + int var14; + int var15; + int var17; + int var18; + if (var9.type == 2) { // L: 9666 + var12 = var2; // L: 9667 + var13 = var3; // L: 9668 + var14 = var4; // L: 9669 + var15 = var5; // L: 9670 + } else { + int var16; + if (var9.type == 9) { // L: 9672 + var16 = var10; // L: 9673 + var17 = var11; // L: 9674 + var18 = var10 + var9.width; // L: 9675 + int var19 = var11 + var9.height; // L: 9676 + if (var18 < var10) { // L: 9677 + var16 = var18; // L: 9679 + var18 = var10; // L: 9680 + } + + if (var19 < var11) { // L: 9682 + var17 = var19; // L: 9684 + var19 = var11; // L: 9685 + } + + ++var18; // L: 9687 + ++var19; // L: 9688 + var12 = var16 > var2 ? var16 : var2; // L: 9689 + var13 = var17 > var3 ? var17 : var3; // L: 9690 + var14 = var18 < var4 ? var18 : var4; // L: 9691 + var15 = var19 < var5 ? var19 : var5; // L: 9692 + } else { + var16 = var10 + var9.width; // L: 9695 + var17 = var11 + var9.height; // L: 9696 + var12 = var10 > var2 ? var10 : var2; // L: 9697 + var13 = var11 > var3 ? var11 : var3; // L: 9698 + var14 = var16 < var4 ? var16 : var4; // L: 9699 + var15 = var17 < var5 ? var17 : var5; // L: 9700 + } + } + + if (var9 == Client.clickedWidget) { // L: 9702 + Client.field880 = true; // L: 9703 + Client.field859 = var10; // L: 9704 + Client.field795 = var11; // L: 9705 + } + + boolean var32 = false; // L: 9707 + if (var9.field2676) { // L: 9708 + switch(Client.field865) { // L: 9709 + case 0: + var32 = true; // L: 9721 + case 1: + default: + break; + case 2: + if (Client.field840 == var9.id >>> 16) { // L: 9716 + var32 = true; // L: 9717 + } + break; + case 3: + if (var9.id == Client.field840) { // L: 9711 + var32 = true; // L: 9712 + } + } + } + + if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { // L: 9725 + if (var9.isIf3) { // L: 9726 + ScriptEvent var26; + if (var9.noClickThrough) { // L: 9727 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 9728 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 9729 + if (var26.isMouseInputEvent) { // L: 9730 + var26.remove(); // L: 9731 + var26.widget.containsMouse = false; // L: 9732 + } + } + + if (BoundaryObject.widgetDragDuration == 0) { // L: 9735 + Client.clickedWidget = null; // L: 9736 + Client.clickedWidgetParent = null; // L: 9737 + } + + if (!Client.isMenuOpen) { // L: 9739 + WorldMapAreaData.addCancelMenuEntry(); // L: 9740 + } + } + } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 9744 9745 + for (var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 9746 + if (var26.isMouseInputEvent && var26.widget.onScroll == var26.args) { // L: 9747 + var26.remove(); // L: 9748 + } + } + } + } + + var17 = MouseHandler.MouseHandler_x; // L: 9754 + var18 = MouseHandler.MouseHandler_y; // L: 9755 + if (MouseHandler.MouseHandler_lastButton != 0) { // L: 9756 + var17 = MouseHandler.MouseHandler_lastPressedX; // L: 9757 + var18 = MouseHandler.MouseHandler_lastPressedY; // L: 9758 + } + + boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15; // L: 9760 + if (var9.contentType == 1337) { // L: 9761 + if (!Client.isLoading && !Client.isMenuOpen && var33) { // L: 9762 + JagexCache.addSceneMenuOptions(var17, var18, var12, var13); + } + } else if (var9.contentType == 1338) { // L: 9765 + GrandExchangeEvent.checkIfMinimapClicked(var9, var10, var11); // L: 9766 + } else { + if (var9.contentType == 1400) { // L: 9769 + Message.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); // L: 9770 + } + + if (!Client.isMenuOpen && var33) { // L: 9772 + if (var9.contentType == 1400) { // L: 9773 + Message.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var17, var18); // L: 9774 + } else { + class1.Widget_addToMenu(var9, var17 - var10, var18 - var11); // L: 9777 + } + } + + boolean var21; + int var23; + if (var32) { // L: 9780 + for (int var20 = 0; var20 < var9.field2626.length; ++var20) { // L: 9781 + var21 = false; // L: 9782 + boolean var27 = false; // L: 9783 + if (!var21 && var9.field2626[var20] != null) { // L: 9784 + for (var23 = 0; var23 < var9.field2626[var20].length; ++var23) { // L: 9785 + boolean var24 = false; // L: 9786 + if (var9.field2661 != null) { // L: 9787 + var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2626[var20][var23]]; // L: 9788 + } + + if (Buddy.method5277(var9.field2626[var20][var23]) || var24) { // L: 9790 + var21 = true; // L: 9791 + if (var9.field2661 != null && var9.field2661[var20] > Client.cycle) { // L: 9792 + break; + } + + byte var31 = var9.field2719[var20][var23]; // L: 9793 + if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { // L: 9794 9795 9796 9797 9798 + var27 = true; // L: 9800 + break; + } + } + } + } + + if (var27) { // L: 9806 + if (var20 < 10) { // L: 9807 + UserComparator8.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); + } else if (var20 == 10) { // L: 9808 + class22.Widget_runOnTargetLeave(); // L: 9809 + User.selectSpell(var9.id, var9.childIndex, GrandExchangeOfferTotalQuantityComparator.Widget_unpackTargetMask(WorldMapIcon_0.getWidgetFlags(var9)), var9.itemId); // L: 9810 + Client.selectedSpellActionName = SpriteMask.Widget_getSpellActionName(var9); // L: 9811 + if (Client.selectedSpellActionName == null) { // L: 9812 + Client.selectedSpellActionName = "null"; + } + + Client.selectedSpellName = var9.dataText + WorldMapAreaData.colorStartTag(16777215); // L: 9813 + } + + var23 = var9.field2682[var20]; // L: 9815 + if (var9.field2661 == null) { // L: 9816 + var9.field2661 = new int[var9.field2626.length]; + } + + if (var9.field2683 == null) { // L: 9817 + var9.field2683 = new int[var9.field2626.length]; + } + + if (var23 != 0) { // L: 9818 + if (var9.field2661[var20] == 0) { // L: 9819 + var9.field2661[var20] = var23 + Client.cycle + var9.field2683[var20]; + } else { + var9.field2661[var20] = var23 + Client.cycle; // L: 9820 + } + } else { + var9.field2661[var20] = Integer.MAX_VALUE; // L: 9822 + } + } + + if (!var21 && var9.field2661 != null) { // L: 9824 9825 + var9.field2661[var20] = 0; + } + } + } + + if (var9.isIf3) { // L: 9829 + if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 9830 + var33 = true; + } else { + var33 = false; // L: 9831 + } + + boolean var34 = false; // L: 9832 + if ((MouseHandler.MouseHandler_currentButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { // L: 9833 + var34 = true; + } + + var21 = false; // L: 9834 + if ((MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { // L: 9835 + var21 = true; + } + + if (var21) { // L: 9836 + class13.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); + } + + if (var9.contentType == 1400) { // L: 9837 + Message.worldMap.method6430(var17, var18, var33 & var34, var33 & var21); // L: 9838 + } + + if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && Archive.method4386(WorldMapIcon_0.getWidgetFlags(var9))) { // L: 9840 + Client.draggedOnWidget = var9; + } + + if (var9 == Client.clickedWidgetParent) { // L: 9841 + Client.field799 = true; // L: 9842 + Client.field856 = var10; // L: 9843 + Client.field785 = var11; // L: 9844 + } + + if (var9.hasListener) { // L: 9846 + ScriptEvent var22; + if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { // L: 9847 + var22 = new ScriptEvent(); // L: 9848 + var22.isMouseInputEvent = true; // L: 9849 + var22.widget = var9; // L: 9850 + var22.mouseY = Client.mouseWheelRotation; // L: 9851 + var22.args = var9.onScroll; // L: 9852 + Client.scriptEvents.addFirst(var22); // L: 9853 + } + + if (Client.clickedWidget != null || BuddyRankComparator.dragInventoryWidget != null || Client.isMenuOpen) { // L: 9855 + var21 = false; // L: 9856 + var34 = false; // L: 9857 + var33 = false; // L: 9858 + } + + if (!var9.isClicked && var21) { // L: 9860 + var9.isClicked = true; // L: 9861 + if (var9.onClick != null) { // L: 9862 + var22 = new ScriptEvent(); // L: 9863 + var22.isMouseInputEvent = true; // L: 9864 + var22.widget = var9; // L: 9865 + var22.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; // L: 9866 + var22.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; // L: 9867 + var22.args = var9.onClick; // L: 9868 + Client.scriptEvents.addFirst(var22); // L: 9869 + } + } + + if (var9.isClicked && var34 && var9.onClickRepeat != null) { // L: 9872 9873 + var22 = new ScriptEvent(); // L: 9874 + var22.isMouseInputEvent = true; // L: 9875 + var22.widget = var9; // L: 9876 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9877 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9878 + var22.args = var9.onClickRepeat; // L: 9879 + Client.scriptEvents.addFirst(var22); // L: 9880 + } + + if (var9.isClicked && !var34) { // L: 9883 + var9.isClicked = false; // L: 9884 + if (var9.onRelease != null) { // L: 9885 + var22 = new ScriptEvent(); // L: 9886 + var22.isMouseInputEvent = true; // L: 9887 + var22.widget = var9; // L: 9888 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9889 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9890 + var22.args = var9.onRelease; // L: 9891 + Client.field912.addFirst(var22); // L: 9892 + } + } + + if (var34 && var9.onHold != null) { // L: 9895 9896 + var22 = new ScriptEvent(); // L: 9897 + var22.isMouseInputEvent = true; // L: 9898 + var22.widget = var9; // L: 9899 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9900 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9901 + var22.args = var9.onHold; // L: 9902 + Client.scriptEvents.addFirst(var22); // L: 9903 + } + + if (!var9.containsMouse && var33) { // L: 9906 + var9.containsMouse = true; // L: 9907 + if (var9.onMouseOver != null) { // L: 9908 + var22 = new ScriptEvent(); // L: 9909 + var22.isMouseInputEvent = true; // L: 9910 + var22.widget = var9; // L: 9911 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9912 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9913 + var22.args = var9.onMouseOver; // L: 9914 + Client.scriptEvents.addFirst(var22); // L: 9915 + } + } + + if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { // L: 9918 9919 + var22 = new ScriptEvent(); // L: 9920 + var22.isMouseInputEvent = true; // L: 9921 + var22.widget = var9; // L: 9922 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9923 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9924 + var22.args = var9.onMouseRepeat; // L: 9925 + Client.scriptEvents.addFirst(var22); // L: 9926 + } + + if (var9.containsMouse && !var33) { // L: 9929 + var9.containsMouse = false; // L: 9930 + if (var9.onMouseLeave != null) { // L: 9931 + var22 = new ScriptEvent(); // L: 9932 + var22.isMouseInputEvent = true; // L: 9933 + var22.widget = var9; // L: 9934 + var22.mouseX = MouseHandler.MouseHandler_x - var10; // L: 9935 + var22.mouseY = MouseHandler.MouseHandler_y - var11; // L: 9936 + var22.args = var9.onMouseLeave; // L: 9937 + Client.field912.addFirst(var22); // L: 9938 + } + } + + if (var9.onTimer != null) { // L: 9941 + var22 = new ScriptEvent(); // L: 9942 + var22.widget = var9; // L: 9943 + var22.args = var9.onTimer; // L: 9944 + Client.field877.addFirst(var22); // L: 9945 + } + + ScriptEvent var25; + int var35; + int var36; + if (var9.onVarTransmit != null && Client.field864 > var9.field2618) { // L: 9947 + if (var9.varTransmitTriggers != null && Client.field864 - var9.field2618 <= 32) { // L: 9948 + label783: + for (var36 = var9.field2618; var36 < Client.field864; ++var36) { // L: 9955 + var23 = Client.field863[var36 & 31]; // L: 9956 + + for (var35 = 0; var35 < var9.varTransmitTriggers.length; ++var35) { // L: 9957 + if (var23 == var9.varTransmitTriggers[var35]) { // L: 9958 + var25 = new ScriptEvent(); // L: 9959 + var25.widget = var9; // L: 9960 + var25.args = var9.onVarTransmit; // L: 9961 + Client.scriptEvents.addFirst(var25); // L: 9962 + break label783; // L: 9963 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 9949 + var22.widget = var9; // L: 9950 + var22.args = var9.onVarTransmit; // L: 9951 + Client.scriptEvents.addFirst(var22); // L: 9952 + } + + var9.field2618 = Client.field864; // L: 9968 + } + + if (var9.onInvTransmit != null && Client.field903 > var9.field2727) { // L: 9970 + if (var9.invTransmitTriggers != null && Client.field903 - var9.field2727 <= 32) { // L: 9971 + label759: + for (var36 = var9.field2727; var36 < Client.field903; ++var36) { // L: 9978 + var23 = Client.changedItemContainers[var36 & 31]; // L: 9979 + + for (var35 = 0; var35 < var9.invTransmitTriggers.length; ++var35) { // L: 9980 + if (var23 == var9.invTransmitTriggers[var35]) { // L: 9981 + var25 = new ScriptEvent(); // L: 9982 + var25.widget = var9; // L: 9983 + var25.args = var9.onInvTransmit; // L: 9984 + Client.scriptEvents.addFirst(var25); // L: 9985 + break label759; // L: 9986 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 9972 + var22.widget = var9; // L: 9973 + var22.args = var9.onInvTransmit; // L: 9974 + Client.scriptEvents.addFirst(var22); // L: 9975 + } + + var9.field2727 = Client.field903; // L: 9991 + } + + if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2681) { // L: 9993 + if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2681 <= 32) { // L: 9994 + label735: + for (var36 = var9.field2681; var36 < Client.changedSkillsCount; ++var36) { // L: 10001 + var23 = Client.changedSkills[var36 & 31]; // L: 10002 + + for (var35 = 0; var35 < var9.statTransmitTriggers.length; ++var35) { // L: 10003 + if (var23 == var9.statTransmitTriggers[var35]) { // L: 10004 + var25 = new ScriptEvent(); // L: 10005 + var25.widget = var9; // L: 10006 + var25.args = var9.onStatTransmit; // L: 10007 + Client.scriptEvents.addFirst(var25); // L: 10008 + break label735; // L: 10009 + } + } + } + } else { + var22 = new ScriptEvent(); // L: 9995 + var22.widget = var9; // L: 9996 + var22.args = var9.onStatTransmit; // L: 9997 + Client.scriptEvents.addFirst(var22); // L: 9998 + } + + var9.field2681 = Client.changedSkillsCount; // L: 10014 + } + + if (Client.chatCycle > var9.field2664 && var9.onChatTransmit != null) { // L: 10016 + var22 = new ScriptEvent(); // L: 10017 + var22.widget = var9; // L: 10018 + var22.args = var9.onChatTransmit; // L: 10019 + Client.scriptEvents.addFirst(var22); // L: 10020 + } + + if (Client.field870 > var9.field2664 && var9.onFriendTransmit != null) { // L: 10022 + var22 = new ScriptEvent(); // L: 10023 + var22.widget = var9; // L: 10024 + var22.args = var9.onFriendTransmit; // L: 10025 + Client.scriptEvents.addFirst(var22); // L: 10026 + } + + if (Client.field871 > var9.field2664 && var9.onClanTransmit != null) { // L: 10028 + var22 = new ScriptEvent(); // L: 10029 + var22.widget = var9; // L: 10030 + var22.args = var9.onClanTransmit; // L: 10031 + Client.scriptEvents.addFirst(var22); // L: 10032 + } + + if (Client.field872 > var9.field2664 && var9.onStockTransmit != null) { // L: 10034 + var22 = new ScriptEvent(); // L: 10035 + var22.widget = var9; // L: 10036 + var22.args = var9.onStockTransmit; // L: 10037 + Client.scriptEvents.addFirst(var22); // L: 10038 + } + + if (Client.field873 > var9.field2664 && var9.field2722 != null) { // L: 10040 + var22 = new ScriptEvent(); // L: 10041 + var22.widget = var9; // L: 10042 + var22.args = var9.field2722; // L: 10043 + Client.scriptEvents.addFirst(var22); // L: 10044 + } + + if (Client.field775 > var9.field2664 && var9.onMiscTransmit != null) { // L: 10046 + var22 = new ScriptEvent(); // L: 10047 + var22.widget = var9; // L: 10048 + var22.args = var9.onMiscTransmit; // L: 10049 + Client.scriptEvents.addFirst(var22); // L: 10050 + } + + var9.field2664 = Client.cycleCntr; // L: 10052 + if (var9.onKey != null) { // L: 10053 + for (var36 = 0; var36 < Client.field898; ++var36) { // L: 10054 + ScriptEvent var30 = new ScriptEvent(); // L: 10055 + var30.widget = var9; // L: 10056 + var30.keyTyped = Client.field900[var36]; // L: 10057 + var30.keyPressed = Client.field899[var36]; // L: 10058 + var30.args = var9.onKey; // L: 10059 + Client.scriptEvents.addFirst(var30); // L: 10060 + } + } + } + } + + if (!var9.isIf3) { // L: 10065 + if (Client.clickedWidget != null || BuddyRankComparator.dragInventoryWidget != null || Client.isMenuOpen) { // L: 10066 + continue; + } + + if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10067 + if (var9.mouseOverRedirect >= 0) { // L: 10068 + TriBool.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; + } else { + TriBool.mousedOverWidgetIf1 = var9; // L: 10069 + } + } + + if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { // L: 10071 + Occluder.field1950 = var9; // L: 10072 + } + + if (var9.scrollHeight > var9.height) { // L: 10074 + method648(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); + } + } + + if (var9.type == 0) { // L: 10076 + updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); // L: 10077 + if (var9.children != null) { // L: 10078 + updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); + } + + InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); // L: 10079 + if (var28 != null) { // L: 10080 + if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { // L: 10081 + for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { // L: 10082 + if (var29.isMouseInputEvent) { // L: 10083 + var29.remove(); // L: 10084 + var29.widget.containsMouse = false; // L: 10085 + } + } + + if (BoundaryObject.widgetDragDuration == 0) { // L: 10088 + Client.clickedWidget = null; // L: 10089 + Client.clickedWidgetParent = null; // L: 10090 + } + + if (!Client.isMenuOpen) { // L: 10092 + WorldMapAreaData.addCancelMenuEntry(); // L: 10093 + } + } + + GameObject.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); // L: 10096 + } + } + } + } + } + } + + } // L: 10100 } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index e59fceb9b3..21deebf804 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -4,197 +4,246 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("am") +@ObfuscatedName("au") @Implements("WorldMapSection2") public class WorldMapSection2 implements WorldMapSection { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 2038842267 + intValue = -1201238509 ) @Export("minPlane") int minPlane; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = -469390903 + intValue = -1333374059 ) @Export("planes") int planes; - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -1406202611 + intValue = -1475797575 ) @Export("regionStartX") int regionStartX; - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedGetter( - intValue = 1926246543 + intValue = 905621997 ) @Export("regionStartY") int regionStartY; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -950715137 + intValue = -1367224805 ) @Export("regionEndX") int regionEndX; - @ObfuscatedName("g") + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1777420965 + intValue = -359238835 ) @Export("regionEndY") int regionEndY; - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = 1453055839 - ) - int field221; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = 83876345 - ) - int field215; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -798390703 - ) - int field223; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = -69028415 + intValue = 994649457 ) int field224; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = -287102607 + ) + int field223; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -64559715 + ) + int field228; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1728764959 + ) + int field225; WorldMapSection2() { - } + } // L: 18 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lad;I)V", - garbageValue = "411670415" + descriptor = "(Lar;B)V", + garbageValue = "100" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field221) { - var1.regionLowX = this.field221; + if (var1.regionLowX > this.field224) { // L: 21 + var1.regionLowX = this.field224; } - if (var1.regionHighX < this.field223) { - var1.regionHighX = this.field223; + if (var1.regionHighX < this.field228) { + var1.regionHighX = this.field228; // L: 22 } - if (var1.regionLowY > this.field215) { - var1.regionLowY = this.field215; + if (var1.regionLowY > this.field223) { // L: 23 + var1.regionLowY = this.field223; } - if (var1.regionHighY < this.field224) { - var1.regionHighY = this.field224; + if (var1.regionHighY < this.field225) { // L: 24 + var1.regionHighY = this.field225; } + } // L: 25 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIII)Z", + garbageValue = "-339896458" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { // L: 28 + return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 31 + } else { + return false; // L: 29 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-2135820245" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >> 6 >= this.field224 && var1 >> 6 <= this.field228 && var2 >> 6 >= this.field223 && var2 >> 6 <= this.field225; // L: 35 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "-1761492451" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { // L: 39 + return null; + } else { + int[] var4 = new int[]{var2 + (this.field224 * 64 - this.regionStartX * 64), var3 + (this.field223 * 64 - this.regionStartY * 64)}; // L: 42 43 44 + return var4; // L: 45 + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(III)Lhg;", + garbageValue = "-1553504587" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 49 + return null; // L: 50 + } else { + int var3 = this.regionStartX * 64 - this.field224 * 64 + var1; // L: 52 + int var4 = var2 + (this.regionStartY * 64 - this.field223 * 64); // L: 53 + return new Coord(this.minPlane, var3, var4); // L: 54 + } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "2" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { - return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; - } else { - return false; - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "48" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >> 6 >= this.field221 && var1 >> 6 <= this.field223 && var2 >> 6 >= this.field215 && var2 >> 6 <= this.field224; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "459340529" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; - } else { - int[] var4 = new int[]{var2 + (this.field221 * 64 - this.regionStartX * 64), var3 + (this.field215 * 64 - this.regionStartY * 64)}; - return var4; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)Lhg;", - garbageValue = "1240901536" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } else { - int var3 = this.regionStartX * 64 - this.field221 * 64 + var1; - int var4 = var2 + (this.regionStartY * 64 - this.field215 * 64); - return new Coord(this.minPlane, var3, var4); - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "0" + descriptor = "(Lkf;I)V", + garbageValue = "2144381737" ) @Export("read") public void read(Buffer var1) { - this.minPlane = var1.readUnsignedByte(); - this.planes = var1.readUnsignedByte(); - this.regionStartX = var1.readUnsignedShort(); - this.regionStartY = var1.readUnsignedShort(); - this.regionEndX = var1.readUnsignedShort(); - this.regionEndY = var1.readUnsignedShort(); - this.field221 = var1.readUnsignedShort(); - this.field215 = var1.readUnsignedShort(); - this.field223 = var1.readUnsignedShort(); - this.field224 = var1.readUnsignedShort(); - this.postRead(); - } + this.minPlane = var1.readUnsignedByte(); // L: 58 + this.planes = var1.readUnsignedByte(); // L: 59 + this.regionStartX = var1.readUnsignedShort(); // L: 60 + this.regionStartY = var1.readUnsignedShort(); // L: 61 + this.regionEndX = var1.readUnsignedShort(); // L: 62 + this.regionEndY = var1.readUnsignedShort(); // L: 63 + this.field224 = var1.readUnsignedShort(); // L: 64 + this.field223 = var1.readUnsignedShort(); // L: 65 + this.field228 = var1.readUnsignedShort(); // L: 66 + this.field225 = var1.readUnsignedShort(); // L: 67 + this.postRead(); // L: 68 + } // L: 69 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(S)V", - garbageValue = "4206" + descriptor = "(I)V", + garbageValue = "240000675" ) @Export("postRead") void postRead() { + } // L: 71 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IB)Lbk;", + garbageValue = "1" + ) + @Export("Messages_getMessage") + static Message Messages_getMessage(int var0) { + return (Message)Messages.Messages_hashTable.get((long)var0); // L: 40 } - @ObfuscatedName("m") + @ObfuscatedName("ff") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-2012901203" + descriptor = "(Ljava/lang/String;I)V", + garbageValue = "835345001" ) - @Export("getEntityCountUnderMouse") - public static int getEntityCountUnderMouse() { - return ViewportMouse.ViewportMouse_entityCount; - } + @Export("doCheat") + static final void doCheat(String var0) { + if (var0.equalsIgnoreCase("toggleroof")) { // L: 3424 + Tile.clientPreferences.roofsHidden = !Tile.clientPreferences.roofsHidden; // L: 3425 + WorldMapData_1.savePreferences(); // L: 3426 + if (Tile.clientPreferences.roofsHidden) { // L: 3427 + WorldMapRectangle.addGameMessage(99, "", "Roofs are now all hidden"); + } else { + WorldMapRectangle.addGameMessage(99, "", "Roofs will only be removed selectively"); // L: 3428 + } + } - @ObfuscatedName("d") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "926990190" - ) - static void method398() { - Login.worldSelectOpen = false; - Login.leftTitleSprite.drawAt(Login.xPadding, 0); - ItemContainer.rightTitleSprite.drawAt(Login.xPadding + 382, 0); - Login.logoSprite.drawAt(Login.xPadding + 382 - Login.logoSprite.subWidth / 2, 18); - } + if (var0.equalsIgnoreCase("displayfps")) { // L: 3430 + Client.displayFps = !Client.displayFps; + } + + if (var0.equalsIgnoreCase("renderself")) { // L: 3431 + Client.renderSelf = !Client.renderSelf; + } + + if (var0.equalsIgnoreCase("mouseovertext")) { // L: 3432 + Client.showMouseOverText = !Client.showMouseOverText; + } + + if (Client.staffModLevel >= 2) { // L: 3433 + if (var0.equalsIgnoreCase("errortest")) { // L: 3434 + throw new RuntimeException(); + } + + if (var0.equalsIgnoreCase("showcoord")) { // L: 3435 + Message.worldMap.showCoord = !Message.worldMap.showCoord; + } + + if (var0.equalsIgnoreCase("fpson")) { // L: 3436 + Client.displayFps = true; + } + + if (var0.equalsIgnoreCase("fpsoff")) { // L: 3437 + Client.displayFps = false; + } + + if (var0.equalsIgnoreCase("gc")) { // L: 3438 + System.gc(); + } + + if (var0.equalsIgnoreCase("clientdrop")) { // L: 3439 + ArchiveLoader.method1208(); + } + } + + PacketBufferNode var1 = Client.getPacketBufferNode(ClientPacket.field2296, Client.packetWriter.isaacCipher); // L: 3442 + var1.packetBuffer.writeByte(var0.length() + 1); // L: 3443 + var1.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 3444 + Client.packetWriter.addNode(var1); // L: 3445 + } // L: 3446 } diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java index 0f91c12291..3cc0d2c9c9 100644 --- a/runescape-client/src/main/java/WorldMapSection3.java +++ b/runescape-client/src/main/java/WorldMapSection3.java @@ -1,337 +1,171 @@ -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("aj") +@ObfuscatedName("ac") @Implements("WorldMapSection3") public class WorldMapSection3 implements WorldMapSection { - @ObfuscatedName("s") - @ObfuscatedSignature( - descriptor = "Lau;" - ) - @Export("worldMapEvent") - static WorldMapEvent worldMapEvent; - @ObfuscatedName("hv") - @ObfuscatedGetter( - intValue = -862489875 - ) - @Export("cameraY") - static int cameraY; - @ObfuscatedName("m") - @ObfuscatedGetter( - intValue = 1213021705 - ) - int field391; - @ObfuscatedName("o") - @ObfuscatedGetter( - intValue = -54957495 - ) - int field379; - @ObfuscatedName("q") - @ObfuscatedGetter( - intValue = -1592783569 - ) - int field383; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 370580043 - ) - int field381; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -461171823 - ) - int field382; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = -238437965 - ) - int field380; - @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -344073573 - ) - int field384; - @ObfuscatedName("u") - @ObfuscatedGetter( - intValue = -290440995 - ) - int field385; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = -1800160845 - ) - int field386; @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 1694202633 + intValue = 1540857287 + ) + int field391; + @ObfuscatedName("k") + @ObfuscatedGetter( + intValue = -1117083463 + ) + int field381; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = -186376071 + ) + int field382; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = -1787934953 + ) + int field392; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = 1247077539 + ) + int field384; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = -134643499 + ) + int field385; + @ObfuscatedName("x") + @ObfuscatedGetter( + intValue = 1837481963 + ) + int field389; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1861989631 ) int field387; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 185317539 + ) + int field380; + @ObfuscatedName("m") + @ObfuscatedGetter( + intValue = -1881120603 + ) + int field386; WorldMapSection3() { - } + } // L: 18 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lad;I)V", - garbageValue = "411670415" + descriptor = "(Lar;B)V", + garbageValue = "100" ) @Export("expandBounds") public void expandBounds(WorldMapArea var1) { - if (var1.regionLowX > this.field382) { - var1.regionLowX = this.field382; + if (var1.regionLowX > this.field384) { // L: 21 + var1.regionLowX = this.field384; } - if (var1.regionHighX < this.field382) { - var1.regionHighX = this.field382; + if (var1.regionHighX < this.field384) { + var1.regionHighX = this.field384; // L: 22 } - if (var1.regionLowY > this.field380) { - var1.regionLowY = this.field380; + if (var1.regionLowY > this.field385) { // L: 23 + var1.regionLowY = this.field385; } - if (var1.regionHighY < this.field380) { - var1.regionHighY = this.field380; + if (var1.regionHighY < this.field385) { // L: 24 + var1.regionHighY = this.field385; } + } // L: 25 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(IIII)Z", + garbageValue = "-339896458" + ) + @Export("containsCoord") + public boolean containsCoord(int var1, int var2, int var3) { + if (var1 >= this.field391 && var1 < this.field381 + this.field391) { // L: 28 + return var2 >= (this.field382 << 6) + (this.field389 << 3) && var2 <= (this.field382 << 6) + (this.field389 << 3) + 7 && var3 >= (this.field392 << 6) + (this.field387 << 3) && var3 <= (this.field392 << 6) + (this.field387 << 3) + 7; // L: 31 + } else { + return false; // L: 29 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(III)Z", + garbageValue = "-2135820245" + ) + @Export("containsPosition") + public boolean containsPosition(int var1, int var2) { + return var1 >= (this.field384 << 6) + (this.field380 << 3) && var1 <= (this.field384 << 6) + (this.field380 << 3) + 7 && var2 >= (this.field385 << 6) + (this.field386 << 3) && var2 <= (this.field385 << 6) + (this.field386 << 3) + 7; // L: 35 + } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIII)[I", + garbageValue = "-1761492451" + ) + @Export("getBorderTileLengths") + public int[] getBorderTileLengths(int var1, int var2, int var3) { + if (!this.containsCoord(var1, var2, var3)) { // L: 39 + return null; // L: 40 + } else { + int[] var4 = new int[]{var2 + (this.field384 * 64 - this.field382 * 64) + (this.field380 * 8 - this.field389 * 8), var3 + (this.field385 * 64 - this.field392 * 64) + (this.field386 * 8 - this.field387 * 8)}; // L: 42 43 44 + return var4; // L: 45 + } + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(III)Lhg;", + garbageValue = "-1553504587" + ) + @Export("coord") + public Coord coord(int var1, int var2) { + if (!this.containsPosition(var1, var2)) { // L: 49 + return null; // L: 50 + } else { + int var3 = this.field382 * 64 - this.field384 * 64 + (this.field389 * 8 - this.field380 * 8) + var1; // L: 52 + int var4 = var2 + (this.field392 * 64 - this.field385 * 64) + (this.field387 * 8 - this.field386 * 8); // L: 53 + return new Coord(this.field391, var3, var4); // L: 54 + } } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IIIB)Z", - garbageValue = "2" - ) - @Export("containsCoord") - public boolean containsCoord(int var1, int var2, int var3) { - if (var1 >= this.field391 && var1 < this.field379 + this.field391) { - return var2 >= (this.field383 << 6) + (this.field384 << 3) && var2 <= (this.field383 << 6) + (this.field384 << 3) + 7 && var3 >= (this.field381 << 6) + (this.field385 << 3) && var3 <= (this.field381 << 6) + (this.field385 << 3) + 7; - } else { - return false; - } - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIB)Z", - garbageValue = "48" - ) - @Export("containsPosition") - public boolean containsPosition(int var1, int var2) { - return var1 >= (this.field382 << 6) + (this.field386 << 3) && var1 <= (this.field382 << 6) + (this.field386 << 3) + 7 && var2 >= (this.field380 << 6) + (this.field387 << 3) && var2 <= (this.field380 << 6) + (this.field387 << 3) + 7; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIII)[I", - garbageValue = "459340529" - ) - @Export("getBorderTileLengths") - public int[] getBorderTileLengths(int var1, int var2, int var3) { - if (!this.containsCoord(var1, var2, var3)) { - return null; - } else { - int[] var4 = new int[]{var2 + (this.field382 * 64 - this.field383 * 64) + (this.field386 * 8 - this.field384 * 8), var3 + (this.field380 * 64 - this.field381 * 64) + (this.field387 * 8 - this.field385 * 8)}; - return var4; - } - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)Lhg;", - garbageValue = "1240901536" - ) - @Export("coord") - public Coord coord(int var1, int var2) { - if (!this.containsPosition(var1, var2)) { - return null; - } else { - int var3 = this.field383 * 64 - this.field382 * 64 + (this.field384 * 8 - this.field386 * 8) + var1; - int var4 = var2 + (this.field381 * 64 - this.field380 * 64) + (this.field385 * 8 - this.field387 * 8); - return new Coord(this.field391, var3, var4); - } - } - - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "(Lkn;B)V", - garbageValue = "0" + descriptor = "(Lkf;I)V", + garbageValue = "2144381737" ) @Export("read") public void read(Buffer var1) { - this.field391 = var1.readUnsignedByte(); - this.field379 = var1.readUnsignedByte(); - this.field383 = var1.readUnsignedShort(); - this.field384 = var1.readUnsignedByte(); - this.field381 = var1.readUnsignedShort(); - this.field385 = var1.readUnsignedByte(); - this.field382 = var1.readUnsignedShort(); - this.field386 = var1.readUnsignedByte(); - this.field380 = var1.readUnsignedShort(); - this.field387 = var1.readUnsignedByte(); - this.method842(); - } + this.field391 = var1.readUnsignedByte(); // L: 58 + this.field381 = var1.readUnsignedByte(); // L: 59 + this.field382 = var1.readUnsignedShort(); // L: 60 + this.field389 = var1.readUnsignedByte(); // L: 61 + this.field392 = var1.readUnsignedShort(); // L: 62 + this.field387 = var1.readUnsignedByte(); // L: 63 + this.field384 = var1.readUnsignedShort(); // L: 64 + this.field380 = var1.readUnsignedByte(); // L: 65 + this.field385 = var1.readUnsignedShort(); // L: 66 + this.field386 = var1.readUnsignedByte(); // L: 67 + this.method838(); // L: 68 + } // L: 69 - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1212353754" + garbageValue = "1599277860" ) - void method842() { - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(B)Z", - garbageValue = "26" - ) - @Export("loadWorlds") - static boolean loadWorlds() { - try { - if (VertexNormal.World_request == null) { - VertexNormal.World_request = WorldMapLabelSize.urlRequester.request(new URL(HorizontalAlignment.worldListURL)); - } else if (VertexNormal.World_request.isDone()) { - byte[] var0 = VertexNormal.World_request.getResponse(); - Buffer var1 = new Buffer(var0); - var1.readInt(); - World.World_count = var1.readUnsignedShort(); - class13.World_worlds = new World[World.World_count]; - - World var3; - for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { - var3 = class13.World_worlds[var2] = new World(); - var3.id = var1.readUnsignedShort(); - var3.properties = var1.readInt(); - var3.host = var1.readStringCp1252NullTerminated(); - var3.activity = var1.readStringCp1252NullTerminated(); - var3.location = var1.readUnsignedByte(); - var3.population = var1.readShort(); - } - - GrandExchangeOffer.sortWorlds(class13.World_worlds, 0, class13.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); - VertexNormal.World_request = null; - return true; - } - } catch (Exception var4) { - var4.printStackTrace(); - VertexNormal.World_request = null; - } - - return false; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-672116026" - ) - @Export("iLog") - public static int iLog(int var0) { - int var1 = 0; - if (var0 < 0 || var0 >= 65536) { - var0 >>>= 16; - var1 += 16; - } - - if (var0 >= 256) { - var0 >>>= 8; - var1 += 8; - } - - if (var0 >= 16) { - var0 >>>= 4; - var1 += 4; - } - - if (var0 >= 4) { - var0 >>>= 2; - var1 += 2; - } - - if (var0 >= 1) { - var0 >>>= 1; - ++var1; - } - - return var0 + var1; - } - - @ObfuscatedName("ec") - @ObfuscatedSignature( - descriptor = "(IZZZB)Lig;", - garbageValue = "34" - ) - @Export("newArchive") - static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) { - ArchiveDisk var4 = null; - if (JagexCache.JagexCache_dat2File != null) { - var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, JagexCache.JagexCache_idxFiles[var0], 1000000); - } - - return new Archive(var4, FloorUnderlayDefinition.masterDisk, var0, var1, var2, var3); - } - - @ObfuscatedName("hy") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-32" - ) - static final void method841() { - int var0 = WorldMapRectangle.menuX; - int var1 = Frames.menuY; - int var2 = class69.menuWidth; - int var3 = ApproximateRouteStrategy.menuHeight; - int var4 = 6116423; - Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, var4); - Rasterizer2D.Rasterizer2D_fillRectangle(var0 + 1, var1 + 1, var2 - 2, 16, 0); - Rasterizer2D.Rasterizer2D_drawRectangle(var0 + 1, var1 + 18, var2 - 2, var3 - 19, 0); - GrandExchangeOfferNameComparator.fontBold12.draw("Choose Option", var0 + 3, var1 + 14, var4, -1); - int var5 = MouseHandler.MouseHandler_x; - int var6 = MouseHandler.MouseHandler_y; - - for (int var7 = 0; var7 < Client.menuOptionsCount; ++var7) { - int var8 = (Client.menuOptionsCount - 1 - var7) * 15 + var1 + 31; - int var9 = 16777215; - if (var5 > var0 && var5 < var0 + var2 && var6 > var8 - 13 && var6 < var8 + 3) { - var9 = 16776960; - } - - Font var10 = GrandExchangeOfferNameComparator.fontBold12; - String var11; - if (var7 < 0) { - var11 = ""; - } else if (Client.menuTargets[var7].length() > 0) { - var11 = Client.menuActions[var7] + " " + Client.menuTargets[var7]; - } else { - var11 = Client.menuActions[var7]; - } - - var10.draw(var11, var0 + 3, var8, var9, 0); - } - - WorldMapData_0.method243(WorldMapRectangle.menuX, Frames.menuY, class69.menuWidth, ApproximateRouteStrategy.menuHeight); - } - - @ObfuscatedName("jn") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "32" - ) - @Export("Widget_resetModelFrames") - static final void Widget_resetModelFrames(int var0) { - if (UserComparator4.loadInterface(var0)) { - Widget[] var1 = Widget.Widget_interfaceComponents[var0]; - - for (int var2 = 0; var2 < var1.length; ++var2) { - Widget var3 = var1[var2]; - if (var3 != null) { - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - } - } - - } - } + void method838() { + } // L: 71 } diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index f3312983d5..f3e0a82004 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -7,103 +7,67 @@ import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ae") @Implements("WorldMapSectionType") public enum WorldMapSectionType implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lae;" ) @Export("WORLDMAPSECTIONTYPE0") - WORLDMAPSECTIONTYPE0(3, (byte)0), - @ObfuscatedName("o") + WORLDMAPSECTIONTYPE0(2, (byte)0), + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lae;" ) @Export("WORLDMAPSECTIONTYPE1") - WORLDMAPSECTIONTYPE1(0, (byte)1), - @ObfuscatedName("q") + WORLDMAPSECTIONTYPE1(1, (byte)1), + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "Lae;" ) @Export("WORLDMAPSECTIONTYPE2") - WORLDMAPSECTIONTYPE2(2, (byte)2), - @ObfuscatedName("j") + WORLDMAPSECTIONTYPE2(3, (byte)2), + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "Lae;" ) @Export("WORLDMAPSECTIONTYPE3") - WORLDMAPSECTIONTYPE3(1, (byte)3); + WORLDMAPSECTIONTYPE3(0, (byte)3); - @ObfuscatedName("au") - @Export("client") - @ObfuscatedSignature( - descriptor = "Lclient;" - ) - static Client client; - @ObfuscatedName("ew") + @ObfuscatedName("g") @ObfuscatedGetter( - intValue = 2013764495 + intValue = 872496481 ) - static int field174; - @ObfuscatedName("iz") + static int field178; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -870801305 - ) - @Export("selectedItemId") - static int selectedItemId; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -159728419 + intValue = 750880259 ) @Export("type") final int type; - @ObfuscatedName("g") + @ObfuscatedName("o") @Export("id") final byte id; WorldMapSectionType(int var3, byte var4) { - this.type = var3; - this.id = var4; - } + this.type = var3; // L: 21 + this.id = var4; // L: 22 + } // L: 23 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 26 } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;ZZI)V", - garbageValue = "267980652" + descriptor = "(I)[Lae;", + garbageValue = "278613741" ) - @Export("openURL") - public static void openURL(String var0, boolean var1, boolean var2) { - UrlRequest.method3426(var0, var1, "openjs", var2); - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(ILic;Ljava/lang/String;Ljava/lang/String;IZI)V", - garbageValue = "-2120164920" - ) - public static void method306(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) { - int var6 = var1.getGroupId(var2); - int var7 = var1.getFileId(var6, var3); - MenuAction.playMusicTrack(var0, var1, var6, var7, var4, var5); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-230874976" - ) - public static void method312() { - if (NetCache.NetCache_socket != null) { - NetCache.NetCache_socket.close(); - } - + static WorldMapSectionType[] method327() { + return new WorldMapSectionType[]{WORLDMAPSECTIONTYPE1, WORLDMAPSECTIONTYPE2, WORLDMAPSECTIONTYPE0, WORLDMAPSECTIONTYPE3}; // L: 17 } } diff --git a/runescape-client/src/main/java/WorldMapSprite.java b/runescape-client/src/main/java/WorldMapSprite.java index cb5124c7f6..3b974219fc 100644 --- a/runescape-client/src/main/java/WorldMapSprite.java +++ b/runescape-client/src/main/java/WorldMapSprite.java @@ -1,138 +1,195 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("as") +@ObfuscatedName("at") @Implements("WorldMapSprite") public final class WorldMapSprite { - @ObfuscatedName("j") + @ObfuscatedName("w") + public static short[][] field253; + @ObfuscatedName("av") @ObfuscatedSignature( - descriptor = "Lgw;" + descriptor = "Llw;" ) - @Export("midiPcmStream") - public static MidiPcmStream midiPcmStream; - @ObfuscatedName("aj") - @ObfuscatedGetter( - intValue = -1383908263 - ) - static int field264; - @ObfuscatedName("dt") - @ObfuscatedGetter( - longValue = -1209502997974573813L - ) - static long field261; - @ObfuscatedName("ed") - @ObfuscatedGetter( - intValue = -1316808169 - ) - static int field254; - @ObfuscatedName("mb") - @ObfuscatedGetter( - intValue = 2099345905 - ) - @Export("selectedSpellFlags") - static int selectedSpellFlags; - @ObfuscatedName("o") + @Export("rasterProvider") + public static AbstractRasterProvider rasterProvider; + @ObfuscatedName("k") @Export("tileColors") final int[] tileColors; WorldMapSprite() { - this.tileColors = new int[4096]; - } + this.tileColors = new int[4096]; // L: 11 + } // L: 12 WorldMapSprite(int[] var1) { - this.tileColors = var1; - } + this.tileColors = var1; // L: 15 + } // L: 16 - @ObfuscatedName("m") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(III)I", - garbageValue = "2081761027" + garbageValue = "1945716520" ) @Export("getTileColor") final int getTileColor(int var1, int var2) { - return this.tileColors[var2 * 64 + var1]; + return this.tileColors[var2 * 64 + var1]; // L: 24 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(IB)Lhd;", - garbageValue = "115" + descriptor = "(CI)Z", + garbageValue = "-1682041122" ) - @Export("getWidget") - public static Widget getWidget(int var0) { - int var1 = var0 >> 16; - int var2 = var0 & 65535; - if (Widget.Widget_interfaceComponents[var1] == null || Widget.Widget_interfaceComponents[var1][var2] == null) { - boolean var3 = UserComparator4.loadInterface(var1); - if (!var3) { - return null; + public static final boolean method496(char var0) { + if (Character.isISOControl(var0)) { // L: 28 + return false; + } else if (class204.isAlphaNumeric(var0)) { // L: 29 + return true; + } else { + char[] var1 = class348.field4067; // L: 31 + + int var2; + char var3; + for (var2 = 0; var2 < var1.length; ++var2) { // L: 32 + var3 = var1[var2]; // L: 33 + if (var0 == var3) { // L: 34 + return true; + } + } + + var1 = class348.field4065; // L: 38 + + for (var2 = 0; var2 < var1.length; ++var2) { // L: 39 + var3 = var1[var2]; // L: 40 + if (var0 == var3) { + return true; // L: 41 + } + } + + return false; // L: 44 + } + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IS)Z", + garbageValue = "20454" + ) + @Export("loadInterface") + public static boolean loadInterface(int var0) { + if (Bounds.Widget_loadedInterfaces[var0]) { // L: 203 + return true; + } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { // L: 204 + return false; + } else { + int var1 = Widget.Widget_archive.getGroupFileCount(var0); // L: 205 + if (var1 == 0) { // L: 206 + Bounds.Widget_loadedInterfaces[var0] = true; // L: 207 + return true; // L: 208 + } else { + if (Widget.Widget_interfaceComponents[var0] == null) { // L: 210 + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + } + + for (int var2 = 0; var2 < var1; ++var2) { // L: 211 + if (Widget.Widget_interfaceComponents[var0][var2] == null) { // L: 212 + byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); // L: 213 + if (var3 != null) { // L: 214 + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); // L: 215 + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); // L: 216 + if (var3[0] == -1) { // L: 217 + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); // L: 218 + } + } + } + } + + Bounds.Widget_loadedInterfaces[var0] = true; // L: 222 + return true; // L: 223 + } + } + } + + @ObfuscatedName("hz") + @ObfuscatedSignature( + descriptor = "(III)V", + garbageValue = "-2072659501" + ) + static void method493(int var0, int var1) { + int var2 = class4.fontBold12.stringWidth("Choose Option"); // L: 7209 + + int var3; + for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) { // L: 7210 + Font var7 = class4.fontBold12; // L: 7211 + String var8; + if (var3 < 0) { // L: 7214 + var8 = ""; // L: 7215 + } else if (Client.menuTargets[var3].length() > 0) { // L: 7218 + var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3]; + } else { + var8 = Client.menuActions[var3]; // L: 7219 + } + + int var6 = var7.stringWidth(var8); // L: 7221 + if (var6 > var2) { // L: 7222 + var2 = var6; } } - return Widget.Widget_interfaceComponents[var1][var2]; - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "2146534283" - ) - @Export("itemContainerSetItem") - static void itemContainerSetItem(int var0, int var1, int var2, int var3) { - ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); - if (var4 == null) { - var4 = new ItemContainer(); - ItemContainer.itemContainers.put(var4, (long)var0); + var2 += 8; // L: 7224 + var3 = Client.menuOptionsCount * 15 + 22; // L: 7225 + int var4 = var0 - var2 / 2; // L: 7226 + if (var2 + var4 > FloorDecoration.canvasWidth) { // L: 7227 + var4 = FloorDecoration.canvasWidth - var2; } - if (var4.ids.length <= var1) { - int[] var5 = new int[var1 + 1]; - int[] var6 = new int[var1 + 1]; - - int var7; - for (var7 = 0; var7 < var4.ids.length; ++var7) { - var5[var7] = var4.ids[var7]; - var6[var7] = var4.quantities[var7]; - } - - for (var7 = var4.ids.length; var7 < var1; ++var7) { - var5[var7] = -1; - var6[var7] = 0; - } - - var4.ids = var5; - var4.quantities = var6; + if (var4 < 0) { // L: 7228 + var4 = 0; } - var4.ids[var1] = var2; - var4.quantities[var1] = var3; - } - - @ObfuscatedName("ep") - @ObfuscatedSignature( - descriptor = "(Lig;Ljava/lang/String;I)V", - garbageValue = "2099603799" - ) - static void method481(Archive var0, String var1) { - ArchiveLoader var2 = new ArchiveLoader(var0, var1); - Client.archiveLoaders.add(var2); - Client.field945 += var2.groupCount; - } - - @ObfuscatedName("jk") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1835863543" - ) - @Export("FriendSystem_invalidateIgnoreds") - static final void FriendSystem_invalidateIgnoreds() { - TilePaint.method3188(); - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.invalidateIgnoreds(); + int var5 = var1; // L: 7229 + if (var3 + var1 > GameShell.canvasHeight) { // L: 7230 + var5 = GameShell.canvasHeight - var3; } + if (var5 < 0) { // L: 7231 + var5 = 0; + } + + ChatChannel.menuX = var4; // L: 7232 + Client.menuY = var5; // L: 7233 + DevicePcmPlayerProvider.menuWidth = var2; // L: 7234 + WorldMapManager.menuHeight = Client.menuOptionsCount * 15 + 22; // L: 7235 + } // L: 7236 + + @ObfuscatedName("jw") + @ObfuscatedSignature( + descriptor = "(IIIB)Lbq;", + garbageValue = "-81" + ) + static final InterfaceParent method494(int var0, int var1, int var2) { + InterfaceParent var3 = new InterfaceParent(); // L: 10486 + var3.group = var1; // L: 10487 + var3.type = var2; // L: 10488 + Client.interfaceParents.put(var3, (long)var0); // L: 10489 + PacketWriter.Widget_resetModelFrames(var1); // L: 10490 + Widget var4 = TileItem.getWidget(var0); // L: 10491 + class52.invalidateWidget(var4); // L: 10492 + if (Client.meslayerContinueWidget != null) { // L: 10493 + class52.invalidateWidget(Client.meslayerContinueWidget); // L: 10494 + Client.meslayerContinueWidget = null; // L: 10495 + } + + class2.method24(); // L: 10497 + class4.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false); // L: 10498 + class235.runWidgetOnLoadListener(var1); // L: 10499 + if (Client.rootInterface != -1) { // L: 10500 + ClientPacket.runIntfCloseListeners(Client.rootInterface, 1); + } + + return var3; // L: 10501 } } diff --git a/runescape-client/src/main/java/Wrapper.java b/runescape-client/src/main/java/Wrapper.java index bb740ac4fb..1eb17a84fc 100644 --- a/runescape-client/src/main/java/Wrapper.java +++ b/runescape-client/src/main/java/Wrapper.java @@ -2,22 +2,22 @@ import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fi") +@ObfuscatedName("fx") @Implements("Wrapper") public abstract class Wrapper extends DualNode { - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("size") final int size; Wrapper(int var1) { - this.size = var1; - } + this.size = var1; // L: 9 + } // L: 10 - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("get") abstract Object get(); - @ObfuscatedName("o") + @ObfuscatedName("k") @Export("isSoft") abstract boolean isSoft(); } diff --git a/runescape-client/src/main/java/class0.java b/runescape-client/src/main/java/class0.java index 3dadadc0d9..fc28a2018f 100644 --- a/runescape-client/src/main/java/class0.java +++ b/runescape-client/src/main/java/class0.java @@ -1,19 +1,19 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("m") +@ObfuscatedName("z") public interface class0 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkn;B)V", - garbageValue = "0" + descriptor = "(Ljava/lang/Object;Lkf;B)V", + garbageValue = "21" ) - void vmethod59(Object var1, Buffer var2); + void vmethod70(Object var1, Buffer var2); - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;B)Ljava/lang/Object;", - garbageValue = "114" + descriptor = "(Lkf;I)Ljava/lang/Object;", + garbageValue = "-453860591" ) - Object vmethod47(Buffer var1); + Object vmethod61(Buffer var1); } diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java index 1f7607d7e3..535ec07cfa 100644 --- a/runescape-client/src/main/java/class1.java +++ b/runescape-client/src/main/java/class1.java @@ -1,521 +1,306 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("o") +@ObfuscatedName("k") final class class1 implements class0 { - @ObfuscatedName("go") - @Export("regionMapArchives") - static byte[][] regionMapArchives; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "Lic;" + ) + @Export("FloorOverlayDefinition_archive") + public static AbstractArchive FloorOverlayDefinition_archive; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Ldy;" + ) + @Export("soundSystem") + static SoundSystem soundSystem; + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lkf;B)V", + garbageValue = "21" + ) + public void vmethod70(Object var1, Buffer var2) { + this.method10((Integer)var1, var2); // L: 20 + } // L: 21 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lkf;I)Ljava/lang/Object;", + garbageValue = "-453860591" + ) + public Object vmethod61(Buffer var1) { + return var1.readInt(); // L: 16 + } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkn;B)V", - garbageValue = "0" + descriptor = "(Ljava/lang/Integer;Lkf;I)V", + garbageValue = "-1705916618" ) - public void vmethod59(Object var1, Buffer var2) { - this.method8((Integer)var1, var2); - } + void method10(Integer var1, Buffer var2) { + var2.writeInt(var1); // L: 12 + } // L: 13 - @ObfuscatedName("o") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Lkn;B)Ljava/lang/Object;", - garbageValue = "114" + descriptor = "(ILcy;ZI)I", + garbageValue = "-1453115535" ) - public Object vmethod47(Buffer var1) { - return var1.readInt(); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Integer;Lkn;I)V", - garbageValue = "554078910" - ) - void method8(Integer var1, Buffer var2) { - var2.writeInt(var1); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lmr;" - ) - @Export("newRunException") - public static RunException newRunException(Throwable var0, String var1) { - RunException var2; - if (var0 instanceof RunException) { - var2 = (RunException)var0; - var2.message = var2.message + ' ' + var1; + static int method22(int var0, Script var1, boolean var2) { + Widget var3; + if (var0 >= 2000) { // L: 732 + var0 -= 1000; // L: 733 + var3 = TileItem.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 734 } else { - var2 = new RunException(var0, var1); + var3 = var2 ? Canvas.field438 : class3.field12; // L: 736 } - return var2; + class52.invalidateWidget(var3); // L: 737 + if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { // L: 738 + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { // L: 758 + var3.modelType = 2; // L: 759 + var3.modelId = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 760 + return 1; // L: 761 + } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { // L: 763 + var3.modelType = 3; // L: 764 + var3.modelId = WorldMapLabelSize.localPlayer.appearance.getChatHeadId(); // L: 765 + return 1; // L: 766 + } else { + return 2; // L: 768 + } + } else { + Interpreter.Interpreter_intStackSize -= 2; // L: 739 + int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 740 + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 741 + var3.itemId = var4; // L: 742 + var3.itemQuantity = var5; // L: 743 + ItemDefinition var6 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var4); // L: 744 + var3.modelAngleX = var6.xan2d; // L: 745 + var3.modelAngleY = var6.yan2d; // L: 746 + var3.modelAngleZ = var6.zan2d; // L: 747 + var3.modelOffsetX = var6.offsetX2d; // L: 748 + var3.modelOffsetY = var6.offsetY2d; // L: 749 + var3.modelZoom = var6.zoom2d; // L: 750 + if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) { + var3.itemQuantityMode = 0; // L: 751 + } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | var6.isStackable == 1) { // L: 752 + var3.itemQuantityMode = 1; + } else { + var3.itemQuantityMode = 2; // L: 753 + } + + if (var3.field2728 > 0) { // L: 754 + var3.modelZoom = var3.modelZoom * 32 / var3.field2728; + } else if (var3.rawWidth > 0) { // L: 755 + var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth; + } + + return 1; // L: 756 + } } - @ObfuscatedName("j") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-345681310" + descriptor = "(CI)Z", + garbageValue = "2143002774" ) - static void method16(int var0, int var1, int var2, int var3) { - for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { - int var5 = 0; - if (var1 > var4.field1103) { - var5 += var1 - var4.field1103; - } else if (var1 < var4.x) { - var5 += var4.x - var1; - } - - if (var2 > var4.field1104) { - var5 += var2 - var4.field1104; - } else if (var2 < var4.y) { - var5 += var4.y - var2; - } - - if (var5 - 64 <= var4.field1105 && Client.areaSoundEffectVolume != 0 && var0 == var4.plane) { - var5 -= 64; - if (var5 < 0) { - var5 = 0; - } - - int var6 = (var4.field1105 - var5) * Client.areaSoundEffectVolume / var4.field1105; - if (var4.stream1 == null) { - if (var4.soundEffectId >= 0) { - SoundEffect var7 = SoundEffect.readSoundEffect(GrandExchangeOffer.archive4, var4.soundEffectId, 0); - if (var7 != null) { - RawSound var8 = var7.toRawSound().resample(class197.decimator); - RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); - var9.setNumLoops(-1); - class60.pcmStreamMixer.addSubStream(var9); - var4.stream1 = var9; - } - } - } else { - var4.stream1.method2677(var6); - } - - if (var4.stream2 == null) { - if (var4.soundEffectIds != null && (var4.field1111 -= var3) <= 0) { - int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); - SoundEffect var12 = SoundEffect.readSoundEffect(GrandExchangeOffer.archive4, var4.soundEffectIds[var11], 0); - if (var12 != null) { - RawSound var13 = var12.toRawSound().resample(class197.decimator); - RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); - var10.setNumLoops(0); - class60.pcmStreamMixer.addSubStream(var10); - var4.stream2 = var10; - var4.field1111 = var4.field1108 + (int)(Math.random() * (double)(var4.field1115 - var4.field1108)); - } - } - } else { - var4.stream2.method2677(var6); - if (!var4.stream2.hasNext()) { - var4.stream2 = null; - } - } - } else { - if (var4.stream1 != null) { - class60.pcmStreamMixer.removeSubStream(var4.stream1); - var4.stream1 = null; - } - - if (var4.stream2 != null) { - class60.pcmStreamMixer.removeSubStream(var4.stream2); - var4.stream2 = null; - } - } - } - } - + @Export("isDigit") + public static boolean isDigit(char var0) { + return var0 >= '0' && var0 <= '9'; // L: 146 } - @ObfuscatedName("j") + @ObfuscatedName("ie") @ObfuscatedSignature( - descriptor = "(CLgz;I)I", - garbageValue = "393583355" + descriptor = "(Lhq;III)V", + garbageValue = "362928511" ) - @Export("lowercaseChar") - static int lowercaseChar(char var0, Language var1) { - int var2 = var0 << 4; - if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { - var0 = Character.toLowerCase(var0); - var2 = (var0 << 4) + 1; + @Export("Widget_addToMenu") + static final void Widget_addToMenu(Widget var0, int var1, int var2) { + if (var0.buttonType == 1) { // L: 9454 + StructDefinition.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id); // L: 9455 } - if (var0 == 241 && var1 == Language.Language_ES) { - var2 = 1762; + String var3; + if (var0.buttonType == 2 && !Client.isSpellSelected) { // L: 9458 + var3 = SpriteMask.Widget_getSpellActionName(var0); // L: 9459 + if (var3 != null) { // L: 9460 + StructDefinition.insertMenuItemNoShift(var3, WorldMapAreaData.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id); // L: 9461 + } } - return var2; - } - - @ObfuscatedName("y") - @ObfuscatedSignature( - descriptor = "(B)I", - garbageValue = "25" - ) - static final int method17() { - return ViewportMouse.ViewportMouse_x; - } - - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "(Lhd;III)V", - garbageValue = "45098661" - ) - @Export("checkIfMinimapClicked") - static final void checkIfMinimapClicked(Widget var0, int var1, int var2) { - if (Client.minimapState == 0 || Client.minimapState == 3) { - if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) { - SpriteMask var3 = var0.getSpriteMask(true); - if (var3 == null) { - return; - } - - int var4 = MouseHandler.MouseHandler_lastPressedX - var1; - int var5 = MouseHandler.MouseHandler_lastPressedY - var2; - if (var3.contains(var4, var5)) { - var4 -= var3.width / 2; - var5 -= var3.height / 2; - int var6 = Client.camAngleY & 2047; - int var7 = Rasterizer3D.Rasterizer3D_sine[var6]; - int var8 = Rasterizer3D.Rasterizer3D_cosine[var6]; - int var9 = var8 * var4 + var7 * var5 >> 11; - int var10 = var8 * var5 - var7 * var4 >> 11; - int var11 = var9 + class60.localPlayer.x >> 7; - int var12 = class60.localPlayer.y - var10 >> 7; - PacketBufferNode var13 = UserComparator4.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher); - var13.packetBuffer.writeByte(18); - var13.packetBuffer.writeShort(var12 + SecureRandomFuture.baseY); - var13.packetBuffer.writeShort(var11 + class182.baseX); - var13.packetBuffer.method5744(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0); - var13.packetBuffer.writeByte(var4); - var13.packetBuffer.writeByte(var5); - var13.packetBuffer.writeShort(Client.camAngleY); - var13.packetBuffer.writeByte(57); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(0); - var13.packetBuffer.writeByte(89); - var13.packetBuffer.writeShort(class60.localPlayer.x); - var13.packetBuffer.writeShort(class60.localPlayer.y); - var13.packetBuffer.writeByte(63); - Client.packetWriter.addNode(var13); - Client.destinationX = var11; - Client.destinationY = var12; - } - } - + if (var0.buttonType == 3) { // L: 9465 + StructDefinition.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id); // L: 9466 } - } - @ObfuscatedName("hm") - @ObfuscatedSignature( - descriptor = "(IIIIIIII)V", - garbageValue = "1438850851" - ) - @Export("addPendingSpawnToScene") - static final void addPendingSpawnToScene(int var0, int var1, int var2, int var3, int var4, int var5, int var6) { - if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) { - if (Client.isLowDetail && var0 != TileItemPile.Client_plane) { - return; - } + if (var0.buttonType == 4) { // L: 9469 + StructDefinition.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id); // L: 9470 + } - long var7 = 0L; - boolean var9 = true; - boolean var10 = false; - boolean var11 = false; - if (var1 == 0) { - var7 = UserComparator3.scene.getBoundaryObjectTag(var0, var2, var3); - } + if (var0.buttonType == 5) { // L: 9473 + StructDefinition.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id); // L: 9474 + } - if (var1 == 1) { - var7 = UserComparator3.scene.getWallDecorationTag(var0, var2, var3); - } + if (var0.buttonType == 6 && Client.meslayerContinueWidget == null) { // L: 9477 + StructDefinition.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id); // L: 9478 + } - if (var1 == 2) { - var7 = UserComparator3.scene.getGameObjectTag(var0, var2, var3); - } + int var4; + int var19; + if (var0.type == 2) { // L: 9481 + var19 = 0; // L: 9482 - if (var1 == 3) { - var7 = UserComparator3.scene.getFloorDecorationTag(var0, var2, var3); - } - - int var12; - if (var7 != 0L) { - var12 = UserComparator3.scene.getObjectFlags(var0, var2, var3, var7); - int var39 = Language.Entity_unpackID(var7); - int var40 = var12 & 31; - int var41 = var12 >> 6 & 3; - ObjectDefinition var13; - if (var1 == 0) { - UserComparator3.scene.removeBoundaryObject(var0, var2, var3); - var13 = Canvas.getObjectDefinition(var39); - if (var13.interactType != 0) { - Client.collisionMaps[var0].method3702(var2, var3, var40, var41, var13.boolean1); - } - } - - if (var1 == 1) { - UserComparator3.scene.removeWallDecoration(var0, var2, var3); - } - - if (var1 == 2) { - UserComparator3.scene.removeGameObject(var0, var2, var3); - var13 = Canvas.getObjectDefinition(var39); - if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) { - return; + for (var4 = 0; var4 < var0.height; ++var4) { // L: 9483 + for (int var21 = 0; var21 < var0.width; ++var21) { // L: 9484 + int var6 = (var0.paddingX + 32) * var21; // L: 9485 + int var7 = (var0.paddingY + 32) * var4; // L: 9486 + if (var19 < 20) { // L: 9487 + var6 += var0.inventoryXOffsets[var19]; // L: 9488 + var7 += var0.inventoryYOffsets[var19]; // L: 9489 } - if (var13.interactType != 0) { - Client.collisionMaps[var0].setFlagOffNonSquare(var2, var3, var13.sizeX, var13.sizeY, var41, var13.boolean1); - } - } - - if (var1 == 3) { - UserComparator3.scene.removeFloorDecoration(var0, var2, var3); - var13 = Canvas.getObjectDefinition(var39); - if (var13.interactType == 1) { - Client.collisionMaps[var0].method3689(var2, var3); - } - } - } - - if (var4 >= 0) { - var12 = var0; - if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) { - var12 = var0 + 1; - } - - Scene var42 = UserComparator3.scene; - CollisionMap var14 = Client.collisionMaps[var0]; - ObjectDefinition var15 = Canvas.getObjectDefinition(var4); - int var16; - int var17; - if (var5 != 1 && var5 != 3) { - var16 = var15.sizeX; - var17 = var15.sizeY; - } else { - var16 = var15.sizeY; - var17 = var15.sizeX; - } - - int var18; - int var19; - if (var16 + var2 <= 104) { - var18 = (var16 >> 1) + var2; - var19 = var2 + (var16 + 1 >> 1); - } else { - var18 = var2; - var19 = var2 + 1; - } - - int var20; - int var21; - if (var3 + var17 <= 104) { - var20 = var3 + (var17 >> 1); - var21 = var3 + (var17 + 1 >> 1); - } else { - var20 = var3; - var21 = var3 + 1; - } - - int[][] var22 = Tiles.Tiles_heights[var12]; - int var23 = var22[var18][var21] + var22[var18][var20] + var22[var19][var20] + var22[var19][var21] >> 2; - int var24 = (var2 << 7) + (var16 << 6); - int var25 = (var3 << 7) + (var17 << 6); - long var26 = class206.calculateTag(var2, var3, 2, var15.int1 == 0, var4); - int var28 = (var5 << 6) + var6; - if (var15.int3 == 1) { - var28 += 256; - } - - Object var29; - if (var6 == 22) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(22, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28); - if (var15.interactType == 1) { - var14.setBlockedByFloorDec(var2, var3); - } - } else if (var6 != 10 && var6 != 11) { - if (var6 >= 12) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.method3356(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); - if (var15.interactType != 0) { - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 0) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(0, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field527[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3680(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 1) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(1, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field528[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3680(var2, var3, var6, var5, var15.boolean1); - } - } else { - int var35; - if (var6 == 2) { - var35 = var5 + 1 & 3; - Object var30; - Object var31; - if (var15.animationId == -1 && var15.transforms == null) { - var30 = var15.getModel(2, var5 + 4, var22, var24, var23, var25); - var31 = var15.getModel(2, var35, var22, var24, var23, var25); - } else { - var30 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - var31 = new DynamicObject(var4, 2, var35, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var30, (Entity)var31, Tiles.field527[var5], Tiles.field527[var35], var26, var28); - if (var15.interactType != 0) { - var14.method3680(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 3) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(3, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field528[var5], 0, var26, var28); - if (var15.interactType != 0) { - var14.method3680(var2, var3, var6, var5, var15.boolean1); - } - } else if (var6 == 9) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(var6, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.method3356(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28); - if (var15.interactType != 0) { - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } - } else if (var6 == 4) { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field527[var5], 0, 0, 0, var26, var28); - } else { - Object var32; - long var36; - if (var6 == 5) { - var35 = 16; - var36 = var42.getBoundaryObjectTag(var0, var2, var3); - if (var36 != 0L) { - var35 = Canvas.getObjectDefinition(Language.Entity_unpackID(var36)).int2; + if (var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) { // L: 9491 + Client.dragItemSlotDestination = var19; // L: 9492 + VerticalAlignment.hoveredItemContainer = var0; // L: 9493 + if (var0.itemIds[var19] > 0) { // L: 9494 + label313: { + ItemDefinition var8 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var0.itemIds[var19] - 1); // L: 9495 + boolean var9; + int var10; + if (Client.isItemSelected == 1) { // L: 9497 + var10 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9499 + var9 = (var10 >> 30 & 1) != 0; // L: 9501 + if (var9) { // L: 9503 + if (var0.id != class105.selectedItemWidget || var19 != GrandExchangeOfferUnitPriceComparator.selectedItemSlot) { // L: 9504 + StructDefinition.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16748608) + var8.name, 31, var8.id, var19, var0.id); // L: 9505 + } + break label313; + } } - if (var15.animationId == -1 && var15.transforms == null) { - var32 = var15.getModel(4, var5, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null); + if (Client.isSpellSelected) { // L: 9512 + var10 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9514 + var9 = (var10 >> 30 & 1) != 0; // L: 9516 + if (var9) { // L: 9518 + if ((UserComparator8.selectedSpellFlags & 16) == 16) { // L: 9519 + StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + WorldMapAreaData.colorStartTag(16748608) + var8.name, 32, var8.id, var19, var0.id); // L: 9520 + } + break label313; + } } - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.field527[var5], 0, var35 * Tiles.field523[var5], var35 * Tiles.field529[var5], var26, var28); - } else if (var6 == 6) { - var35 = 8; - var36 = var42.getBoundaryObjectTag(var0, var2, var3); - if (var36 != 0L) { - var35 = Canvas.getObjectDefinition(Language.Entity_unpackID(var36)).int2 / 2; + String[] var22 = var8.inventoryActions; // L: 9526 + var10 = -1; // L: 9527 + if (Client.shiftClickDrop && SoundSystem.shouldPrioritizeDrop()) { // L: 9528 + var10 = var8.getShiftClickIndex(); // L: 9529 } - if (var15.animationId == -1 && var15.transforms == null) { - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + int var12 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9532 + boolean var11 = (var12 >> 30 & 1) != 0; // L: 9534 + if (var11) { // L: 9536 + for (int var13 = 4; var13 >= 3; --var13) { // L: 9537 + if (var13 != var10) { // L: 9538 + class247.addWidgetItemMenuItem(var0, var8, var19, var13, false); // L: 9539 + } + } } - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var35 * Tiles.field531[var5], var35 * Tiles.field533[var5], var26, var28); - } else if (var6 == 7) { - int var38 = var5 + 2 & 3; - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(4, var38 + 4, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 4, var38 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + int var14 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9543 + boolean var23 = (var14 >> 31 & 1) != 0; // L: 9545 + if (var23) { // L: 9547 + StructDefinition.insertMenuItemNoShift("Use", WorldMapAreaData.colorStartTag(16748608) + var8.name, 38, var8.id, var19, var0.id); // L: 9548 } - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var38, 0, 0, var26, var28); - } else if (var6 == 8) { - var35 = 8; - var36 = var42.getBoundaryObjectTag(var0, var2, var3); - if (var36 != 0L) { - var35 = Canvas.getObjectDefinition(Language.Entity_unpackID(var36)).int2 / 2; + int var16 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9552 + boolean var15 = (var16 >> 30 & 1) != 0; // L: 9554 + int var17; + if (var15) { // L: 9556 + for (var17 = 2; var17 >= 0; --var17) { // L: 9557 + if (var17 != var10) { // L: 9558 + class247.addWidgetItemMenuItem(var0, var8, var19, var17, false); // L: 9559 + } + } + + if (var10 >= 0) { // L: 9561 + class247.addWidgetItemMenuItem(var0, var8, var19, var10, true); // L: 9562 + } } - int var34 = var5 + 2 & 3; - Object var33; - if (var15.animationId == -1 && var15.transforms == null) { - var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25); - var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25); - } else { - var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); - var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null); + var22 = var0.itemActions; // L: 9565 + if (var22 != null) { // L: 9566 + for (var17 = 4; var17 >= 0; --var17) { // L: 9567 + if (var22[var17] != null) { // L: 9568 + byte var18 = 0; // L: 9569 + if (var17 == 0) { // L: 9570 + var18 = 39; + } + + if (var17 == 1) { // L: 9571 + var18 = 40; + } + + if (var17 == 2) { // L: 9572 + var18 = 41; + } + + if (var17 == 3) { // L: 9573 + var18 = 42; + } + + if (var17 == 4) { // L: 9574 + var18 = 43; + } + + StructDefinition.insertMenuItemNoShift(var22[var17], WorldMapAreaData.colorStartTag(16748608) + var8.name, var18, var8.id, var19, var0.id); // L: 9575 + } + } } - var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var35 * Tiles.field531[var5], var35 * Tiles.field533[var5], var26, var28); + StructDefinition.insertMenuItemNoShift("Examine", WorldMapAreaData.colorStartTag(16748608) + var8.name, 1005, var8.id, var19, var0.id); // L: 9580 } } } - } else { - if (var15.animationId == -1 && var15.transforms == null) { - var29 = var15.getModel(10, var5, var22, var24, var23, var25); - } else { - var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null); - } - if (var29 != null) { - var42.method3356(var0, var2, var3, var23, var16, var17, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28); - } - - if (var15.interactType != 0) { - var14.addGameObject(var2, var3, var16, var17, var15.boolean1); - } + ++var19; // L: 9586 } } } - } + if (var0.isIf3) { // L: 9590 + if (Client.isSpellSelected) { // L: 9591 + var4 = WorldMapIcon_0.getWidgetFlags(var0); // L: 9593 + boolean var24 = (var4 >> 21 & 1) != 0; // L: 9595 + if (var24 && (UserComparator8.selectedSpellFlags & 32) == 32) { // L: 9597 + StructDefinition.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id); // L: 9598 + } + } else { + for (var19 = 9; var19 >= 5; --var19) { // L: 9603 + String var20 = WorldMapAreaData.method756(var0, var19); // L: 9604 + if (var20 != null) { // L: 9605 + StructDefinition.insertMenuItemNoShift(var20, var0.dataText, 1007, var19 + 1, var0.childIndex, var0.id); // L: 9606 + } + } - @ObfuscatedName("hn") - @ObfuscatedSignature( - descriptor = "(IIIII)V", - garbageValue = "-569208973" - ) - static final void method7(int var0, int var1, int var2, int var3) { - for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) { - if (Client.rootWidgetXs[var4] + Client.rootWidgetWidths[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetYs[var4] + Client.rootWidgetHeights[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) { - Client.field813[var4] = true; + var3 = SpriteMask.Widget_getSpellActionName(var0); // L: 9610 + if (var3 != null) { // L: 9611 + StructDefinition.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id); // L: 9612 + } + + for (var4 = 4; var4 >= 0; --var4) { // L: 9615 + String var5 = WorldMapAreaData.method756(var0, var4); // L: 9616 + if (var5 != null) { // L: 9617 + Tiles.insertMenuItem(var5, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.prioritizeMenuEntry); // L: 9618 + } + } + + if (class39.Widget_hasContinueOption(WorldMapIcon_0.getWidgetFlags(var0))) { // L: 9622 + StructDefinition.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id); // L: 9623 + } } } - } + } // L: 9628 } diff --git a/runescape-client/src/main/java/class10.java b/runescape-client/src/main/java/class10.java index 3e9bc8a24d..64f93c3b7a 100644 --- a/runescape-client/src/main/java/class10.java +++ b/runescape-client/src/main/java/class10.java @@ -1,35 +1,35 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("w") +@ObfuscatedName("n") public class class10 { - @ObfuscatedName("m") - final int field48; - @ObfuscatedName("o") - final int field47; - @ObfuscatedName("q") - final String field46; + @ObfuscatedName("z") + final int field55; + @ObfuscatedName("k") + final int field56; + @ObfuscatedName("s") + final String field54; @ObfuscatedSignature( - descriptor = "(Lkn;)V" + descriptor = "(Lkf;)V" ) class10(Buffer var1) { - this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); - } + this(var1.readUnsignedByte(), var1.readUnsignedByte(), var1.readStringCp1252NullTerminated()); // L: 19 + } // L: 20 class10(int var1, int var2, String var3) { - this.field48 = var1; - this.field47 = var2; - this.field46 = var3; - } + this.field55 = var1; // L: 13 + this.field56 = var2; // L: 14 + this.field54 = var3; // L: 15 + } // L: 16 - @ObfuscatedName("m") + @ObfuscatedName("z") String method126() { - return Integer.toHexString(this.field48) + Integer.toHexString(this.field47) + this.field46; + return Integer.toHexString(this.field55) + Integer.toHexString(this.field56) + this.field54; // L: 23 } - @ObfuscatedName("o") - int method123() { - return this.field47; + @ObfuscatedName("k") + int method125() { + return this.field56; // L: 27 } } diff --git a/runescape-client/src/main/java/class105.java b/runescape-client/src/main/java/class105.java index e922c69f89..f200fbf20a 100644 --- a/runescape-client/src/main/java/class105.java +++ b/runescape-client/src/main/java/class105.java @@ -1,51 +1,24 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("dw") +@ObfuscatedName("dq") public class class105 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Ljx;" + descriptor = "Ljv;" ) @Export("reflectionChecks") - static IterableNodeDeque reflectionChecks; - @ObfuscatedName("dn") - @ObfuscatedSignature( - descriptor = "Lig;" + public static IterableNodeDeque reflectionChecks; + @ObfuscatedName("ix") + @ObfuscatedGetter( + intValue = 1183836299 ) - @Export("archive3") - static Archive archive3; + @Export("selectedItemWidget") + static int selectedItemWidget; static { - reflectionChecks = new IterableNodeDeque(); - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1577025565" - ) - static final int method2414(int var0, int var1) { - if (var0 == -2) { - return 12345678; - } else if (var0 == -1) { - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } + reflectionChecks = new IterableNodeDeque(); // L: 17 } } diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/class11.java index 3b5bc75710..0da869e1c1 100644 --- a/runescape-client/src/main/java/class11.java +++ b/runescape-client/src/main/java/class11.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("y") +@ObfuscatedName("d") public interface class11 { } diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/class12.java index c41813a2f2..beff48dab8 100644 --- a/runescape-client/src/main/java/class12.java +++ b/runescape-client/src/main/java/class12.java @@ -1,11 +1,11 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("c") +@ObfuscatedName("h") public interface class12 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;)Lkn;" + descriptor = "(Lkf;)Lkf;" ) - Buffer vmethod133(Buffer var1); + Buffer vmethod127(Buffer var1); } diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java index 2438315de1..b252192315 100644 --- a/runescape-client/src/main/java/class13.java +++ b/runescape-client/src/main/java/class13.java @@ -1,25 +1,146 @@ +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("h") +@ObfuscatedName("a") public final class class13 { - @ObfuscatedName("sz") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lmc;" + descriptor = "(I)J", + garbageValue = "-905483159" ) - @Export("platformInfo") - static PlatformInfo platformInfo; - @ObfuscatedName("p") + static long method134() { + try { + URL var0 = new URL(HealthBarDefinition.method4563("services", false) + "m=accountappeal/login.ws"); // L: 36 + URLConnection var1 = var0.openConnection(); // L: 37 + var1.setRequestProperty("connection", "close"); // L: 38 + var1.setDoInput(true); // L: 39 + var1.setDoOutput(true); // L: 40 + var1.setConnectTimeout(5000); // L: 41 + OutputStreamWriter var2 = new OutputStreamWriter(var1.getOutputStream()); // L: 42 + var2.write("data1=req"); // L: 43 + var2.flush(); // L: 44 + InputStream var3 = var1.getInputStream(); // L: 45 + Buffer var4 = new Buffer(new byte[1000]); // L: 46 + + do { + int var5 = var3.read(var4.array, var4.offset, 1000 - var4.offset); // L: 48 + if (var5 == -1) { // L: 49 + var4.offset = 0; // L: 55 + long var7 = var4.readLong(); // L: 56 + return var7; // L: 57 + } + + var4.offset += var5; // L: 50 + } while(var4.offset < 1000); // L: 51 + + return 0L; // L: 52 + } catch (Exception var9) { // L: 59 + return 0L; // L: 60 + } + } + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[Lch;" + descriptor = "(IIB)I", + garbageValue = "101" ) - @Export("World_worlds") - static World[] World_worlds; - @ObfuscatedName("bo") + public static int method129(int var0, int var1) { + return (var0 << 8) + var1; // L: 13 + } + + @ObfuscatedName("ge") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "(III)V", + garbageValue = "347660061" ) - @Export("worldSelectLeftSprite") - static IndexedSprite worldSelectLeftSprite; + @Export("updateItemPile") + static final void updateItemPile(int var0, int var1) { + NodeDeque var2 = Client.groundItems[Huffman.Client_plane][var0][var1]; // L: 6697 + if (var2 == null) { // L: 6698 + ScriptEvent.scene.removeGroundItemPile(Huffman.Client_plane, var0, var1); // L: 6699 + } else { + long var3 = -99999999L; // L: 6702 + TileItem var5 = null; // L: 6703 + + TileItem var6; + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 6704 6705 6713 + ItemDefinition var7 = GrandExchangeOfferTotalQuantityComparator.ItemDefinition_get(var6.id); // L: 6706 + long var11 = (long)var7.price; // L: 6707 + if (var7.isStackable == 1) { // L: 6708 + var11 *= (long)(var6.quantity + 1); + } + + if (var11 > var3) { // L: 6709 + var3 = var11; // L: 6710 + var5 = var6; // L: 6711 + } + } + + if (var5 == null) { // L: 6715 + ScriptEvent.scene.removeGroundItemPile(Huffman.Client_plane, var0, var1); // L: 6716 + } else { + var2.addLast(var5); // L: 6719 + TileItem var13 = null; // L: 6720 + TileItem var8 = null; // L: 6721 + + for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 6722 6723 6728 + if (var6.id != var5.id) { // L: 6724 + if (var13 == null) { // L: 6725 + var13 = var6; + } + + if (var6.id != var13.id && var8 == null) { // L: 6726 + var8 = var6; + } + } + } + + long var9 = class227.calculateTag(var0, var1, 3, false, 0); // L: 6730 + ScriptEvent.scene.newGroundItemPile(Huffman.Client_plane, var0, var1, ArchiveLoader.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, Huffman.Client_plane), var5, var9, var13, var8); // L: 6731 + } + } + } // L: 6700 6717 6732 + + @ObfuscatedName("jq") + @ObfuscatedSignature( + descriptor = "(Lhq;IIB)V", + garbageValue = "-96" + ) + @Export("clickWidget") + static final void clickWidget(Widget var0, int var1, int var2) { + if (Client.clickedWidget == null && !Client.isMenuOpen) { // L: 10145 + if (var0 != null) { // L: 10147 + Widget var4 = ReflectionCheck.method2381(var0); // L: 10150 + if (var4 == null) { // L: 10151 + var4 = var0.parent; + } + + if (var4 != null) { // L: 10154 + Client.clickedWidget = var0; // L: 10158 + var4 = ReflectionCheck.method2381(var0); // L: 10161 + if (var4 == null) { // L: 10162 + var4 = var0.parent; + } + + Client.clickedWidgetParent = var4; // L: 10165 + Client.widgetClickX = var1; // L: 10166 + Client.widgetClickY = var2; // L: 10167 + BoundaryObject.widgetDragDuration = 0; // L: 10168 + Client.isDraggingWidget = false; // L: 10169 + int var5 = GrandExchangeOffer.method209(); // L: 10170 + if (var5 != -1) { // L: 10171 + ObjectSound.method1983(var5); + } + + return; // L: 10172 + } + } + + } + } // L: 10156 } diff --git a/runescape-client/src/main/java/class155.java b/runescape-client/src/main/java/class155.java index 9fc5644a38..991f157a61 100644 --- a/runescape-client/src/main/java/class155.java +++ b/runescape-client/src/main/java/class155.java @@ -1,7 +1,7 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("ee") +@ObfuscatedName("ea") public interface class155 { - @ObfuscatedName("m") - void method3449(Object var1); + @ObfuscatedName("z") + void method3442(Object var1); } diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java index a218fbcb38..934c4a2f05 100644 --- a/runescape-client/src/main/java/class169.java +++ b/runescape-client/src/main/java/class169.java @@ -2,63 +2,136 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("fg") +@ObfuscatedName("ff") public enum class169 implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lff;" ) - field2028(0, 0), - @ObfuscatedName("o") + field2045(3, 0), + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lff;" ) - field2023(1, 1), - @ObfuscatedName("q") + field2046(1, 1), + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lff;" ) - field2024(2, 2), - @ObfuscatedName("j") + field2043(2, 2), + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lfg;" + descriptor = "Lff;" ) - field2025(3, 3); + field2044(0, 3); - @ObfuscatedName("em") - @Export("worldHost") - static String worldHost; - @ObfuscatedName("lz") - @ObfuscatedSignature( - descriptor = "Lcu;" - ) - @Export("tempMenuAction") - static MenuAction tempMenuAction; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 1619029739 + intValue = -1066802481 ) - public final int field2026; - @ObfuscatedName("g") + public final int field2042; + @ObfuscatedName("o") @ObfuscatedGetter( - intValue = 1641384221 + intValue = 1306076667 ) @Export("id") final int id; class169(int var3, int var4) { - this.field2026 = var3; - this.id = var4; - } + this.field2042 = var3; // L: 16 + this.id = var4; // L: 17 + } // L: 18 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.id; + return this.id; // L: 21 + } + + @ObfuscatedName("ag") + @ObfuscatedSignature( + descriptor = "(ILcy;ZI)I", + garbageValue = "-306559930" + ) + static int method3542(int var0, Script var1, boolean var2) { + int var3; + int var6; + int var9; + if (var0 == ScriptOpcodes.ENUM_STRING) { // L: 1861 + Interpreter.Interpreter_intStackSize -= 2; // L: 1862 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1863 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1864 + EnumDefinition var10 = GrandExchangeOfferNameComparator.getEnum(var3); // L: 1865 + if (var10.outputType != 's') { // L: 1866 + } + + for (var6 = 0; var6 < var10.outputCount; ++var6) { // L: 1867 + if (var9 == var10.keys[var6]) { // L: 1868 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var10.strVals[var6]; // L: 1869 + var10 = null; // L: 1870 + break; + } + } + + if (var10 != null) { // L: 1874 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var10.defaultStr; + } + + return 1; // L: 1875 + } else if (var0 != ScriptOpcodes.ENUM) { // L: 1877 + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { // L: 1903 + var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 1904 + EnumDefinition var4 = GrandExchangeOfferNameComparator.getEnum(var3); // L: 1905 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4.size(); // L: 1906 + return 1; // L: 1907 + } else { + return 2; // L: 1909 + } + } else { + Interpreter.Interpreter_intStackSize -= 4; // L: 1878 + var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 1879 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 1880 + int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 1881 + var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 1882 + EnumDefinition var7 = GrandExchangeOfferNameComparator.getEnum(var5); // L: 1883 + if (var3 == var7.inputType && var9 == var7.outputType) { // L: 1884 + for (int var8 = 0; var8 < var7.outputCount; ++var8) { // L: 1889 + if (var6 == var7.keys[var8]) { // L: 1890 + if (var9 == 115) { // L: 1891 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.strVals[var8]; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.intVals[var8]; // L: 1892 + } + + var7 = null; // L: 1893 + break; + } + } + + if (var7 != null) { // L: 1897 + if (var9 == 115) { // L: 1898 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var7.defaultStr; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var7.defaultInt; // L: 1899 + } + } + + return 1; // L: 1901 + } else { + if (var9 == 115) { // L: 1885 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 1886 + } + + return 1; // L: 1887 + } + } } } diff --git a/runescape-client/src/main/java/class170.java b/runescape-client/src/main/java/class170.java index a53387b377..1cdaa0fa9d 100644 --- a/runescape-client/src/main/java/class170.java +++ b/runescape-client/src/main/java/class170.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("fu") +@ObfuscatedName("fr") public interface class170 { } diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index 6ee50d8d9c..410a103ff1 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -1,30 +1,295 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ff") +@ObfuscatedName("fi") public class class171 implements class170 { - @ObfuscatedName("u") - static byte[][][] field2036; + @ObfuscatedName("x") + static byte[][][] field2049; - @ObfuscatedName("g") - @Export("Entity_unpackType") - public static int Entity_unpackType(long var0) { - return (int)(var0 >>> 14 & 3L); - } - - @ObfuscatedName("a") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)I", - garbageValue = "-316130396" + descriptor = "(I)V", + garbageValue = "-1487282942" ) - @Export("Messages_getNextChatID") - static int Messages_getNextChatID(int var0) { - Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); - if (var1 == null) { - return -1; + public static void method3543() { + class105.reflectionChecks = new IterableNodeDeque(); // L: 24 + } // L: 25 + + @ObfuscatedName("ar") + @ObfuscatedSignature( + descriptor = "(ILcy;ZB)I", + garbageValue = "-94" + ) + static int method3544(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { // L: 2822 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode; // L: 2823 + return 1; // L: 2824 + } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { // L: 2826 + Interpreter.Interpreter_intStackSize -= 3; // L: 2827 + Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2828 + Player.privateChatMode = TileItem.method2202(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 2829 + if (Player.privateChatMode == null) { // L: 2830 + Player.privateChatMode = PrivateChatMode.field3821; + } + + Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2831 + PacketBufferNode var18 = Client.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher); // L: 2833 + var18.packetBuffer.writeByte(Client.publicChatMode); // L: 2834 + var18.packetBuffer.writeByte(Player.privateChatMode.field3824); // L: 2835 + var18.packetBuffer.writeByte(Client.tradeChatMode); // L: 2836 + Client.packetWriter.addNode(var18); // L: 2837 + return 1; // L: 2838 } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; + String var3; + int var11; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { // L: 2840 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2841 + Interpreter.Interpreter_intStackSize -= 2; // L: 2842 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2843 + int var12 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2844 + PacketBufferNode var13 = Client.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher); // L: 2846 + var13.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var3) + 2); // L: 2847 + var13.packetBuffer.writeStringCp1252NullTerminated(var3); // L: 2848 + var13.packetBuffer.writeByte(var11 - 1); // L: 2849 + var13.packetBuffer.writeByte(var12); // L: 2850 + Client.packetWriter.addNode(var13); // L: 2851 + return 1; // L: 2852 + } else { + int var10; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { // L: 2854 + Interpreter.Interpreter_intStackSize -= 2; // L: 2855 + var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2856 + var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2857 + Message var16 = WorldMapCacheName.Messages_getByChannelAndID(var10, var11); // L: 2858 + if (var16 != null) { // L: 2859 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.count; // L: 2860 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.cycle; // L: 2861 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; // L: 2862 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; // L: 2863 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; // L: 2864 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); // L: 2865 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 2868 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2869 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2870 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2871 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2872 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2873 + } + + return 1; // L: 2875 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { // L: 2877 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2878 + Message var14 = WorldMapSection2.Messages_getMessage(var10); // L: 2879 + if (var14 != null) { // L: 2880 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.type; // L: 2881 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.cycle; // L: 2882 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var14.sender != null ? var14.sender : ""; // L: 2883 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var14.prefix != null ? var14.prefix : ""; // L: 2884 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var14.text != null ? var14.text : ""; // L: 2885 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var14.isFromFriend() ? 1 : (var14.isFromIgnored() ? 2 : 0); // L: 2886 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 2889 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2890 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2891 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2892 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = ""; // L: 2893 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2894 + } + + return 1; // L: 2896 + } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { // L: 2898 + if (Player.privateChatMode == null) { // L: 2899 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Player.privateChatMode.field3824; // L: 2900 + } + + return 1; // L: 2901 + } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { // L: 2903 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 2904 + var11 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2905 + String var15 = var3.toLowerCase(); // L: 2906 + byte var17 = 0; // L: 2907 + if (var15.startsWith("yellow:")) { // L: 2908 + var17 = 0; // L: 2909 + var3 = var3.substring("yellow:".length()); // L: 2910 + } else if (var15.startsWith("red:")) { // L: 2912 + var17 = 1; // L: 2913 + var3 = var3.substring("red:".length()); // L: 2914 + } else if (var15.startsWith("green:")) { // L: 2916 + var17 = 2; // L: 2917 + var3 = var3.substring("green:".length()); // L: 2918 + } else if (var15.startsWith("cyan:")) { // L: 2920 + var17 = 3; // L: 2921 + var3 = var3.substring("cyan:".length()); // L: 2922 + } else if (var15.startsWith("purple:")) { // L: 2924 + var17 = 4; // L: 2925 + var3 = var3.substring("purple:".length()); // L: 2926 + } else if (var15.startsWith("white:")) { // L: 2928 + var17 = 5; // L: 2929 + var3 = var3.substring("white:".length()); // L: 2930 + } else if (var15.startsWith("flash1:")) { // L: 2932 + var17 = 6; // L: 2933 + var3 = var3.substring("flash1:".length()); // L: 2934 + } else if (var15.startsWith("flash2:")) { // L: 2936 + var17 = 7; // L: 2937 + var3 = var3.substring("flash2:".length()); // L: 2938 + } else if (var15.startsWith("flash3:")) { // L: 2940 + var17 = 8; // L: 2941 + var3 = var3.substring("flash3:".length()); // L: 2942 + } else if (var15.startsWith("glow1:")) { // L: 2944 + var17 = 9; // L: 2945 + var3 = var3.substring("glow1:".length()); // L: 2946 + } else if (var15.startsWith("glow2:")) { // L: 2948 + var17 = 10; // L: 2949 + var3 = var3.substring("glow2:".length()); // L: 2950 + } else if (var15.startsWith("glow3:")) { // L: 2952 + var17 = 11; // L: 2953 + var3 = var3.substring("glow3:".length()); // L: 2954 + } else if (class58.clientLanguage != Language.Language_EN) { // L: 2956 + if (var15.startsWith("yellow:")) { // L: 2957 + var17 = 0; // L: 2958 + var3 = var3.substring("yellow:".length()); // L: 2959 + } else if (var15.startsWith("red:")) { // L: 2961 + var17 = 1; // L: 2962 + var3 = var3.substring("red:".length()); // L: 2963 + } else if (var15.startsWith("green:")) { // L: 2965 + var17 = 2; // L: 2966 + var3 = var3.substring("green:".length()); // L: 2967 + } else if (var15.startsWith("cyan:")) { // L: 2969 + var17 = 3; // L: 2970 + var3 = var3.substring("cyan:".length()); // L: 2971 + } else if (var15.startsWith("purple:")) { // L: 2973 + var17 = 4; // L: 2974 + var3 = var3.substring("purple:".length()); // L: 2975 + } else if (var15.startsWith("white:")) { // L: 2977 + var17 = 5; // L: 2978 + var3 = var3.substring("white:".length()); // L: 2979 + } else if (var15.startsWith("flash1:")) { // L: 2981 + var17 = 6; // L: 2982 + var3 = var3.substring("flash1:".length()); // L: 2983 + } else if (var15.startsWith("flash2:")) { // L: 2985 + var17 = 7; // L: 2986 + var3 = var3.substring("flash2:".length()); // L: 2987 + } else if (var15.startsWith("flash3:")) { // L: 2989 + var17 = 8; // L: 2990 + var3 = var3.substring("flash3:".length()); // L: 2991 + } else if (var15.startsWith("glow1:")) { // L: 2993 + var17 = 9; // L: 2994 + var3 = var3.substring("glow1:".length()); // L: 2995 + } else if (var15.startsWith("glow2:")) { // L: 2997 + var17 = 10; // L: 2998 + var3 = var3.substring("glow2:".length()); // L: 2999 + } else if (var15.startsWith("glow3:")) { // L: 3001 + var17 = 11; // L: 3002 + var3 = var3.substring("glow3:".length()); // L: 3003 + } + } + + var15 = var3.toLowerCase(); // L: 3006 + byte var7 = 0; // L: 3007 + if (var15.startsWith("wave:")) { // L: 3008 + var7 = 1; // L: 3009 + var3 = var3.substring("wave:".length()); // L: 3010 + } else if (var15.startsWith("wave2:")) { // L: 3012 + var7 = 2; // L: 3013 + var3 = var3.substring("wave2:".length()); // L: 3014 + } else if (var15.startsWith("shake:")) { // L: 3016 + var7 = 3; // L: 3017 + var3 = var3.substring("shake:".length()); // L: 3018 + } else if (var15.startsWith("scroll:")) { // L: 3020 + var7 = 4; // L: 3021 + var3 = var3.substring("scroll:".length()); // L: 3022 + } else if (var15.startsWith("slide:")) { // L: 3024 + var7 = 5; // L: 3025 + var3 = var3.substring("slide:".length()); // L: 3026 + } else if (class58.clientLanguage != Language.Language_EN) { // L: 3028 + if (var15.startsWith("wave:")) { // L: 3029 + var7 = 1; // L: 3030 + var3 = var3.substring("wave:".length()); // L: 3031 + } else if (var15.startsWith("wave2:")) { // L: 3033 + var7 = 2; // L: 3034 + var3 = var3.substring("wave2:".length()); // L: 3035 + } else if (var15.startsWith("shake:")) { // L: 3037 + var7 = 3; // L: 3038 + var3 = var3.substring("shake:".length()); // L: 3039 + } else if (var15.startsWith("scroll:")) { // L: 3041 + var7 = 4; // L: 3042 + var3 = var3.substring("scroll:".length()); // L: 3043 + } else if (var15.startsWith("slide:")) { // L: 3045 + var7 = 5; // L: 3046 + var3 = var3.substring("slide:".length()); // L: 3047 + } + } + + PacketBufferNode var8 = Client.getPacketBufferNode(ClientPacket.field2342, Client.packetWriter.isaacCipher); // L: 3051 + var8.packetBuffer.writeByte(0); // L: 3052 + int var9 = var8.packetBuffer.offset; // L: 3053 + var8.packetBuffer.writeByte(var11); // L: 3054 + var8.packetBuffer.writeByte(var17); // L: 3055 + var8.packetBuffer.writeByte(var7); // L: 3056 + Player.method1326(var8.packetBuffer, var3); // L: 3057 + var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); // L: 3058 + Client.packetWriter.addNode(var8); // L: 3059 + return 1; // L: 3060 + } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { // L: 3062 + Varps.Interpreter_stringStackSize -= 2; // L: 3063 + var3 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize]; // L: 3064 + String var4 = Interpreter.Interpreter_stringStack[Varps.Interpreter_stringStackSize + 1]; // L: 3065 + PacketBufferNode var5 = Client.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher); // L: 3067 + var5.packetBuffer.writeShort(0); // L: 3068 + int var6 = var5.packetBuffer.offset; // L: 3069 + var5.packetBuffer.writeStringCp1252NullTerminated(var3); // L: 3070 + Player.method1326(var5.packetBuffer, var4); // L: 3071 + var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var6); // L: 3072 + Client.packetWriter.addNode(var5); // L: 3073 + return 1; // L: 3074 + } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { // L: 3076 + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { // L: 3083 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode; // L: 3084 + return 1; // L: 3085 + } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { // L: 3087 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3088 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = SecureRandomFuture.Messages_getHistorySize(var10); // L: 3089 + return 1; // L: 3090 + } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { // L: 3092 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3093 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = HealthBar.Messages_getNextChatID(var10); // L: 3094 + return 1; // L: 3095 + } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { // L: 3097 + var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 3098 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.Messages_getLastChatID(var10); // L: 3099 + return 1; // L: 3100 + } else if (var0 == ScriptOpcodes.DOCHEAT) { // L: 3102 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 3103 + WorldMapSection2.doCheat(var3); // L: 3104 + return 1; // L: 3105 + } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { // L: 3107 + Client.field913 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize].toLowerCase().trim(); // L: 3108 + return 1; // L: 3109 + } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { // L: 3111 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = Client.field913; // L: 3112 + return 1; // L: 3113 + } else if (var0 == ScriptOpcodes.DEBUGMES) { // L: 3115 + var3 = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 3116 + System.out.println(var3); // L: 3117 + return 1; // L: 3118 + } else { + return 2; // L: 3120 + } + } else { + if (WorldMapLabelSize.localPlayer != null && WorldMapLabelSize.localPlayer.username != null) { // L: 3078 + var3 = WorldMapLabelSize.localPlayer.username.getName(); + } else { + var3 = ""; // L: 3079 + } + + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3; // L: 3080 + return 1; // L: 3081 + } + } } } } diff --git a/runescape-client/src/main/java/class182.java b/runescape-client/src/main/java/class182.java index 6f60635302..626d7dfa0a 100644 --- a/runescape-client/src/main/java/class182.java +++ b/runescape-client/src/main/java/class182.java @@ -1,37 +1,55 @@ +import java.awt.Component; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gv") +@ObfuscatedName("gx") public class class182 { - @ObfuscatedName("q") + @ObfuscatedName("s") @Export("directions") static int[][] directions; - @ObfuscatedName("j") + @ObfuscatedName("t") @Export("distances") static int[][] distances; - @ObfuscatedName("p") + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = 773651675 + intValue = 346475307 ) - static int field2132; - @ObfuscatedName("u") + static int field2135; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 1906338265 + ) + static int field2136; + @ObfuscatedName("w") @Export("bufferX") static int[] bufferX; - @ObfuscatedName("a") + @ObfuscatedName("g") @Export("bufferY") static int[] bufferY; - @ObfuscatedName("fz") - @ObfuscatedGetter( - intValue = 525602501 + @ObfuscatedName("dw") + @ObfuscatedSignature( + descriptor = "Liw;" ) - @Export("baseX") - static int baseX; + @Export("archive0") + static Archive archive0; static { - directions = new int[128][128]; - distances = new int[128][128]; - bufferX = new int[4096]; - bufferY = new int[4096]; + directions = new int[128][128]; // L: 6 + distances = new int[128][128]; // L: 7 + bufferX = new int[4096]; // L: 11 + bufferY = new int[4096]; // L: 12 } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/awt/Component;I)V", + garbageValue = "-1480646346" + ) + static void method3683(Component var0) { + var0.removeKeyListener(KeyHandler.KeyHandler_instance); // L: 150 + var0.removeFocusListener(KeyHandler.KeyHandler_instance); // L: 151 + KeyHandler.field418 = -1; // L: 152 + } // L: 153 } diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java index f21b1ae7c8..636381c083 100644 --- a/runescape-client/src/main/java/class190.java +++ b/runescape-client/src/main/java/class190.java @@ -1,5 +1,5 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("gm") +@ObfuscatedName("gh") public interface class190 { } diff --git a/runescape-client/src/main/java/class194.java b/runescape-client/src/main/java/class194.java index 9406341682..ea2a3eb459 100644 --- a/runescape-client/src/main/java/class194.java +++ b/runescape-client/src/main/java/class194.java @@ -1,81 +1,89 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gl") +@ObfuscatedName("gd") public class class194 { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class194 field2357; - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class194 field2354; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class194 field2355; - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class194 field2358; - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class194 field2353; - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class194 field2360; - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class194 field2359; - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class194 field2363; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "Lgl;" - ) - public static final class194 field2361; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgl;" + descriptor = "Lgd;" + ) + public static final class194 field2371; + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lgd;" ) public static final class194 field2362; - @ObfuscatedName("jp") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lhd;" + descriptor = "Lgd;" ) - static Widget field2356; + public static final class194 field2363; + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final class194 field2370; + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final class194 field2365; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final class194 field2366; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final class194 field2364; + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final class194 field2368; + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final class194 field2361; + @ObfuscatedName("m") + @ObfuscatedSignature( + descriptor = "Lgd;" + ) + public static final class194 field2367; static { - field2357 = new class194(6); - field2354 = new class194(7); - field2355 = new class194(4); - field2358 = new class194(14); - field2353 = new class194(2); - field2360 = new class194(15); - field2359 = new class194(5); - field2363 = new class194(3); - field2361 = new class194(4); - field2362 = new class194(5); + field2371 = new class194(5); // L: 5 + field2362 = new class194(4); // L: 6 + field2363 = new class194(3); // L: 7 + field2370 = new class194(5); // L: 8 + field2365 = new class194(4); // L: 9 + field2366 = new class194(14); // L: 10 + field2364 = new class194(15); // L: 11 + field2368 = new class194(6); // L: 12 + field2361 = new class194(7); // L: 13 + field2367 = new class194(2); // L: 14 } @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "6" + garbageValue = "5" ) class194(int var1) { + } // L: 20 + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(IS)Ljava/lang/String;", + garbageValue = "4096" + ) + static final String method3712(int var0) { + if (var0 < 100000) { // L: 421 + return "" + var0 + ""; + } else { + return var0 < 10000000 ? "" + var0 / 1000 + "K" + "" : "" + var0 / 1000000 + "M" + ""; // L: 422 423 + } } } diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index b58230d545..2cb373cd8b 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -1,81 +1,152 @@ +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InvalidClassException; +import java.io.ObjectInputStream; +import java.io.OptionalDataException; +import java.io.StreamCorruptedException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("go") +@ObfuscatedName("gz") public class class195 { - @ObfuscatedName("ba") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lmo;" + descriptor = "(II)Lik;", + garbageValue = "-26050751" ) - @Export("loginType") - static LoginType loginType; - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "([BI)[B", - garbageValue = "-92628097" - ) - static byte[] method3748(byte[] var0) { - int var1 = var0.length; - byte[] var2 = new byte[var1]; - System.arraycopy(var0, 0, var2, 0, var1); - return var2; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(IIILjg;IB)V", - garbageValue = "-24" - ) - static void method3747(int var0, int var1, int var2, ObjectDefinition var3, int var4) { - ObjectSound var5 = new ObjectSound(); - var5.plane = var0; - var5.x = var1 * 128; - var5.y = var2 * 128; - int var6 = var3.sizeX; - int var7 = var3.sizeY; - if (var4 == 1 || var4 == 3) { - var6 = var3.sizeY; - var7 = var3.sizeX; - } - - var5.field1103 = (var6 + var1) * 128; - var5.field1104 = (var7 + var2) * 128; - var5.soundEffectId = var3.ambientSoundId; - var5.field1105 = var3.int4 * 128; - var5.field1108 = var3.int5; - var5.field1115 = var3.int6; - var5.soundEffectIds = var3.soundEffectIds; - if (var3.transforms != null) { - var5.obj = var3; - var5.set(); - } - - ObjectSound.objectSounds.addFirst(var5); - if (var5.soundEffectIds != null) { - var5.field1111 = var5.field1108 + (int)(Math.random() * (double)(var5.field1115 - var5.field1108)); - } - - } - - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1529350789" - ) - public static void method3749() { - while (true) { - ArchiveDiskAction var0; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); + @Export("VarpDefinition_get") + public static VarpDefinition VarpDefinition_get(int var0) { + VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); // L: 23 + if (var1 != null) { // L: 24 + return var1; + } else { + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); // L: 25 + var1 = new VarpDefinition(); // L: 26 + if (var2 != null) { // L: 27 + var1.decode(new Buffer(var2)); } - if (var0 == null) { - return; - } - - var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); // L: 28 + return var1; } } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lky;I)V", + garbageValue = "1634836666" + ) + @Export("performReflectionCheck") + public static void performReflectionCheck(PacketBuffer var0) { + ReflectionCheck var1 = (ReflectionCheck)class105.reflectionChecks.last(); // L: 29 + if (var1 != null) { // L: 30 + int var2 = var0.offset; // L: 31 + var0.writeInt(var1.id); // L: 32 + + for (int var3 = 0; var3 < var1.size; ++var3) { // L: 33 + if (var1.creationErrors[var3] != 0) { // L: 34 + var0.writeByte(var1.creationErrors[var3]); // L: 35 + } else { + try { + int var4 = var1.operations[var3]; // L: 39 + Field var5; + int var6; + if (var4 == 0) { // L: 40 + var5 = var1.fields[var3]; // L: 41 + var6 = Reflection.getInt(var5, (Object)null); // L: 42 + var0.writeByte(0); // L: 43 + var0.writeInt(var6); // L: 44 + } else if (var4 == 1) { // L: 46 + var5 = var1.fields[var3]; // L: 47 + Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]); // L: 48 + var0.writeByte(0); // L: 49 + } else if (var4 == 2) { // L: 51 + var5 = var1.fields[var3]; // L: 52 + var6 = var5.getModifiers(); // L: 53 + var0.writeByte(0); // L: 54 + var0.writeInt(var6); // L: 55 + } + + Method var25; + if (var4 != 3) { // L: 57 + if (var4 == 4) { // L: 77 + var25 = var1.methods[var3]; // L: 78 + var6 = var25.getModifiers(); // L: 79 + var0.writeByte(0); // L: 80 + var0.writeInt(var6); // L: 81 + } + } else { + var25 = var1.methods[var3]; // L: 58 + byte[][] var10 = var1.arguments[var3]; // L: 59 + Object[] var7 = new Object[var10.length]; // L: 60 + + for (int var8 = 0; var8 < var10.length; ++var8) { // L: 61 + ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8])); // L: 62 + var7[var8] = var9.readObject(); // L: 63 + } + + Object var11 = Reflection.invoke(var25, (Object)null, var7); // L: 65 + if (var11 == null) { // L: 66 + var0.writeByte(0); + } else if (var11 instanceof Number) { // L: 67 + var0.writeByte(1); // L: 68 + var0.writeLong(((Number)var11).longValue()); // L: 69 + } else if (var11 instanceof String) { // L: 71 + var0.writeByte(2); // L: 72 + var0.writeStringCp1252NullTerminated((String)var11); // L: 73 + } else { + var0.writeByte(4); // L: 75 + } + } + } catch (ClassNotFoundException var13) { // L: 84 + var0.writeByte(-10); // L: 85 + } catch (InvalidClassException var14) { // L: 87 + var0.writeByte(-11); // L: 88 + } catch (StreamCorruptedException var15) { // L: 90 + var0.writeByte(-12); // L: 91 + } catch (OptionalDataException var16) { // L: 93 + var0.writeByte(-13); // L: 94 + } catch (IllegalAccessException var17) { // L: 96 + var0.writeByte(-14); // L: 97 + } catch (IllegalArgumentException var18) { // L: 99 + var0.writeByte(-15); // L: 100 + } catch (InvocationTargetException var19) { // L: 102 + var0.writeByte(-16); // L: 103 + } catch (SecurityException var20) { // L: 105 + var0.writeByte(-17); // L: 106 + } catch (IOException var21) { // L: 108 + var0.writeByte(-18); // L: 109 + } catch (NullPointerException var22) { // L: 111 + var0.writeByte(-19); // L: 112 + } catch (Exception var23) { // L: 114 + var0.writeByte(-20); // L: 115 + } catch (Throwable var24) { // L: 117 + var0.writeByte(-21); // L: 118 + } + } + } + + var0.writeCrc(var2); // L: 121 + var1.remove(); // L: 122 + } + } // L: 123 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(B)V", + garbageValue = "-64" + ) + public static void method3714() { + if (KeyHandler.KeyHandler_instance != null) { // L: 156 + synchronized(KeyHandler.KeyHandler_instance) { // L: 157 + KeyHandler.KeyHandler_instance = null; // L: 158 + } // L: 159 + } + + } // L: 161 } diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index f9497dfa16..a94e9426ed 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -1,82 +1,153 @@ -import java.io.DataInputStream; -import java.net.URL; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.Reflection; -@ObfuscatedName("gg") +@ObfuscatedName("gp") public class class197 { - @ObfuscatedName("qy") - @ObfuscatedSignature( - descriptor = "Ldv;" - ) - @Export("decimator") - static Decimator decimator; - @ObfuscatedName("m") - static int[] field2379; + @ObfuscatedName("z") + static int[] field2380; static { new Object(); - field2379 = new int[33]; - field2379[0] = 0; - int var0 = 2; + field2380 = new int[33]; // L: 8 + field2380[0] = 0; // L: 11 + int var0 = 2; // L: 12 - for (int var1 = 1; var1 < 33; ++var1) { - field2379[var1] = var0 - 1; - var0 += var0; + for (int var1 = 1; var1 < 33; ++var1) { // L: 13 + field2380[var1] = var0 - 1; // L: 14 + var0 += var0; // L: 15 } - } + } // L: 17 - @ObfuscatedName("m") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Ljava/lang/Throwable;I)V", - garbageValue = "-1357689499" + descriptor = "(IIIIB)V", + garbageValue = "1" ) - @Export("RunException_sendStackTrace") - public static void RunException_sendStackTrace(String var0, Throwable var1) { - if (var1 != null) { - var1.printStackTrace(); - } else { - try { - String var2 = ""; - if (var1 != null) { - var2 = class332.method6316(var1); + static void method3743(int var0, int var1, int var2, int var3) { + for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 93 + if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 94 + int var5 = 0; // L: 95 + if (var1 > var4.field1106) { // L: 96 + var5 += var1 - var4.field1106; + } else if (var1 < var4.x) { // L: 97 + var5 += var4.x - var1; } - if (var0 != null) { - if (var1 != null) { - var2 = var2 + " | "; + if (var2 > var4.field1117) { // L: 98 + var5 += var2 - var4.field1117; + } else if (var2 < var4.y) { // L: 99 + var5 += var4.y - var2; + } + + if (var5 - 64 <= var4.field1108 && Client.areaSoundEffectVolume != 0 && var0 == var4.plane) { // L: 100 + var5 -= 64; // L: 111 + if (var5 < 0) { // L: 112 + var5 = 0; } - var2 = var2 + var0; - } + int var6 = (var4.field1108 - var5) * Client.areaSoundEffectVolume / var4.field1108; // L: 113 + if (var4.stream1 == null) { // L: 114 + if (var4.soundEffectId >= 0) { // L: 115 + SoundEffect var7 = SoundEffect.readSoundEffect(GrandExchangeOfferUnitPriceComparator.archive4, var4.soundEffectId, 0); // L: 116 + if (var7 != null) { // L: 117 + RawSound var8 = var7.toRawSound().resample(class9.decimator); // L: 118 + RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 119 + var9.setNumLoops(-1); // L: 120 + Players.pcmStreamMixer.addSubStream(var9); // L: 121 + var4.stream1 = var9; // L: 122 + } + } + } else { + var4.stream1.method2641(var6); // L: 126 + } - System.out.println("Error: " + var2); - var2 = var2.replace(':', '.'); - var2 = var2.replace('@', '_'); - var2 = var2.replace('&', '_'); - var2 = var2.replace('#', '_'); - if (RunException.RunException_applet == null) { - return; - } + if (var4.stream2 == null) { // L: 127 + if (var4.soundEffectIds != null && (var4.field1118 -= var3) <= 0) { // L: 128 + int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 129 + SoundEffect var12 = SoundEffect.readSoundEffect(GrandExchangeOfferUnitPriceComparator.archive4, var4.soundEffectIds[var11], 0); // L: 130 + if (var12 != null) { // L: 131 + RawSound var13 = var12.toRawSound().resample(class9.decimator); // L: 132 + RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 133 + var10.setNumLoops(0); // L: 134 + Players.pcmStreamMixer.addSubStream(var10); // L: 135 + var4.stream2 = var10; // L: 136 + var4.field1118 = var4.field1109 + (int)(Math.random() * (double)(var4.field1115 - var4.field1109)); // L: 137 + } + } + } else { + var4.stream2.method2641(var6); // L: 142 + if (!var4.stream2.hasNext()) { // L: 143 + var4.stream2 = null; // L: 144 + } + } + } else { + if (var4.stream1 != null) { // L: 101 + Players.pcmStreamMixer.removeSubStream(var4.stream1); // L: 102 + var4.stream1 = null; // L: 103 + } - URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.clientType + "&e=" + var2); - DataInputStream var4 = new DataInputStream(var3.openStream()); - var4.read(); - var4.close(); - } catch (Exception var5) { + if (var4.stream2 != null) { // L: 105 + Players.pcmStreamMixer.removeSubStream(var4.stream2); // L: 106 + var4.stream2 = null; // L: 107 + } + } } + } + } // L: 148 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;I)Ljava/lang/Class;", + garbageValue = "432871093" + ) + @Export("loadClassFromDescriptor") + static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { + if (var0.equals("B")) { // L: 216 + return Byte.TYPE; + } else if (var0.equals("I")) { // L: 217 + return Integer.TYPE; + } else if (var0.equals("S")) { // L: 218 + return Short.TYPE; + } else if (var0.equals("J")) { // L: 219 + return Long.TYPE; + } else if (var0.equals("Z")) { // L: 220 + return Boolean.TYPE; + } else if (var0.equals("F")) { // L: 221 + return Float.TYPE; + } else if (var0.equals("D")) { + return Double.TYPE; + } else if (var0.equals("C")) { + return Character.TYPE; + } else { + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); } } - @ObfuscatedName("m") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lic;I)V", - garbageValue = "-1399485116" + descriptor = "(Lic;IB)Z", + garbageValue = "1" ) - public static void method3771(AbstractArchive var0) { - StructDefinition.StructDefinition_archive = var0; + public static boolean method3742(AbstractArchive var0, int var1) { + byte[] var2 = var0.takeFileFlat(var1); // L: 222 + if (var2 == null) { // L: 223 + return false; + } else { + Occluder.SpriteBuffer_decode(var2); // L: 224 + return true; // L: 225 + } + } + + @ObfuscatedName("ah") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-822542722" + ) + static int method3741(int var0) { + return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F)); // L: 3193 } } diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java index 7f01efeb95..5afb310de4 100644 --- a/runescape-client/src/main/java/class198.java +++ b/runescape-client/src/main/java/class198.java @@ -2,22 +2,15 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gh") +@ObfuscatedName("gt") public class class198 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "(I)[Lga;", + garbageValue = "900094506" ) - @Export("ParamDefinition_archive") - static AbstractArchive ParamDefinition_archive; - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IB)Z", - garbageValue = "-100" - ) - @Export("Widget_containerHasUseOption") - public static boolean Widget_containerHasUseOption(int var0) { - return (var0 >> 31 & 1) != 0; + @Export("ServerPacket_values") + public static ServerPacket[] ServerPacket_values() { + return new ServerPacket[]{ServerPacket.field2164, ServerPacket.field2185, ServerPacket.field2200, ServerPacket.field2160, ServerPacket.field2161, ServerPacket.field2243, ServerPacket.field2163, ServerPacket.field2178, ServerPacket.field2189, ServerPacket.field2244, ServerPacket.field2167, ServerPacket.field2168, ServerPacket.field2169, ServerPacket.field2170, ServerPacket.field2171, ServerPacket.field2242, ServerPacket.field2173, ServerPacket.field2215, ServerPacket.field2175, ServerPacket.field2176, ServerPacket.field2177, ServerPacket.field2159, ServerPacket.field2179, ServerPacket.field2180, ServerPacket.field2219, ServerPacket.field2182, ServerPacket.field2197, ServerPacket.field2190, ServerPacket.field2166, ServerPacket.field2186, ServerPacket.field2187, ServerPacket.field2217, ServerPacket.field2195, ServerPacket.field2158, ServerPacket.field2191, ServerPacket.field2196, ServerPacket.field2193, ServerPacket.field2194, ServerPacket.field2214, ServerPacket.field2165, ServerPacket.field2204, ServerPacket.field2213, ServerPacket.field2199, ServerPacket.field2224, ServerPacket.field2201, ServerPacket.field2202, ServerPacket.field2203, ServerPacket.field2239, ServerPacket.field2205, ServerPacket.field2206, ServerPacket.field2207, ServerPacket.field2208, ServerPacket.field2209, ServerPacket.field2210, ServerPacket.field2211, ServerPacket.field2212, ServerPacket.field2229, ServerPacket.field2174, ServerPacket.field2222, ServerPacket.field2162, ServerPacket.field2172, ServerPacket.field2218, ServerPacket.field2227, ServerPacket.field2220, ServerPacket.field2221, ServerPacket.field2181, ServerPacket.field2223, ServerPacket.field2232, ServerPacket.field2225, ServerPacket.field2183, ServerPacket.field2184, ServerPacket.field2228, ServerPacket.field2234, ServerPacket.field2230, ServerPacket.field2231, ServerPacket.field2226, ServerPacket.field2233, ServerPacket.field2216, ServerPacket.field2235, ServerPacket.field2236, ServerPacket.field2237, ServerPacket.field2238, ServerPacket.field2188, ServerPacket.field2240, ServerPacket.field2241, ServerPacket.field2192}; // L: 95 } } diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index d311fcf7c8..7e5b866342 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -1,154 +1,345 @@ +import java.io.File; +import java.io.IOException; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("q") +@ObfuscatedName("s") final class class2 implements class0 { - @ObfuscatedName("qo") + @ObfuscatedName("ak") + @Export("client") @ObfuscatedSignature( - descriptor = "Ldt;" + descriptor = "Lclient;" ) - @Export("pcmPlayer0") - static PcmPlayer pcmPlayer0; + static Client client; + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/Object;Lkf;B)V", + garbageValue = "21" + ) + public void vmethod70(Object var1, Buffer var2) { + this.method25((Long)var1, var2); // L: 33 + } // L: 34 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lkf;I)Ljava/lang/Object;", + garbageValue = "-453860591" + ) + public Object vmethod61(Buffer var1) { + return var1.readLong(); // L: 29 + } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkn;B)V", + descriptor = "(Ljava/lang/Long;Lkf;B)V", + garbageValue = "-94" + ) + void method25(Long var1, Buffer var2) { + var2.writeLong(var1); // L: 25 + } // L: 26 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "([BB)Ljava/lang/String;", + garbageValue = "36" + ) + public static String method40(byte[] var0) { + return PlayerAppearance.method4116(var0, 0, var0.length); // L: 58 + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;Ljava/lang/String;ZI)Lmy;", + garbageValue = "-65308195" + ) + @Export("getPreferencesFile") + public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) { + File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat"); // L: 254 + if (var3.exists()) { // L: 255 + try { + AccessFile var10 = new AccessFile(var3, "rw", 10000L); // L: 257 + return var10; // L: 258 + } catch (IOException var9) { // L: 260 + } + } + + String var4 = ""; // L: 262 + if (SoundSystem.cacheGamebuild == 33) { // L: 263 + var4 = "_rc"; + } else if (SoundSystem.cacheGamebuild == 34) { // L: 264 + var4 = "_wip"; + } + + File var5 = new File(UserComparator2.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat"); // L: 265 + AccessFile var6; + if (!var2 && var5.exists()) { // L: 266 + try { + var6 = new AccessFile(var5, "rw", 10000L); // L: 268 + return var6; // L: 269 + } catch (IOException var8) { // L: 271 + } + } + + try { + var6 = new AccessFile(var3, "rw", 10000L); // L: 274 + return var6; // L: 275 + } catch (IOException var7) { // L: 277 + throw new RuntimeException(); // L: 278 + } + } + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Lky;IB)V", garbageValue = "0" ) - public void vmethod59(Object var1, Buffer var2) { - this.method23((Long)var1, var2); - } + @Export("updatePlayers") + static final void updatePlayers(PacketBuffer var0, int var1) { + int var2 = var0.offset; // L: 71 + Players.Players_pendingUpdateCount = 0; // L: 72 + int var3 = 0; // L: 74 + var0.importIndex(); // L: 75 + + byte[] var10000; + int var4; + int var6; + int var7; + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 76 + var7 = Players.Players_indices[var4]; // L: 77 + if ((Players.field1285[var7] & 1) == 0) { // L: 78 + if (var3 > 0) { // L: 79 + --var3; // L: 80 + var10000 = Players.field1285; // L: 81 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 84 + if (var6 == 0) { // L: 85 + var3 = Tiles.method1186(var0); // L: 86 + var10000 = Players.field1285; // L: 87 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + class225.readPlayerUpdate(var0, var7); // L: 90 + } + } + } + } + + var0.exportIndex(); // L: 93 + if (var3 != 0) { + throw new RuntimeException(); + } else { + var0.importIndex(); // L: 97 + + for (var4 = 0; var4 < Players.Players_count; ++var4) { // L: 98 + var7 = Players.Players_indices[var4]; // L: 99 + if ((Players.field1285[var7] & 1) != 0) { // L: 100 + if (var3 > 0) { // L: 101 + --var3; // L: 102 + var10000 = Players.field1285; // L: 103 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 106 + if (var6 == 0) { // L: 107 + var3 = Tiles.method1186(var0); // L: 108 + var10000 = Players.field1285; // L: 109 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + class225.readPlayerUpdate(var0, var7); // L: 112 + } + } + } + } + + var0.exportIndex(); // L: 115 + if (var3 != 0) { // L: 116 + throw new RuntimeException(); // L: 117 + } else { + var0.importIndex(); // L: 119 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 120 + var7 = Players.Players_emptyIndices[var4]; // L: 121 + if ((Players.field1285[var7] & 1) != 0) { // L: 122 + if (var3 > 0) { // L: 123 + --var3; // L: 124 + var10000 = Players.field1285; // L: 125 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 128 + if (var6 == 0) { // L: 129 + var3 = Tiles.method1186(var0); // L: 130 + var10000 = Players.field1285; // L: 131 + var10000[var7] = (byte)(var10000[var7] | 2); + } else if (FileSystem.updateExternalPlayer(var0, var7)) { // L: 134 + var10000 = Players.field1285; + var10000[var7] = (byte)(var10000[var7] | 2); + } + } + } + } + + var0.exportIndex(); // L: 137 + if (var3 != 0) { // L: 138 + throw new RuntimeException(); // L: 139 + } else { + var0.importIndex(); // L: 141 + + for (var4 = 0; var4 < Players.Players_emptyIdxCount; ++var4) { // L: 142 + var7 = Players.Players_emptyIndices[var4]; // L: 143 + if ((Players.field1285[var7] & 1) == 0) { // L: 144 + if (var3 > 0) { // L: 145 + --var3; // L: 146 + var10000 = Players.field1285; // L: 147 + var10000[var7] = (byte)(var10000[var7] | 2); + } else { + var6 = var0.readBits(1); // L: 150 + if (var6 == 0) { // L: 151 + var3 = Tiles.method1186(var0); // L: 152 + var10000 = Players.field1285; // L: 153 + var10000[var7] = (byte)(var10000[var7] | 2); + } else if (FileSystem.updateExternalPlayer(var0, var7)) { // L: 156 + var10000 = Players.field1285; + var10000[var7] = (byte)(var10000[var7] | 2); + } + } + } + } + + var0.exportIndex(); // L: 159 + if (var3 != 0) { // L: 160 + throw new RuntimeException(); // L: 161 + } else { + Players.Players_count = 0; // L: 163 + Players.Players_emptyIdxCount = 0; // L: 164 + + for (var4 = 1; var4 < 2048; ++var4) { // L: 165 + var10000 = Players.field1285; // L: 166 + var10000[var4] = (byte)(var10000[var4] >> 1); + Player var5 = Client.players[var4]; // L: 167 + if (var5 != null) { // L: 168 + Players.Players_indices[++Players.Players_count - 1] = var4; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var4; // L: 169 + } + } + + GrandExchangeOfferAgeComparator.method234(var0); // L: 172 + if (var0.offset - var2 != var1) { // L: 173 + throw new RuntimeException(var0.offset - var2 + " " + var1); // L: 174 + } + } + } + } + } + } // L: 176 @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lkn;B)Ljava/lang/Object;", - garbageValue = "114" + descriptor = "(I)V", + garbageValue = "-1849126177" ) - public Object vmethod47(Buffer var1) { - return var1.readLong(); - } + public static void method41() { + FloorOverlayDefinition.FloorOverlayDefinition_cached.clear(); // L: 94 + } // L: 95 - @ObfuscatedName("u") + @ObfuscatedName("x") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Long;Lkn;I)V", - garbageValue = "2145124737" + descriptor = "(Lct;Lct;IZI)I", + garbageValue = "-1471350049" ) - void method23(Long var1, Buffer var2) { - var2.writeLong(var1); - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(IS)I", - garbageValue = "-12961" - ) - @Export("getEntityIdUnderMouse") - public static int getEntityIdUnderMouse(int var0) { - return Language.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var0]); - } - - @ObfuscatedName("hi") - @ObfuscatedSignature( - descriptor = "(ZLkb;I)V", - garbageValue = "1542604247" - ) - @Export("updateNpcs") - static final void updateNpcs(boolean var0, PacketBuffer var1) { - Client.field687 = 0; - Client.field718 = 0; - UserList.method5333(); - - int var2; - while (var1.bitsRemaining(Client.packetWriter.serverPacketLength) >= 27) { - var2 = var1.readBits(15); - if (var2 == 32767) { - break; - } - - boolean var3 = false; - if (Client.npcs[var2] == null) { - Client.npcs[var2] = new NPC(); - var3 = true; - } - - NPC var4 = Client.npcs[var2]; - Client.npcIndices[++Client.npcCount - 1] = var2; - var4.npcCycle = Client.cycle; - int var5 = Client.defaultRotations[var1.readBits(3)]; - if (var3) { - var4.orientation = var4.rotation = var5; - } - - int var6 = var1.readBits(1); - int var7 = var1.readBits(1); - if (var7 == 1) { - Client.field719[++Client.field718 - 1] = var2; - } - - var4.definition = StudioGame.getNpcDefinition(var1.readBits(14)); - int var8; - if (var0) { - var8 = var1.readBits(8); - if (var8 > 127) { - var8 -= 256; + @Export("compareWorlds") + static int compareWorlds(World var0, World var1, int var2, boolean var3) { + if (var2 == 1) { // L: 211 + int var4 = var0.population; // L: 212 + int var5 = var1.population; // L: 213 + if (!var3) { // L: 214 + if (var4 == -1) { // L: 215 + var4 = 2001; } + + if (var5 == -1) { // L: 216 + var5 = 2001; + } + } + + return var4 - var5; // L: 218 + } else if (var2 == 2) { // L: 220 + return var0.location - var1.location; + } else if (var2 == 3) { // L: 221 + if (var0.activity.equals("-")) { // L: 222 + if (var1.activity.equals("-")) { // L: 223 + return 0; + } else { + return var3 ? -1 : 1; // L: 224 + } + } else if (var1.activity.equals("-")) { // L: 226 + return var3 ? 1 : -1; } else { - var8 = var1.readBits(5); - if (var8 > 15) { - var8 -= 32; - } + return var0.activity.compareTo(var1.activity); // L: 227 } - - int var9; - if (var0) { - var9 = var1.readBits(8); - if (var9 > 127) { - var9 -= 256; - } - } else { - var9 = var1.readBits(5); - if (var9 > 15) { - var9 -= 32; - } - } - - var4.field967 = var4.definition.size; - var4.field1017 = var4.definition.rotation; - if (var4.field1017 == 0) { - var4.rotation = 0; - } - - var4.walkSequence = var4.definition.walkSequence; - var4.walkBackSequence = var4.definition.walkBackSequence; - var4.walkLeftSequence = var4.definition.walkLeftSequence; - var4.walkRightSequence = var4.definition.walkRightSequence; - var4.idleSequence = var4.definition.idleSequence; - var4.turnLeftSequence = var4.definition.turnLeftSequence; - var4.turnRightSequence = var4.definition.turnRightSequence; - var4.method2142(class60.localPlayer.pathX[0] + var9, class60.localPlayer.pathY[0] + var8, var6 == 1); - } - - var1.exportIndex(); - BoundaryObject.method3389(var1); - - for (var2 = 0; var2 < Client.field687; ++var2) { - int var10 = Client.field907[var2]; - if (Client.npcs[var10].npcCycle != Client.cycle) { - Client.npcs[var10].definition = null; - Client.npcs[var10] = null; - } - } - - if (var1.offset != Client.packetWriter.serverPacketLength) { - throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); + } else if (var2 == 4) { // L: 229 + return var0.method1823() ? (var1.method1823() ? 0 : 1) : (var1.method1823() ? -1 : 0); + } else if (var2 == 5) { // L: 230 + return var0.method1821() ? (var1.method1821() ? 0 : 1) : (var1.method1821() ? -1 : 0); + } else if (var2 == 6) { // L: 231 + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } else if (var2 == 7) { // L: 232 + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); } else { - for (var2 = 0; var2 < Client.npcCount; ++var2) { - if (Client.npcs[Client.npcIndices[var2]] == null) { - throw new RuntimeException(var2 + "," + Client.npcCount); - } - } - + return var0.id - var1.id; // L: 233 } } + + @ObfuscatedName("b") + @ObfuscatedSignature( + descriptor = "(IZII)V", + garbageValue = "94812799" + ) + public static final void method37(int var0, boolean var1, int var2) { + if (var0 >= 8000 && var0 <= 48000) { // L: 45 + PcmPlayer.field1447 = var0; // L: 46 + PcmPlayer.PcmPlayer_stereo = var1; // L: 47 + Decimator.field1491 = var2; // L: 48 + } else { + throw new IllegalArgumentException(); + } + } // L: 49 + + @ObfuscatedName("hg") + @ObfuscatedSignature( + descriptor = "(Lcf;III)V", + garbageValue = "-1026866669" + ) + static final void method39(MenuAction var0, int var1, int var2) { + SecureRandomCallable.menuAction(var0.param0, var0.param1, var0.opcode, var0.identifier, var0.action, var0.action, var1, var2); // L: 7250 + } // L: 7251 + + @ObfuscatedName("hw") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-22039586" + ) + static void method24() { + for (int var0 = 0; var0 < Client.menuOptionsCount; ++var0) { // L: 8258 + if (LoginScreenAnimation.method1905(Client.menuOpcodes[var0])) { // L: 8259 + if (var0 < Client.menuOptionsCount - 1) { // L: 8260 + for (int var1 = var0; var1 < Client.menuOptionsCount - 1; ++var1) { // L: 8261 + Client.menuActions[var1] = Client.menuActions[var1 + 1]; // L: 8262 + Client.menuTargets[var1] = Client.menuTargets[var1 + 1]; // L: 8263 + Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1]; // L: 8264 + Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1]; // L: 8265 + Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1]; // L: 8266 + Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1]; // L: 8267 + Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1]; // L: 8268 + } + } + + --var0; // L: 8271 + --Client.menuOptionsCount; // L: 8272 + } + } + + GrandExchangeOfferTotalQuantityComparator.method164(); // L: 8275 + } // L: 8276 } diff --git a/runescape-client/src/main/java/class200.java b/runescape-client/src/main/java/class200.java index 8a55c56463..5e54ca23ff 100644 --- a/runescape-client/src/main/java/class200.java +++ b/runescape-client/src/main/java/class200.java @@ -1,45 +1,41 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gi") +@ObfuscatedName("gl") public class class200 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lgi;" + descriptor = "Lgl;" ) - static final class200 field2400; - @ObfuscatedName("o") + static final class200 field2402; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lgi;" - ) - static final class200 field2398; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lgi;" + descriptor = "Lgl;" ) static final class200 field2399; + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lgl;" + ) + static final class200 field2401; + @ObfuscatedName("bw") + static String field2403; static { - field2400 = new class200(); - field2398 = new class200(); - field2399 = new class200(); + field2402 = new class200(); // L: 4 + field2399 = new class200(); // L: 5 + field2401 = new class200(); // L: 6 } class200() { - } + } // L: 8 - @ObfuscatedName("ao") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(IZII)V", - garbageValue = "405257362" + descriptor = "(I)Z", + garbageValue = "-1315253613" ) - public static final void method3803(int var0, boolean var1, int var2) { - if (var0 >= 8000 && var0 <= 48000) { - class237.field3113 = var0; - Messages.PcmPlayer_stereo = var1; - UserComparator3.field2009 = var2; - } else { - throw new IllegalArgumentException(); - } + static final boolean method3760() { + return ViewportMouse.ViewportMouse_isInViewport; // L: 103 } } diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java index 652cf5c1e6..c8d4a52763 100644 --- a/runescape-client/src/main/java/class204.java +++ b/runescape-client/src/main/java/class204.java @@ -4,45 +4,131 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gk") +@ObfuscatedName("gg") public class class204 { - @ObfuscatedName("rd") + @ObfuscatedName("sm") @ObfuscatedGetter( - intValue = -815040413 + intValue = 326799997 ) - static int field2420; - @ObfuscatedName("y") - @ObfuscatedGetter( - intValue = 1826574669 + @Export("foundItemIdCount") + static int foundItemIdCount; + @ObfuscatedName("o") + @ObfuscatedSignature( + descriptor = "Lic;" ) - static int field2422; - @ObfuscatedName("ae") - @Export("fontHelvetica13") - static java.awt.Font fontHelvetica13; + @Export("musicTrackArchive") + public static AbstractArchive musicTrackArchive; + @ObfuscatedName("q") + static int[][][] field2421; static { new HashMap(); + } // L: 9 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(IB)Lir;", + garbageValue = "57" + ) + public static HealthBarDefinition method3780(int var0) { + HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); // L: 32 + if (var1 != null) { // L: 33 + return var1; + } else { + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); // L: 34 + var1 = new HealthBarDefinition(); // L: 35 + if (var2 != null) { // L: 36 + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); + return var1; // L: 38 + } } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1343176092" + descriptor = "(IIIB)Lcy;", + garbageValue = "-39" ) - public static int method3818(int var0, int var1) { - int var2; - if (var1 > var0) { - var2 = var0; - var0 = var1; - var1 = var2; + @Export("getWorldMapScript") + static Script getWorldMapScript(int var0, int var1, int var2) { + int var3 = class13.method129(var1, var0); // L: 37 + Script var5 = (Script)Script.Script_cached.get((long)(var3 << 16)); // L: 40 + Script var4; + if (var5 != null) { // L: 41 + var4 = var5; // L: 42 + } else { + String var6 = String.valueOf(var3); // L: 45 + int var7 = ApproximateRouteStrategy.archive12.getGroupId(var6); // L: 46 + if (var7 == -1) { // L: 47 + var4 = null; // L: 48 + } else { + label59: { + byte[] var8 = ApproximateRouteStrategy.archive12.takeFileFlat(var7); // L: 51 + if (var8 != null) { // L: 52 + if (var8.length <= 1) { // L: 53 + var4 = null; // L: 54 + break label59; // L: 55 + } + + var5 = UserComparator7.newScript(var8); // L: 57 + if (var5 != null) { // L: 58 + Script.Script_cached.put(var5, (long)(var3 << 16)); // L: 59 + var4 = var5; // L: 60 + break label59; // L: 61 + } + } + + var4 = null; // L: 64 + } + } } - while (var1 != 0) { - var2 = var0 % var1; - var0 = var1; - var1 = var2; - } + if (var4 != null) { // L: 67 + return var4; // L: 68 + } else { + int var12 = (var2 + 40000 << 8) + var0; // L: 72 + Script var14 = (Script)Script.Script_cached.get((long)(var12 << 16)); // L: 77 + Script var13; + if (var14 != null) { // L: 78 + var13 = var14; // L: 79 + } else { + String var9 = String.valueOf(var12); // L: 82 + int var10 = ApproximateRouteStrategy.archive12.getGroupId(var9); // L: 83 + if (var10 == -1) { // L: 84 + var13 = null; // L: 85 + } else { + byte[] var11 = ApproximateRouteStrategy.archive12.takeFileFlat(var10); // L: 88 + if (var11 != null) { // L: 89 + if (var11.length <= 1) { // L: 90 + var13 = null; // L: 91 + return var13 != null ? var13 : null; // L: 104 107 + } - return var0; + var14 = UserComparator7.newScript(var11); // L: 94 + if (var14 != null) { // L: 95 + Script.Script_cached.put(var14, (long)(var12 << 16)); // L: 96 + var13 = var14; // L: 97 + return var13 != null ? var13 : null; + } + } + + var13 = null; // L: 101 + } + } + + return var13 != null ? var13 : null; + } + } + + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "(CI)Z", + garbageValue = "-2091339129" + ) + @Export("isAlphaNumeric") + public static boolean isAlphaNumeric(char var0) { + return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z'; // L: 150 } } diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java index c5e341f48a..3929515018 100644 --- a/runescape-client/src/main/java/class206.java +++ b/runescape-client/src/main/java/class206.java @@ -3,70 +3,49 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("gs") +@ObfuscatedName("gi") public class class206 { - @ObfuscatedName("rz") - @ObfuscatedGetter( - intValue = 271631865 - ) - static int field2446; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("musicPatchesArchive") - public static AbstractArchive musicPatchesArchive; - @ObfuscatedName("o") + static AbstractArchive musicPatchesArchive; + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "Lic;" ) @Export("musicSamplesArchive") - public static AbstractArchive musicSamplesArchive; - @ObfuscatedName("q") + static AbstractArchive musicSamplesArchive; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lic;" + descriptor = "Lge;" ) - @Export("soundEffectsArchive") - public static AbstractArchive soundEffectsArchive; - @ObfuscatedName("p") + @Export("midiPcmStream") + public static MidiPcmStream midiPcmStream; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -164621127 + intValue = -1660292459 ) - public static int field2439; + @Export("musicPlayerStatus") + public static int musicPlayerStatus; + @ObfuscatedName("w") + @ObfuscatedGetter( + intValue = 1418179019 + ) + @Export("musicTrackFileId") + public static int musicTrackFileId; @ObfuscatedName("n") - @ObfuscatedGetter( - intValue = -897953079 + @Export("musicTrackBoolean") + public static boolean musicTrackBoolean; + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "Lhj;" ) - @Export("musicTrackGroupId") - public static int musicTrackGroupId; - @ObfuscatedName("a") - @ObfuscatedGetter( - intValue = 1138068073 - ) - @Export("musicTrackVolume") - public static int musicTrackVolume; - @ObfuscatedName("z") - @ObfuscatedGetter( - intValue = 2058854379 - ) - public static int field2442; + @Export("musicTrack") + static MusicTrack musicTrack; static { - field2439 = 0; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(IIIZIB)J", - garbageValue = "1" - ) - @Export("calculateTag") - public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { - long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; - if (var3) { - var5 |= 65536L; - } - - return var5; + musicPlayerStatus = 0; // L: 11 } } diff --git a/runescape-client/src/main/java/class217.java b/runescape-client/src/main/java/class217.java index 344a13e98d..07a3ebf811 100644 --- a/runescape-client/src/main/java/class217.java +++ b/runescape-client/src/main/java/class217.java @@ -1,69 +1,16 @@ +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hn") +@ObfuscatedName("hp") public class class217 { - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Lic;IIB)[Llz;", - garbageValue = "-104" + @ObfuscatedName("k") + @ObfuscatedGetter( + longValue = -8867725133040190249L ) - public static Sprite[] method4091(AbstractArchive var0, int var1, int var2) { - byte[] var4 = var0.takeFile(var1, var2); - boolean var3; - if (var4 == null) { - var3 = false; - } else { - class3.SpriteBuffer_decode(var4); - var3 = true; - } - - if (!var3) { - return null; - } else { - Sprite[] var5 = new Sprite[class335.SpriteBuffer_spriteCount]; - - for (int var6 = 0; var6 < class335.SpriteBuffer_spriteCount; ++var6) { - Sprite var7 = var5[var6] = new Sprite(); - var7.width = class335.SpriteBuffer_spriteWidth; - var7.height = UserComparator8.SpriteBuffer_spriteHeight; - var7.xOffset = class335.SpriteBuffer_xOffsets[var6]; - var7.yOffset = NPC.SpriteBuffer_yOffsets[var6]; - var7.subWidth = class335.SpriteBuffer_spriteWidths[var6]; - var7.subHeight = class335.SpriteBuffer_spriteHeights[var6]; - int var8 = var7.subHeight * var7.subWidth; - byte[] var9 = ItemDefinition.SpriteBuffer_pixels[var6]; - var7.pixels = new int[var8]; - - for (int var10 = 0; var10 < var8; ++var10) { - var7.pixels[var10] = class335.SpriteBuffer_spritePalette[var9[var10] & 255]; - } - } - - GrandExchangeEvent.method158(); - return var5; - } - } - - @ObfuscatedName("ja") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-1394672948" + static long field2536; + @ObfuscatedName("o") + @ObfuscatedGetter( + intValue = 596928763 ) - static final void method4092() { - PacketBufferNode var0 = UserComparator4.getPacketBufferNode(ClientPacket.field2265, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var0); - - for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) { - if (var1.type == 0 || var1.type == 3) { - class41.closeInterface(var1, true); - } - } - - if (Client.meslayerContinueWidget != null) { - class234.invalidateWidget(Client.meslayerContinueWidget); - Client.meslayerContinueWidget = null; - } - - } + static int field2537; } diff --git a/runescape-client/src/main/java/class219.java b/runescape-client/src/main/java/class219.java index f6fc34468b..ce91039588 100644 --- a/runescape-client/src/main/java/class219.java +++ b/runescape-client/src/main/java/class219.java @@ -1,67 +1,29 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hr") +@ObfuscatedName("ho") public class class219 { - @ObfuscatedName("m") + @ObfuscatedName("ns") + @ObfuscatedGetter( + intValue = -437484721 + ) + static int field2547; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lhe;" + descriptor = "Lht;" ) @Export("huffman") public static Huffman huffman; - @ObfuscatedName("ci") + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lbx;" + descriptor = "(II)Z", + garbageValue = "-1168903600" ) - @Export("mouseRecorder") - static MouseRecorder mouseRecorder; - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(B)[Lif;", - garbageValue = "0" - ) - static VerticalAlignment[] method4106() { - return new VerticalAlignment[]{VerticalAlignment.field3230, VerticalAlignment.VerticalAlignment_centered, VerticalAlignment.field3226}; - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(II)Liy;", - garbageValue = "1818836653" - ) - @Export("VarpDefinition_get") - public static VarpDefinition VarpDefinition_get(int var0) { - VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;I)I", - garbageValue = "527461459" - ) - @Export("hashString") - public static int hashString(CharSequence var0) { - int var1 = var0.length(); - int var2 = 0; - - for (int var3 = 0; var3 < var1; ++var3) { - var2 = (var2 << 5) - var2 + UserComparator3.charToByteCp1252(var0.charAt(var3)); - } - - return var2; + @Export("isWorldMapEvent") + public static boolean isWorldMapEvent(int var0) { + return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19 } } diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java index 559d2ef425..e8f27ae7c2 100644 --- a/runescape-client/src/main/java/class22.java +++ b/runescape-client/src/main/java/class22.java @@ -1,143 +1,68 @@ +import java.util.LinkedHashMap; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("x") +@ObfuscatedName("p") public class class22 { - @ObfuscatedName("gf") - @ObfuscatedGetter( - intValue = -1318000387 - ) - static int field104; + @ObfuscatedName("w") + static byte[][][] field122; - @ObfuscatedName("m") + @ObfuscatedName("fj") @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "4320081" + descriptor = "(ZI)V", + garbageValue = "-680563104" ) - public static int method227(int var0, int var1) { - int var2; - for (var2 = 1; var1 > 1; var1 >>= 1) { - if ((var1 & 1) != 0) { - var2 = var0 * var2; + static final void method245(boolean var0) { + if (var0) { // L: 2596 + Client.field710 = Login.field1223 ? class169.field2046 : class169.field2044; // L: 2597 + } else { + LinkedHashMap var1 = Tile.clientPreferences.parameters; // L: 2600 + String var3 = Login.Login_username; // L: 2602 + int var4 = var3.length(); // L: 2604 + int var5 = 0; // L: 2605 + + for (int var6 = 0; var6 < var4; ++var6) { // L: 2606 + var5 = (var5 << 5) - var5 + var3.charAt(var6); } - var0 *= var0; + Client.field710 = var1.containsKey(var5) ? class169.field2045 : class169.field2043; // L: 2609 } - if (var1 == 1) { - return var0 * var2; + } // L: 2611 + + @ObfuscatedName("gv") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "-916071017" + ) + static final int method244() { + if (Tile.clientPreferences.roofsHidden) { // L: 4394 + return Huffman.Client_plane; } else { - return var2; + int var0 = ArchiveLoader.getTileHeight(VertexNormal.cameraX, AbstractWorldMapData.cameraZ, Huffman.Client_plane); // L: 4395 + return var0 - FaceNormal.cameraY < 800 && (Tiles.Tiles_renderFlags[Huffman.Client_plane][VertexNormal.cameraX >> 7][AbstractWorldMapData.cameraZ >> 7] & 4) != 0 ? Huffman.Client_plane : 3; // L: 4396 4397 } } - @ObfuscatedName("j") + @ObfuscatedName("hq") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1618940930" + descriptor = "(S)V", + garbageValue = "31538" ) - static void method225() { - if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { - Login.currentLoginField = 1; - } else { - Login.currentLoginField = 0; + @Export("Widget_runOnTargetLeave") + static void Widget_runOnTargetLeave() { + if (Client.isSpellSelected) { // L: 8116 + Widget var0 = SecureRandomCallable.getWidgetChild(class232.selectedSpellWidget, Client.selectedSpellChildIndex); // L: 8117 + if (var0 != null && var0.onTargetLeave != null) { // L: 8118 + ScriptEvent var1 = new ScriptEvent(); // L: 8119 + var1.widget = var0; // L: 8120 + var1.args = var0.onTargetLeave; // L: 8121 + Script.runScriptEvent(var1); // L: 8122 + } + + Client.isSpellSelected = false; // L: 8124 + class52.invalidateWidget(var0); // L: 8125 } - - } - - @ObfuscatedName("fe") - @ObfuscatedSignature( - descriptor = "(IB)V", - garbageValue = "1" - ) - @Export("getLoginError") - static void getLoginError(int var0) { - if (var0 == -3) { - MusicPatchPcmStream.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); - } else if (var0 == -2) { - MusicPatchPcmStream.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); - } else if (var0 == -1) { - MusicPatchPcmStream.setLoginResponseString("No response from server.", "Please try using a different world.", ""); - } else if (var0 == 3) { - Login.loginIndex = 3; - Login.field1213 = 1; - } else if (var0 == 4) { - Buddy.method5349(0); - } else if (var0 == 5) { - Login.field1213 = 2; - MusicPatchPcmStream.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); - } else if (var0 == 68 || !Client.onMobile && var0 == 6) { - MusicPatchPcmStream.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); - } else if (var0 == 7) { - MusicPatchPcmStream.setLoginResponseString("This world is full.", "Please use a different world.", ""); - } else if (var0 == 8) { - MusicPatchPcmStream.setLoginResponseString("Unable to connect.", "Login server offline.", ""); - } else if (var0 == 9) { - MusicPatchPcmStream.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); - } else if (var0 == 10) { - MusicPatchPcmStream.setLoginResponseString("Unable to connect.", "Bad session id.", ""); - } else if (var0 == 11) { - MusicPatchPcmStream.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); - } else if (var0 == 12) { - MusicPatchPcmStream.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); - } else if (var0 == 13) { - MusicPatchPcmStream.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); - } else if (var0 == 14) { - MusicPatchPcmStream.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 16) { - MusicPatchPcmStream.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); - } else if (var0 == 17) { - MusicPatchPcmStream.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); - } else if (var0 == 18) { - Buddy.method5349(1); - } else if (var0 == 19) { - MusicPatchPcmStream.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); - } else if (var0 == 20) { - MusicPatchPcmStream.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); - } else if (var0 == 22) { - MusicPatchPcmStream.setLoginResponseString("Malformed login packet.", "Please try again.", ""); - } else if (var0 == 23) { - MusicPatchPcmStream.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); - } else if (var0 == 24) { - MusicPatchPcmStream.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); - } else if (var0 == 25) { - MusicPatchPcmStream.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); - } else if (var0 == 26) { - MusicPatchPcmStream.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); - } else if (var0 == 27) { - MusicPatchPcmStream.setLoginResponseString("", "Service unavailable.", ""); - } else if (var0 == 31) { - MusicPatchPcmStream.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); - } else if (var0 == 32) { - MusicPatchPcmStream.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); - } else if (var0 == 37) { - MusicPatchPcmStream.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); - } else if (var0 == 38) { - MusicPatchPcmStream.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); - } else if (var0 == 55) { - Login.loginIndex = 8; - } else { - if (var0 == 56) { - MusicPatchPcmStream.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); - ClientPreferences.updateGameState(11); - return; - } - - if (var0 == 57) { - MusicPatchPcmStream.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); - ClientPreferences.updateGameState(11); - return; - } - - if (var0 == 61) { - Login.loginIndex = 7; - } else { - MusicPatchPcmStream.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); - } - } - - ClientPreferences.updateGameState(10); - } + } // L: 8126 } diff --git a/runescape-client/src/main/java/class224.java b/runescape-client/src/main/java/class224.java index d35ca5db20..b3d2801879 100644 --- a/runescape-client/src/main/java/class224.java +++ b/runescape-client/src/main/java/class224.java @@ -2,44 +2,85 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hx") +@ObfuscatedName("hc") public class class224 { - @ObfuscatedName("m") - public static final short[] field2579; - @ObfuscatedName("o") - public static final short[][] field2580; - @ObfuscatedName("q") + @ObfuscatedName("z") + public static final short[] field2587; + @ObfuscatedName("k") + public static final short[][] field2589; + @ObfuscatedName("s") public static final short[] field2584; - @ObfuscatedName("j") - public static final short[][] field2582; + @ObfuscatedName("t") + public static final short[][] field2586; + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "Lkf;" + ) + @Export("NetCache_responseArchiveBuffer") + static Buffer NetCache_responseArchiveBuffer; static { - field2579 = new short[]{6798, 8741, 25238, 4626, 4550}; - field2580 = 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, 17050, 0, 127, -31821, -17991}}; - field2584 = new short[]{-10304, 9104, -1, -1, -1}; - field2582 = 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]}; + field2587 = new short[]{6798, 8741, 25238, 4626, 4550}; // L: 4 + field2589 = 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, 17050, 0, 127, -31821, -17991}}; // L: 5 + field2584 = new short[]{-10304, 9104, -1, -1, -1}; // L: 12 + field2586 = 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]}; // L: 13 } @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(IB)Lje;", - garbageValue = "-100" + descriptor = "([BIIB)Z", + garbageValue = "61" ) - @Export("StructDefinition_getStructDefinition") - public static StructDefinition StructDefinition_getStructDefinition(int var0) { - StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + static final boolean method4117(byte[] var0, int var1, int var2) { + boolean var3 = true; // L: 165 + Buffer var4 = new Buffer(var0); // L: 166 + int var5 = -1; // L: 167 + + label70: + while (true) { + int var6 = var4.method5632(); // L: 169 + if (var6 == 0) { // L: 170 + return var3; // L: 201 } - var1.postDecode(); - StructDefinition.StructDefinition_cached.put(var1, (long)var0); - return var1; + var5 += var6; // L: 171 + int var7 = 0; // L: 172 + boolean var8 = false; // L: 173 + + while (true) { + int var9; + while (!var8) { // L: 175 + var9 = var4.readUShortSmart(); // L: 181 + if (var9 == 0) { // L: 182 + continue label70; + } + + var7 += var9 - 1; // L: 183 + int var10 = var7 & 63; // L: 184 + int var11 = var7 >> 6 & 63; // L: 185 + int var12 = var4.readUnsignedByte() >> 2; // L: 186 + int var13 = var11 + var1; // L: 187 + int var14 = var10 + var2; // L: 188 + if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { // L: 189 + ObjectDefinition var15 = MidiPcmStream.getObjectDefinition(var5); // L: 190 + if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { // L: 191 + if (!var15.needsModelFiles()) { // L: 192 + ++Client.field895; // L: 193 + var3 = false; // L: 194 + } + + var8 = true; // L: 196 + } + } + } + + var9 = var4.readUShortSmart(); // L: 176 + if (var9 == 0) { // L: 177 + break; + } + + var4.readUnsignedByte(); // L: 178 + } } } } diff --git a/runescape-client/src/main/java/class225.java b/runescape-client/src/main/java/class225.java index dfba2c3e91..3b2bde4290 100644 --- a/runescape-client/src/main/java/class225.java +++ b/runescape-client/src/main/java/class225.java @@ -3,23 +3,227 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hw") +@ObfuscatedName("hu") public class class225 { - @ObfuscatedName("t") - static String field2587; - @ObfuscatedName("im") + @ObfuscatedName("rs") @ObfuscatedGetter( - intValue = 1529364225 + intValue = -1663268255 ) - @Export("oculusOrbFocalPointX") - static int oculusOrbFocalPointX; + static int field2592; - @ObfuscatedName("iu") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)Ljava/lang/String;", - garbageValue = "950917676" + descriptor = "(Lic;B)V", + garbageValue = "-88" ) - static final String method4182(int var0) { - return var0 < 999999999 ? Integer.toString(var0) : "*"; - } + public static void method4129(AbstractArchive var0) { + EnumDefinition.EnumDefinition_archive = var0; // L: 25 + } // L: 26 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(Lky;II)V", + garbageValue = "2025973106" + ) + @Export("readPlayerUpdate") + static void readPlayerUpdate(PacketBuffer var0, int var1) { + boolean var2 = var0.readBits(1) == 1; // L: 189 + if (var2) { // L: 190 + Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; + } + + int var3 = var0.readBits(2); // L: 191 + Player var4 = Client.players[var1]; // L: 192 + if (var3 == 0) { // L: 193 + if (var2) { // L: 194 + var4.field660 = false; // L: 195 + } else if (Client.localPlayerIndex == var1) { // L: 198 + throw new RuntimeException(); + } else { + Players.Players_regions[var1] = (var4.plane << 28) + (WorldMapManager.baseX + var4.pathX[0] >> 13 << 14) + (WorldMapLabel.baseY + var4.pathY[0] >> 13); // L: 199 + if (var4.field1000 != -1) { // L: 200 + Players.Players_orientations[var1] = var4.field1000; + } else { + Players.Players_orientations[var1] = var4.orientation; // L: 201 + } + + Players.Players_targetIndices[var1] = var4.targetIndex; // L: 202 + Client.players[var1] = null; // L: 203 + if (var0.readBits(1) != 0) { // L: 204 + FileSystem.updateExternalPlayer(var0, var1); + } + + } + } else { + int var5; + int var6; + int var7; + if (var3 == 1) { // L: 207 + var5 = var0.readBits(3); // L: 208 + var6 = var4.pathX[0]; // L: 209 + var7 = var4.pathY[0]; // L: 210 + if (var5 == 0) { // L: 211 + --var6; // L: 212 + --var7; // L: 213 + } else if (var5 == 1) { // L: 215 + --var7; + } else if (var5 == 2) { // L: 216 + ++var6; // L: 217 + --var7; // L: 218 + } else if (var5 == 3) { // L: 220 + --var6; + } else if (var5 == 4) { // L: 221 + ++var6; + } else if (var5 == 5) { // L: 222 + --var6; // L: 223 + ++var7; // L: 224 + } else if (var5 == 6) { // L: 226 + ++var7; + } else if (var5 == 7) { // L: 227 + ++var6; // L: 228 + ++var7; // L: 229 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 231 + var4.resetPath(var6, var7); // L: 232 + var4.field660 = false; // L: 233 + } else if (var2) { // L: 235 + var4.field660 = true; // L: 236 + var4.tileX = var6; // L: 237 + var4.tileY = var7; // L: 238 + } else { + var4.field660 = false; // L: 241 + var4.method1286(var6, var7, Players.field1284[var1]); // L: 242 + } + + } else if (var3 == 2) { // L: 246 + var5 = var0.readBits(4); // L: 247 + var6 = var4.pathX[0]; // L: 248 + var7 = var4.pathY[0]; // L: 249 + if (var5 == 0) { // L: 250 + var6 -= 2; // L: 251 + var7 -= 2; // L: 252 + } else if (var5 == 1) { // L: 254 + --var6; // L: 255 + var7 -= 2; // L: 256 + } else if (var5 == 2) { // L: 258 + var7 -= 2; + } else if (var5 == 3) { // L: 259 + ++var6; // L: 260 + var7 -= 2; // L: 261 + } else if (var5 == 4) { // L: 263 + var6 += 2; // L: 264 + var7 -= 2; // L: 265 + } else if (var5 == 5) { // L: 267 + var6 -= 2; // L: 268 + --var7; // L: 269 + } else if (var5 == 6) { // L: 271 + var6 += 2; // L: 272 + --var7; // L: 273 + } else if (var5 == 7) { // L: 275 + var6 -= 2; + } else if (var5 == 8) { // L: 276 + var6 += 2; + } else if (var5 == 9) { // L: 277 + var6 -= 2; // L: 278 + ++var7; // L: 279 + } else if (var5 == 10) { // L: 281 + var6 += 2; // L: 282 + ++var7; // L: 283 + } else if (var5 == 11) { // L: 285 + var6 -= 2; // L: 286 + var7 += 2; // L: 287 + } else if (var5 == 12) { // L: 289 + --var6; // L: 290 + var7 += 2; // L: 291 + } else if (var5 == 13) { // L: 293 + var7 += 2; + } else if (var5 == 14) { // L: 294 + ++var6; // L: 295 + var7 += 2; // L: 296 + } else if (var5 == 15) { // L: 298 + var6 += 2; // L: 299 + var7 += 2; // L: 300 + } + + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 302 + var4.resetPath(var6, var7); // L: 303 + var4.field660 = false; // L: 304 + } else if (var2) { // L: 306 + var4.field660 = true; // L: 307 + var4.tileX = var6; // L: 308 + var4.tileY = var7; // L: 309 + } else { + var4.field660 = false; // L: 312 + var4.method1286(var6, var7, Players.field1284[var1]); // L: 313 + } + + } else { + var5 = var0.readBits(1); // L: 317 + int var8; + int var9; + int var10; + int var11; + if (var5 == 0) { // L: 318 + var6 = var0.readBits(12); // L: 319 + var7 = var6 >> 10; // L: 320 + var8 = var6 >> 5 & 31; // L: 321 + if (var8 > 15) { // L: 322 + var8 -= 32; + } + + var9 = var6 & 31; // L: 323 + if (var9 > 15) { // L: 324 + var9 -= 32; + } + + var10 = var8 + var4.pathX[0]; // L: 325 + var11 = var9 + var4.pathY[0]; // L: 326 + if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { // L: 327 + if (var2) { // L: 331 + var4.field660 = true; // L: 332 + var4.tileX = var10; // L: 333 + var4.tileY = var11; // L: 334 + } else { + var4.field660 = false; // L: 337 + var4.method1286(var10, var11, Players.field1284[var1]); // L: 338 + } + } else { + var4.resetPath(var10, var11); // L: 328 + var4.field660 = false; // L: 329 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 340 + if (Client.localPlayerIndex == var1) { // L: 341 + Huffman.Client_plane = var4.plane; + } + + } else { + var6 = var0.readBits(30); // L: 344 + var7 = var6 >> 28; // L: 345 + var8 = var6 >> 14 & 16383; // L: 346 + var9 = var6 & 16383; // L: 347 + var10 = (var8 + WorldMapManager.baseX + var4.pathX[0] & 16383) - WorldMapManager.baseX; // L: 348 + var11 = (var9 + WorldMapLabel.baseY + var4.pathY[0] & 16383) - WorldMapLabel.baseY; // L: 349 + if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { // L: 350 + var4.resetPath(var10, var11); // L: 351 + var4.field660 = false; // L: 352 + } else if (var2) { // L: 354 + var4.field660 = true; // L: 355 + var4.tileX = var10; // L: 356 + var4.tileY = var11; // L: 357 + } else { + var4.field660 = false; // L: 360 + var4.method1286(var10, var11, Players.field1284[var1]); // L: 361 + } + + var4.plane = (byte)(var7 + var4.plane & 3); // L: 363 + if (Client.localPlayerIndex == var1) { // L: 364 + Huffman.Client_plane = var4.plane; + } + + } + } + } + } // L: 196 205 244 315 342 365 } diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java index 9e963259ff..524b8af21c 100644 --- a/runescape-client/src/main/java/class227.java +++ b/runescape-client/src/main/java/class227.java @@ -1,10 +1,177 @@ -import java.util.concurrent.ScheduledExecutorService; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hu") +@ObfuscatedName("hs") public class class227 { - @ObfuscatedName("u") - @Export("soundSystemExecutor") - static ScheduledExecutorService soundSystemExecutor; + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = 775643589 + ) + @Export("ItemDefinition_fileCount") + public static int ItemDefinition_fileCount; + @ObfuscatedName("n") + @ObfuscatedSignature( + descriptor = "Lls;" + ) + @Export("options_buttons_0Sprite") + static IndexedSprite options_buttons_0Sprite; + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(CI)B", + garbageValue = "-636086719" + ) + @Export("charToByteCp1252") + public static byte charToByteCp1252(char var0) { + byte var1; + if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) { // L: 12 + var1 = (byte)var0; + } else if (var0 == 8364) { // L: 13 + var1 = -128; + } else if (var0 == 8218) { + var1 = -126; + } else if (var0 == 402) { // L: 15 + var1 = -125; + } else if (var0 == 8222) { + var1 = -124; + } else if (var0 == 8230) { // L: 17 + var1 = -123; + } else if (var0 == 8224) { + var1 = -122; + } else if (var0 == 8225) { + var1 = -121; + } else if (var0 == 710) { + var1 = -120; + } else if (var0 == 8240) { // L: 21 + var1 = -119; + } else if (var0 == 352) { + var1 = -118; + } else if (var0 == 8249) { // L: 23 + var1 = -117; + } else if (var0 == 338) { // L: 24 + var1 = -116; + } else if (var0 == 381) { // L: 25 + var1 = -114; + } else if (var0 == 8216) { // L: 26 + var1 = -111; + } else if (var0 == 8217) { + var1 = -110; + } else if (var0 == 8220) { // L: 28 + var1 = -109; + } else if (var0 == 8221) { + var1 = -108; + } else if (var0 == 8226) { // L: 30 + var1 = -107; + } else if (var0 == 8211) { + var1 = -106; + } else if (var0 == 8212) { // L: 32 + var1 = -105; + } else if (var0 == 732) { // L: 33 + var1 = -104; + } else if (var0 == 8482) { // L: 34 + var1 = -103; + } else if (var0 == 353) { // L: 35 + var1 = -102; + } else if (var0 == 8250) { // L: 36 + var1 = -101; + } else if (var0 == 339) { // L: 37 + var1 = -100; + } else if (var0 == 382) { // L: 38 + var1 = -98; + } else if (var0 == 376) { // L: 39 + var1 = -97; + } else { + var1 = 63; // L: 40 + } + + return var1; // L: 41 + } + + @ObfuscatedName("z") + @Export("sleepExact") + public static final void sleepExact(long var0) { + if (var0 > 0L) { // L: 9 + if (0L == var0 % 10L) { // L: 10 + long var2 = var0 - 1L; // L: 11 + + try { + Thread.sleep(var2); // L: 14 + } catch (InterruptedException var8) { // L: 16 + } + + try { + Thread.sleep(1L); + } catch (InterruptedException var7) { // L: 22 + } + } else { + try { + Thread.sleep(var0); // L: 27 + } catch (InterruptedException var6) { // L: 29 + } + } + + } + } // L: 31 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lic;I)V", + garbageValue = "-330609994" + ) + public static void method4185(AbstractArchive var0) { + VarpDefinition.VarpDefinition_archive = var0; // L: 18 + VarpDefinition.VarpDefinition_fileCount = VarpDefinition.VarpDefinition_archive.getGroupFileCount(16); // L: 19 + } // L: 20 + + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "(IIIZII)J", + garbageValue = "-1245700740" + ) + @Export("calculateTag") + public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) { + long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 80 + if (var3) { // L: 81 + var5 |= 65536L; + } + + return var5; // L: 82 + } + + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "(Ler;IIII)Z", + garbageValue = "-319500223" + ) + static final boolean method4186(Model var0, int var1, int var2, int var3) { + if (!class200.method3760()) { // L: 143 + return false; + } else { + PlatformInfo.method6411(); // L: 144 + int var4 = var0.xMid + var1; // L: 145 + int var5 = var2 + var0.yMid; // L: 146 + int var6 = var3 + var0.zMid; // L: 147 + int var7 = var0.xMidOffset; // L: 148 + int var8 = var0.yMidOffset; // L: 149 + int var9 = var0.zMidOffset; // L: 150 + int var10 = ViewportMouse.field1768 - var4; // L: 151 + int var11 = class217.field2537 - var5; // L: 152 + int var12 = ViewportMouse.field1769 - var6; // L: 153 + if (Math.abs(var10) > var7 + class3.field25) { // L: 154 + return false; // L: 155 + } else if (Math.abs(var11) > var8 + class234.field3100) { // L: 157 + return false; // L: 158 + } else if (Math.abs(var12) > var9 + ViewportMouse.field1771) { // L: 160 + return false; // L: 161 + } else if (Math.abs(var12 * WorldMapSectionType.field178 - var11 * ViewportMouse.field1770) > var9 * class234.field3100 + var8 * ViewportMouse.field1771) { // L: 163 + return false; // L: 164 + } else if (Math.abs(var10 * ViewportMouse.field1770 - var12 * SpriteMask.field2552) > var7 * ViewportMouse.field1771 + var9 * class3.field25) { // L: 166 + return false; // L: 167 + } else { + return Math.abs(var11 * SpriteMask.field2552 - var10 * WorldMapSectionType.field178) <= var8 * class3.field25 + var7 * class234.field3100; // L: 169 + } + } + } } diff --git a/runescape-client/src/main/java/class228.java b/runescape-client/src/main/java/class228.java index f1d2bc8268..6427762404 100644 --- a/runescape-client/src/main/java/class228.java +++ b/runescape-client/src/main/java/class228.java @@ -1,52 +1,23 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ho") +@ObfuscatedName("hr") public class class228 { - @ObfuscatedName("se") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "Lma;" + descriptor = "(Ljava/lang/CharSequence;II)I", + garbageValue = "-541975328" ) - @Export("worldMap") - static WorldMap worldMap; - @ObfuscatedName("bn") + public static int method4190(CharSequence var0, int var1) { + return UserComparator7.parseIntCustomRadix(var0, var1, true); // L: 71 + } + + @ObfuscatedName("bj") @ObfuscatedSignature( - descriptor = "[Llh;" + descriptor = "(Ljava/lang/String;I)I", + garbageValue = "1840634740" ) - @Export("worldSelectStars") - static IndexedSprite[] worldSelectStars; - @ObfuscatedName("bc") - @ObfuscatedGetter( - intValue = 1895952065 - ) - static int field2754; - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(ILlp;Lig;B)V", - garbageValue = "-8" - ) - static void method4262(int var0, ArchiveDisk var1, Archive var2) { - ArchiveDiskAction var3 = new ArchiveDiskAction(); - var3.type = 1; - var3.key = (long)var0; - var3.archiveDisk = var1; - var3.archive = var2; - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); - } - - synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) { - if (ArchiveDiskActionHandler.field3181 == 0) { - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler()); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setDaemon(true); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.start(); - ArchiveDiskActionHandler.ArchiveDiskActionHandler_thread.setPriority(5); - } - - ArchiveDiskActionHandler.field3181 = 600; - } + public static int method4189(String var0) { + return var0.length() + 2; // L: 130 } } diff --git a/runescape-client/src/main/java/class23.java b/runescape-client/src/main/java/class23.java index ee12903cfc..2abc03f36d 100644 --- a/runescape-client/src/main/java/class23.java +++ b/runescape-client/src/main/java/class23.java @@ -1,885 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("b") public class class23 { - @ObfuscatedName("eh") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1074751797" + @ObfuscatedName("ez") + @ObfuscatedGetter( + intValue = 121218585 ) - static void method230(int var0, int var1) { - int[] var2 = new int[9]; - - for (int var3 = 0; var3 < var2.length; ++var3) { - int var4 = var3 * 32 + 15 + 128; - int var5 = var4 * 3 + 600; - int var7 = Rasterizer3D.Rasterizer3D_sine[var4]; - int var9 = var1 - 334; - if (var9 < 0) { - var9 = 0; - } else if (var9 > 100) { - var9 = 100; - } - - int var10 = (Client.zoomWidth - Client.zoomHeight) * var9 / 100 + Client.zoomHeight; - int var8 = var10 * var5 / 256; - var2[var3] = var8 * var7 >> 16; - } - - Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334); - } - - @ObfuscatedName("ge") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1693964297" - ) - static final void method229() { - class303.method5528(false); - Client.field822 = 0; - boolean var0 = true; - - int var1; - for (var1 = 0; var1 < class90.regionLandArchives.length; ++var1) { - if (StudioGame.regionMapArchiveIds[var1] != -1 && class90.regionLandArchives[var1] == null) { - class90.regionLandArchives[var1] = WorldMapRectangle.archive5.takeFile(StudioGame.regionMapArchiveIds[var1], 0); - if (class90.regionLandArchives[var1] == null) { - var0 = false; - ++Client.field822; - } - } - - if (class52.regionLandArchiveIds[var1] != -1 && class1.regionMapArchives[var1] == null) { - class1.regionMapArchives[var1] = WorldMapRectangle.archive5.takeFileEncrypted(class52.regionLandArchiveIds[var1], 0, WorldMapData_1.xteaKeys[var1]); - if (class1.regionMapArchives[var1] == null) { - var0 = false; - ++Client.field822; - } - } - } - - if (!var0) { - Client.field809 = 1; - } else { - Client.field690 = 0; - var0 = true; - - int var3; - int var4; - for (var1 = 0; var1 < class90.regionLandArchives.length; ++var1) { - byte[] var2 = class1.regionMapArchives[var1]; - if (var2 != null) { - var3 = (class41.regions[var1] >> 8) * 64 - class182.baseX; - var4 = (class41.regions[var1] & 255) * 64 - SecureRandomFuture.baseY; - if (Client.isInInstance) { - var3 = 10; - var4 = 10; - } - - var0 &= class235.method4281(var2, var3, var4); - } - } - - if (!var0) { - Client.field809 = 2; - } else { - if (Client.field809 != 0) { - ArchiveDiskActionHandler.drawLoadingMessage("Loading - please wait." + "
" + " (" + 100 + "%" + ")", true); - } - - Timer.playPcmPlayers(); - UserComparator3.scene.clear(); - - for (var1 = 0; var1 < 4; ++var1) { - Client.collisionMaps[var1].clear(); - } - - int var46; - for (var1 = 0; var1 < 4; ++var1) { - for (var46 = 0; var46 < 104; ++var46) { - for (var3 = 0; var3 < 104; ++var3) { - Tiles.Tiles_renderFlags[var1][var46][var3] = 0; - } - } - } - - Timer.playPcmPlayers(); - Tiles.Tiles_minPlane = 99; - Tiles.field530 = new byte[4][104][104]; - Tiles.field524 = new byte[4][104][104]; - Tiles.field525 = new byte[4][104][104]; - WorldMapLabel.field269 = new byte[4][104][104]; - HealthBarUpdate.field1031 = new int[4][105][105]; - class171.field2036 = new byte[4][105][105]; - Tiles.field526 = new int[105][105]; - BuddyRankComparator.Tiles_hue = new int[104]; - GrandExchangeOfferAgeComparator.Tiles_saturation = new int[104]; - TextureProvider.Tiles_lightness = new int[104]; - class237.Tiles_hueMultiplier = new int[104]; - WorldMapRectangle.field198 = new int[104]; - var1 = class90.regionLandArchives.length; - - for (ObjectSound var60 = (ObjectSound)ObjectSound.objectSounds.last(); var60 != null; var60 = (ObjectSound)ObjectSound.objectSounds.previous()) { - if (var60.stream1 != null) { - class60.pcmStreamMixer.removeSubStream(var60.stream1); - var60.stream1 = null; - } - - if (var60.stream2 != null) { - class60.pcmStreamMixer.removeSubStream(var60.stream2); - var60.stream2 = null; - } - } - - ObjectSound.objectSounds.clear(); - class303.method5528(true); - int var6; - int var7; - int var9; - int var10; - int var11; - int var12; - int[] var10000; - int var48; - if (!Client.isInInstance) { - byte[] var5; - for (var46 = 0; var46 < var1; ++var46) { - var3 = (class41.regions[var46] >> 8) * 64 - class182.baseX; - var4 = (class41.regions[var46] & 255) * 64 - SecureRandomFuture.baseY; - var5 = class90.regionLandArchives[var46]; - if (var5 != null) { - Timer.playPcmPlayers(); - var6 = WorldMapCacheName.field328 * 8 - 48; - var7 = class22.field104 * 8 - 48; - CollisionMap[] var8 = Client.collisionMaps; - - for (var9 = 0; var9 < 4; ++var9) { - for (var10 = 0; var10 < 64; ++var10) { - for (var11 = 0; var11 < 64; ++var11) { - if (var10 + var3 > 0 && var3 + var10 < 103 && var11 + var4 > 0 && var4 + var11 < 103) { - var10000 = var8[var9].flags[var10 + var3]; - var10000[var4 + var11] &= -16777217; - } - } - } - } - - Buffer var47 = new Buffer(var5); - - for (var10 = 0; var10 < 4; ++var10) { - for (var11 = 0; var11 < 64; ++var11) { - for (var12 = 0; var12 < 64; ++var12) { - AbstractArchive.loadTerrain(var47, var10, var3 + var11, var4 + var12, var6, var7, 0); - } - } - } - } - } - - for (var46 = 0; var46 < var1; ++var46) { - var3 = (class41.regions[var46] >> 8) * 64 - class182.baseX; - var4 = (class41.regions[var46] & 255) * 64 - SecureRandomFuture.baseY; - var5 = class90.regionLandArchives[var46]; - if (var5 == null && class22.field104 < 800) { - Timer.playPcmPlayers(); - GrandExchangeEvent.method153(var3, var4, 64, 64); - } - } - - class303.method5528(true); - - for (var46 = 0; var46 < var1; ++var46) { - byte[] var50 = class1.regionMapArchives[var46]; - if (var50 != null) { - var4 = (class41.regions[var46] >> 8) * 64 - class182.baseX; - var48 = (class41.regions[var46] & 255) * 64 - SecureRandomFuture.baseY; - Timer.playPcmPlayers(); - WorldMapRegion.method520(var50, var4, var48, UserComparator3.scene, Client.collisionMaps); - } - } - } - - int var49; - if (Client.isInInstance) { - for (var46 = 0; var46 < 4; ++var46) { - Timer.playPcmPlayers(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - boolean var68 = false; - var6 = Client.instanceChunkTemplates[var46][var3][var4]; - if (var6 != -1) { - var7 = var6 >> 24 & 3; - var49 = var6 >> 1 & 3; - var9 = var6 >> 14 & 1023; - var10 = var6 >> 3 & 2047; - var11 = (var9 / 8 << 8) + var10 / 8; - - for (var12 = 0; var12 < class41.regions.length; ++var12) { - if (class41.regions[var12] == var11 && class90.regionLandArchives[var12] != null) { - LoginScreenAnimation.method1879(class90.regionLandArchives[var12], var46, var3 * 8, var4 * 8, var7, (var9 & 7) * 8, (var10 & 7) * 8, var49, Client.collisionMaps); - var68 = true; - break; - } - } - } - - if (!var68) { - var7 = var46; - var49 = var3 * 8; - var9 = var4 * 8; - - for (var10 = 0; var10 < 8; ++var10) { - for (var11 = 0; var11 < 8; ++var11) { - Tiles.Tiles_heights[var7][var49 + var10][var11 + var9] = 0; - } - } - - if (var49 > 0) { - for (var10 = 1; var10 < 8; ++var10) { - Tiles.Tiles_heights[var7][var49][var10 + var9] = Tiles.Tiles_heights[var7][var49 - 1][var10 + var9]; - } - } - - if (var9 > 0) { - for (var10 = 1; var10 < 8; ++var10) { - Tiles.Tiles_heights[var7][var49 + var10][var9] = Tiles.Tiles_heights[var7][var10 + var49][var9 - 1]; - } - } - - if (var49 > 0 && Tiles.Tiles_heights[var7][var49 - 1][var9] != 0) { - Tiles.Tiles_heights[var7][var49][var9] = Tiles.Tiles_heights[var7][var49 - 1][var9]; - } else if (var9 > 0 && Tiles.Tiles_heights[var7][var49][var9 - 1] != 0) { - Tiles.Tiles_heights[var7][var49][var9] = Tiles.Tiles_heights[var7][var49][var9 - 1]; - } else if (var49 > 0 && var9 > 0 && Tiles.Tiles_heights[var7][var49 - 1][var9 - 1] != 0) { - Tiles.Tiles_heights[var7][var49][var9] = Tiles.Tiles_heights[var7][var49 - 1][var9 - 1]; - } - } - } - } - } - - for (var46 = 0; var46 < 13; ++var46) { - for (var3 = 0; var3 < 13; ++var3) { - var4 = Client.instanceChunkTemplates[0][var46][var3]; - if (var4 == -1) { - GrandExchangeEvent.method153(var46 * 8, var3 * 8, 8, 8); - } - } - } - - class303.method5528(true); - - for (var46 = 0; var46 < 4; ++var46) { - Timer.playPcmPlayers(); - - for (var3 = 0; var3 < 13; ++var3) { - for (var4 = 0; var4 < 13; ++var4) { - var48 = Client.instanceChunkTemplates[var46][var3][var4]; - if (var48 != -1) { - var6 = var48 >> 24 & 3; - var7 = var48 >> 1 & 3; - var49 = var48 >> 14 & 1023; - var9 = var48 >> 3 & 2047; - var10 = (var49 / 8 << 8) + var9 / 8; - - for (var11 = 0; var11 < class41.regions.length; ++var11) { - if (class41.regions[var11] == var10 && class1.regionMapArchives[var11] != null) { - WorldMapIcon_1.method365(class1.regionMapArchives[var11], var46, var3 * 8, var4 * 8, var6, (var49 & 7) * 8, (var9 & 7) * 8, var7, UserComparator3.scene, Client.collisionMaps); - break; - } - } - } - } - } - } - } - - class303.method5528(true); - Timer.playPcmPlayers(); - Scene var61 = UserComparator3.scene; - CollisionMap[] var69 = Client.collisionMaps; - - for (var4 = 0; var4 < 4; ++var4) { - for (var48 = 0; var48 < 104; ++var48) { - for (var6 = 0; var6 < 104; ++var6) { - if ((Tiles.Tiles_renderFlags[var4][var48][var6] & 1) == 1) { - var7 = var4; - if ((Tiles.Tiles_renderFlags[1][var48][var6] & 2) == 2) { - var7 = var4 - 1; - } - - if (var7 >= 0) { - var69[var7].setBlockedByFloor(var48, var6); - } - } - } - } - } - - Tiles.field535 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field535 < -8) { - Tiles.field535 = -8; - } - - if (Tiles.field535 > 8) { - Tiles.field535 = 8; - } - - Tiles.field520 += (int)(Math.random() * 5.0D) - 2; - if (Tiles.field520 < -16) { - Tiles.field520 = -16; - } - - if (Tiles.field520 > 16) { - Tiles.field520 = 16; - } - - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var20; - for (var4 = 0; var4 < 4; ++var4) { - byte[][] var62 = class171.field2036[var4]; - var11 = (int)Math.sqrt(5100.0D); - var12 = var11 * 768 >> 8; - - int var21; - int var22; - for (var13 = 1; var13 < 103; ++var13) { - for (var14 = 1; var14 < 103; ++var14) { - var15 = Tiles.Tiles_heights[var4][var14 + 1][var13] - Tiles.Tiles_heights[var4][var14 - 1][var13]; - var16 = Tiles.Tiles_heights[var4][var14][var13 + 1] - Tiles.Tiles_heights[var4][var14][var13 - 1]; - var17 = (int)Math.sqrt((double)(var15 * var15 + var16 * var16 + 65536)); - var18 = (var15 << 8) / var17; - var19 = 65536 / var17; - var20 = (var16 << 8) / var17; - var21 = (var18 * -50 + var20 * -50 + var19 * -10) / var12 + 96; - var22 = (var62[var14 - 1][var13] >> 2) + (var62[var14][var13 - 1] >> 2) + (var62[var14 + 1][var13] >> 3) + (var62[var14][var13 + 1] >> 3) + (var62[var14][var13] >> 1); - Tiles.field526[var14][var13] = var21 - var22; - } - } - - for (var13 = 0; var13 < 104; ++var13) { - BuddyRankComparator.Tiles_hue[var13] = 0; - GrandExchangeOfferAgeComparator.Tiles_saturation[var13] = 0; - TextureProvider.Tiles_lightness[var13] = 0; - class237.Tiles_hueMultiplier[var13] = 0; - WorldMapRectangle.field198[var13] = 0; - } - - for (var13 = -5; var13 < 109; ++var13) { - for (var14 = 0; var14 < 104; ++var14) { - var15 = var13 + 5; - int var10002; - if (var15 >= 0 && var15 < 104) { - var16 = Tiles.field530[var4][var15][var14] & 255; - if (var16 > 0) { - var18 = var16 - 1; - FloorUnderlayDefinition var51 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var18); - FloorUnderlayDefinition var52; - if (var51 != null) { - var52 = var51; - } else { - byte[] var53 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var18); - var51 = new FloorUnderlayDefinition(); - if (var53 != null) { - var51.decode(new Buffer(var53), var18); - } - - var51.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var51, (long)var18); - var52 = var51; - } - - var10000 = BuddyRankComparator.Tiles_hue; - var10000[var14] += var52.hue; - var10000 = GrandExchangeOfferAgeComparator.Tiles_saturation; - var10000[var14] += var52.saturation; - var10000 = TextureProvider.Tiles_lightness; - var10000[var14] += var52.lightness; - var10000 = class237.Tiles_hueMultiplier; - var10000[var14] += var52.hueMultiplier; - var10002 = WorldMapRectangle.field198[var14]++; - } - } - - var16 = var13 - 5; - if (var16 >= 0 && var16 < 104) { - var17 = Tiles.field530[var4][var16][var14] & 255; - if (var17 > 0) { - var19 = var17 - 1; - FloorUnderlayDefinition var70 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var19); - FloorUnderlayDefinition var54; - if (var70 != null) { - var54 = var70; - } else { - byte[] var59 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var19); - var70 = new FloorUnderlayDefinition(); - if (var59 != null) { - var70.decode(new Buffer(var59), var19); - } - - var70.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var70, (long)var19); - var54 = var70; - } - - var10000 = BuddyRankComparator.Tiles_hue; - var10000[var14] -= var54.hue; - var10000 = GrandExchangeOfferAgeComparator.Tiles_saturation; - var10000[var14] -= var54.saturation; - var10000 = TextureProvider.Tiles_lightness; - var10000[var14] -= var54.lightness; - var10000 = class237.Tiles_hueMultiplier; - var10000[var14] -= var54.hueMultiplier; - var10002 = WorldMapRectangle.field198[var14]--; - } - } - } - - if (var13 >= 1 && var13 < 103) { - var14 = 0; - var15 = 0; - var16 = 0; - var17 = 0; - var18 = 0; - - for (var19 = -5; var19 < 109; ++var19) { - var20 = var19 + 5; - if (var20 >= 0 && var20 < 104) { - var14 += BuddyRankComparator.Tiles_hue[var20]; - var15 += GrandExchangeOfferAgeComparator.Tiles_saturation[var20]; - var16 += TextureProvider.Tiles_lightness[var20]; - var17 += class237.Tiles_hueMultiplier[var20]; - var18 += WorldMapRectangle.field198[var20]; - } - - var21 = var19 - 5; - if (var21 >= 0 && var21 < 104) { - var14 -= BuddyRankComparator.Tiles_hue[var21]; - var15 -= GrandExchangeOfferAgeComparator.Tiles_saturation[var21]; - var16 -= TextureProvider.Tiles_lightness[var21]; - var17 -= class237.Tiles_hueMultiplier[var21]; - var18 -= WorldMapRectangle.field198[var21]; - } - - if (var19 >= 1 && var19 < 103 && (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var13][var19] & 2) != 0 || (Tiles.Tiles_renderFlags[var4][var13][var19] & 16) == 0)) { - if (var4 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var4; - } - - var22 = Tiles.field530[var4][var13][var19] & 255; - int var23 = Tiles.field524[var4][var13][var19] & 255; - if (var22 > 0 || var23 > 0) { - int var24 = Tiles.Tiles_heights[var4][var13][var19]; - int var25 = Tiles.Tiles_heights[var4][var13 + 1][var19]; - int var26 = Tiles.Tiles_heights[var4][var13 + 1][var19 + 1]; - int var27 = Tiles.Tiles_heights[var4][var13][var19 + 1]; - int var28 = Tiles.field526[var13][var19]; - int var29 = Tiles.field526[var13 + 1][var19]; - int var30 = Tiles.field526[var13 + 1][var19 + 1]; - int var31 = Tiles.field526[var13][var19 + 1]; - int var32 = -1; - int var33 = -1; - int var34; - int var35; - int var36; - if (var22 > 0) { - var34 = var14 * 256 / var17; - var35 = var15 / var18; - var36 = var16 / var18; - var32 = DevicePcmPlayerProvider.hslToRgb(var34, var35, var36); - var34 = var34 + Tiles.field535 & 255; - var36 += Tiles.field520; - if (var36 < 0) { - var36 = 0; - } else if (var36 > 255) { - var36 = 255; - } - - var33 = DevicePcmPlayerProvider.hslToRgb(var34, var35, var36); - } - - FloorOverlayDefinition var37; - if (var4 > 0) { - boolean var66 = true; - if (var22 == 0 && Tiles.field525[var4][var13][var19] != 0) { - var66 = false; - } - - if (var23 > 0) { - var36 = var23 - 1; - var37 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var36); - FloorOverlayDefinition var55; - if (var37 != null) { - var55 = var37; - } else { - byte[] var56 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var36); - var37 = new FloorOverlayDefinition(); - if (var56 != null) { - var37.decode(new Buffer(var56), var36); - } - - var37.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var37, (long)var36); - var55 = var37; - } - - if (!var55.hideUnderlay) { - var66 = false; - } - } - - if (var66 && var25 == var24 && var26 == var24 && var24 == var27) { - var10000 = HealthBarUpdate.field1031[var4][var13]; - var10000[var19] |= 2340; - } - } - - var34 = 0; - if (var33 != -1) { - var34 = Rasterizer3D.Rasterizer3D_colorPalette[class236.method4282(var33, 96)]; - } - - if (var23 == 0) { - var61.addTile(var4, var13, var19, 0, 0, -1, var24, var25, var26, var27, class236.method4282(var32, var28), class236.method4282(var32, var29), class236.method4282(var32, var30), class236.method4282(var32, var31), 0, 0, 0, 0, var34, 0); - } else { - var35 = Tiles.field525[var4][var13][var19] + 1; - byte var67 = WorldMapLabel.field269[var4][var13][var19]; - int var38 = var23 - 1; - FloorOverlayDefinition var39 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var38); - if (var39 != null) { - var37 = var39; - } else { - byte[] var57 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var38); - var39 = new FloorOverlayDefinition(); - if (var57 != null) { - var39.decode(new Buffer(var57), var38); - } - - var39.postDecode(); - FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var39, (long)var38); - var37 = var39; - } - - int var40 = var37.texture; - int var41; - int var42; - int var43; - int var44; - if (var40 >= 0) { - var42 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var40); - var41 = -1; - } else if (var37.primaryRgb == 16711935) { - var41 = -2; - var40 = -1; - var42 = -2; - } else { - var41 = DevicePcmPlayerProvider.hslToRgb(var37.hue, var37.saturation, var37.lightness); - var43 = var37.hue + Tiles.field535 & 255; - var44 = var37.lightness + Tiles.field520; - if (var44 < 0) { - var44 = 0; - } else if (var44 > 255) { - var44 = 255; - } - - var42 = DevicePcmPlayerProvider.hslToRgb(var43, var37.saturation, var44); - } - - var43 = 0; - if (var42 != -2) { - var43 = Rasterizer3D.Rasterizer3D_colorPalette[class105.method2414(var42, 96)]; - } - - if (var37.secondaryRgb != -1) { - var44 = var37.secondaryHue + Tiles.field535 & 255; - int var45 = var37.secondaryLightness + Tiles.field520; - if (var45 < 0) { - var45 = 0; - } else if (var45 > 255) { - var45 = 255; - } - - var42 = DevicePcmPlayerProvider.hslToRgb(var44, var37.secondarySaturation, var45); - var43 = Rasterizer3D.Rasterizer3D_colorPalette[class105.method2414(var42, 96)]; - } - - var61.addTile(var4, var13, var19, var35, var67, var40, var24, var25, var26, var27, class236.method4282(var32, var28), class236.method4282(var32, var29), class236.method4282(var32, var30), class236.method4282(var32, var31), class105.method2414(var41, var28), class105.method2414(var41, var29), class105.method2414(var41, var30), class105.method2414(var41, var31), var34, var43); - } - } - } - } - } - } - - for (var13 = 1; var13 < 103; ++var13) { - for (var14 = 1; var14 < 103; ++var14) { - if ((Tiles.Tiles_renderFlags[var4][var14][var13] & 8) != 0) { - var19 = 0; - } else if (var4 > 0 && (Tiles.Tiles_renderFlags[1][var14][var13] & 2) != 0) { - var19 = var4 - 1; - } else { - var19 = var4; - } - - var61.setTileMinPlane(var4, var14, var13, var19); - } - } - - Tiles.field530[var4] = null; - Tiles.field524[var4] = null; - Tiles.field525[var4] = null; - WorldMapLabel.field269[var4] = null; - class171.field2036[var4] = null; - } - - var61.method3222(-50, -10, -50); - - for (var4 = 0; var4 < 104; ++var4) { - for (var48 = 0; var48 < 104; ++var48) { - if ((Tiles.Tiles_renderFlags[1][var4][var48] & 2) == 2) { - var61.setLinkBelow(var4, var48); - } - } - } - - var4 = 1; - var48 = 2; - var6 = 4; - - for (var7 = 0; var7 < 4; ++var7) { - if (var7 > 0) { - var4 <<= 3; - var48 <<= 3; - var6 <<= 3; - } - - for (var49 = 0; var49 <= var7; ++var49) { - for (var9 = 0; var9 <= 104; ++var9) { - for (var10 = 0; var10 <= 104; ++var10) { - short var65; - if ((HealthBarUpdate.field1031[var49][var10][var9] & var4) != 0) { - var11 = var9; - var12 = var9; - var13 = var49; - - for (var14 = var49; var11 > 0 && (HealthBarUpdate.field1031[var49][var10][var11 - 1] & var4) != 0; --var11) { - } - - while (var12 < 104 && (HealthBarUpdate.field1031[var49][var10][var12 + 1] & var4) != 0) { - ++var12; - } - - label863: - while (var13 > 0) { - for (var15 = var11; var15 <= var12; ++var15) { - if ((HealthBarUpdate.field1031[var13 - 1][var10][var15] & var4) == 0) { - break label863; - } - } - - --var13; - } - - label852: - while (var14 < var7) { - for (var15 = var11; var15 <= var12; ++var15) { - if ((HealthBarUpdate.field1031[var14 + 1][var10][var15] & var4) == 0) { - break label852; - } - } - - ++var14; - } - - var15 = (var12 - var11 + 1) * (var14 + 1 - var13); - if (var15 >= 8) { - var65 = 240; - var17 = Tiles.Tiles_heights[var14][var10][var11] - var65; - var18 = Tiles.Tiles_heights[var13][var10][var11]; - Scene.Scene_addOccluder(var7, 1, var10 * 128, var10 * 128, var11 * 128, var12 * 128 + 128, var17, var18); - - for (var19 = var13; var19 <= var14; ++var19) { - for (var20 = var11; var20 <= var12; ++var20) { - var10000 = HealthBarUpdate.field1031[var19][var10]; - var10000[var20] &= ~var4; - } - } - } - } - - if ((HealthBarUpdate.field1031[var49][var10][var9] & var48) != 0) { - var11 = var10; - var12 = var10; - var13 = var49; - - for (var14 = var49; var11 > 0 && (HealthBarUpdate.field1031[var49][var11 - 1][var9] & var48) != 0; --var11) { - } - - while (var12 < 104 && (HealthBarUpdate.field1031[var49][var12 + 1][var9] & var48) != 0) { - ++var12; - } - - label916: - while (var13 > 0) { - for (var15 = var11; var15 <= var12; ++var15) { - if ((HealthBarUpdate.field1031[var13 - 1][var15][var9] & var48) == 0) { - break label916; - } - } - - --var13; - } - - label905: - while (var14 < var7) { - for (var15 = var11; var15 <= var12; ++var15) { - if ((HealthBarUpdate.field1031[var14 + 1][var15][var9] & var48) == 0) { - break label905; - } - } - - ++var14; - } - - var15 = (var14 + 1 - var13) * (var12 - var11 + 1); - if (var15 >= 8) { - var65 = 240; - var17 = Tiles.Tiles_heights[var14][var11][var9] - var65; - var18 = Tiles.Tiles_heights[var13][var11][var9]; - Scene.Scene_addOccluder(var7, 2, var11 * 128, var12 * 128 + 128, var9 * 128, var9 * 128, var17, var18); - - for (var19 = var13; var19 <= var14; ++var19) { - for (var20 = var11; var20 <= var12; ++var20) { - var10000 = HealthBarUpdate.field1031[var19][var20]; - var10000[var9] &= ~var48; - } - } - } - } - - if ((HealthBarUpdate.field1031[var49][var10][var9] & var6) != 0) { - var11 = var10; - var12 = var10; - var13 = var9; - - for (var14 = var9; var13 > 0 && (HealthBarUpdate.field1031[var49][var10][var13 - 1] & var6) != 0; --var13) { - } - - while (var14 < 104 && (HealthBarUpdate.field1031[var49][var10][var14 + 1] & var6) != 0) { - ++var14; - } - - label969: - while (var11 > 0) { - for (var15 = var13; var15 <= var14; ++var15) { - if ((HealthBarUpdate.field1031[var49][var11 - 1][var15] & var6) == 0) { - break label969; - } - } - - --var11; - } - - label958: - while (var12 < 104) { - for (var15 = var13; var15 <= var14; ++var15) { - if ((HealthBarUpdate.field1031[var49][var12 + 1][var15] & var6) == 0) { - break label958; - } - } - - ++var12; - } - - if ((var14 - var13 + 1) * (var12 - var11 + 1) >= 4) { - var15 = Tiles.Tiles_heights[var49][var11][var13]; - Scene.Scene_addOccluder(var7, 4, var11 * 128, var12 * 128 + 128, var13 * 128, var14 * 128 + 128, var15, var15); - - for (var16 = var11; var16 <= var12; ++var16) { - for (var17 = var13; var17 <= var14; ++var17) { - var10000 = HealthBarUpdate.field1031[var49][var16]; - var10000[var17] &= ~var6; - } - } - } - } - } - } - } - } - - class303.method5528(true); - var4 = Tiles.Tiles_minPlane; - if (var4 > TileItemPile.Client_plane) { - var4 = TileItemPile.Client_plane; - } - - if (var4 < TileItemPile.Client_plane - 1) { - var4 = TileItemPile.Client_plane - 1; - } - - if (Client.isLowDetail) { - UserComparator3.scene.init(Tiles.Tiles_minPlane); - } else { - UserComparator3.scene.init(0); - } - - for (var48 = 0; var48 < 104; ++var48) { - for (var6 = 0; var6 < 104; ++var6) { - class41.updateItemPile(var48, var6); - } - } - - Timer.playPcmPlayers(); - - for (PendingSpawn var63 = (PendingSpawn)Client.pendingSpawns.last(); var63 != null; var63 = (PendingSpawn)Client.pendingSpawns.previous()) { - if (var63.hitpoints == -1) { - var63.delay = 0; - MusicPatchNode2.method3819(var63); - } else { - var63.remove(); - } - } - - ObjectDefinition.ObjectDefinition_cachedModelData.clear(); - PacketBufferNode var64; - if (WorldMapSectionType.client.hasFrame()) { - var64 = UserComparator4.getPacketBufferNode(ClientPacket.field2297, Client.packetWriter.isaacCipher); - var64.packetBuffer.writeInt(1057001181); - Client.packetWriter.addNode(var64); - } - - if (!Client.isInInstance) { - var48 = (WorldMapCacheName.field328 - 6) / 8; - var6 = (WorldMapCacheName.field328 + 6) / 8; - var7 = (class22.field104 - 6) / 8; - var49 = (class22.field104 + 6) / 8; - - for (var9 = var48 - 1; var9 <= var6 + 1; ++var9) { - for (var10 = var7 - 1; var10 <= var49 + 1; ++var10) { - if (var9 < var48 || var9 > var6 || var10 < var7 || var10 > var49) { - WorldMapRectangle.archive5.loadRegionFromName("m" + var9 + "_" + var10); - WorldMapRectangle.archive5.loadRegionFromName("l" + var9 + "_" + var10); - } - } - } - } - - ClientPreferences.updateGameState(30); - Timer.playPcmPlayers(); - BoundaryObject.method3390(); - var64 = UserComparator4.getPacketBufferNode(ClientPacket.field2326, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var64); - MidiPcmStream.method3905(); - } - } - } + @Export("port2") + static int port2; } diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/class231.java index d08e896925..92a7152b26 100644 --- a/runescape-client/src/main/java/class231.java +++ b/runescape-client/src/main/java/class231.java @@ -1,85 +1,105 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("hb") +@ObfuscatedName("hm") public class class231 { - @ObfuscatedName("as") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "340792557" + descriptor = "Lic;" ) - static int method4277(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.GETWINDOWMODE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = class58.getWindowedMode(); - return 1; + @Export("ItemDefinition_archive") + static AbstractArchive ItemDefinition_archive; + + @ObfuscatedName("ft") + @ObfuscatedSignature( + descriptor = "(IIIIZI)V", + garbageValue = "1537075351" + ) + @Export("setViewportShape") + static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) { + if (var2 < 1) { // L: 4175 + var2 = 1; + } + + if (var3 < 1) { // L: 4176 + var3 = 1; + } + + int var5 = var3 - 334; // L: 4177 + int var6; + if (var5 < 0) { // L: 4179 + var6 = Client.field769; + } else if (var5 >= 100) { // L: 4180 + var6 = Client.field928; } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - ScriptEvent.setWindowedMode(var3); + var6 = (Client.field928 - Client.field769) * var5 / 100 + Client.field769; // L: 4181 + } + + int var7 = var3 * var6 * 512 / (var2 * 334); // L: 4182 + int var8; + int var9; + short var18; + if (var7 < Client.field938) { // L: 4183 + var18 = Client.field938; // L: 4184 + var6 = var18 * var2 * 334 / (var3 * 512); // L: 4185 + if (var6 > Client.field932) { // L: 4186 + var6 = Client.field932; // L: 4187 + var8 = var3 * var6 * 512 / (var18 * 334); // L: 4188 + var9 = (var2 - var8) / 2; // L: 4189 + if (var4) { // L: 4190 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4191 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216); // L: 4192 + Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216); // L: 4193 } - return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = NetSocket.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --UrlRequester.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - NetSocket.clientPreferences.windowMode = var3; - SpriteMask.savePreferences(); + var0 += var9; // L: 4195 + var2 -= var9 * 2; // L: 4196 + } + } else if (var7 > Client.field934) { // L: 4199 + var18 = Client.field934; // L: 4200 + var6 = var18 * var2 * 334 / (var3 * 512); // L: 4201 + if (var6 < Client.field931) { // L: 4202 + var6 = Client.field931; // L: 4203 + var8 = var18 * var2 * 334 / (var6 * 512); // L: 4204 + var9 = (var3 - var8) / 2; // L: 4205 + if (var4) { // L: 4206 + Rasterizer2D.Rasterizer2D_resetClip(); // L: 4207 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216); // L: 4208 + Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216); // L: 4209 } - return 1; + var1 += var9; // L: 4211 + var3 -= var9 * 2; // L: 4212 } } - } - @ObfuscatedName("ar") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "1553809797" - ) - static int method4278(int var0, Script var1, boolean var2) { - int var3; - if (var0 == ScriptOpcodes.CAM_FORCEANGLE) { - UrlRequester.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize]; - int var4 = Interpreter.Interpreter_intStack[UrlRequester.Interpreter_intStackSize + 1]; - if (!Client.isCameraLocked) { - Client.camAngleX = var3; - Client.camAngleY = var4; + Client.viewportZoom = var3 * var6 / 334; // L: 4215 + if (var2 != Client.viewportWidth || var3 != Client.viewportHeight) { // L: 4216 + int[] var17 = new int[9]; // L: 4218 + + for (var9 = 0; var9 < var17.length; ++var9) { // L: 4219 + int var10 = var9 * 32 + 15 + 128; // L: 4220 + int var11 = var10 * 3 + 600; // L: 4223 + int var13 = Rasterizer3D.Rasterizer3D_sine[var10]; // L: 4226 + int var15 = var3 - 334; // L: 4229 + if (var15 < 0) { // L: 4230 + var15 = 0; + } else if (var15 > 100) { // L: 4231 + var15 = 100; + } + + int var16 = (Client.zoomWidth - Client.zoomHeight) * var15 / 100 + Client.zoomHeight; // L: 4232 + int var14 = var11 * var16 / 256; // L: 4233 + var17[var9] = var13 * var14 >> 16; // L: 4236 } - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.camAngleX; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.camAngleY; - return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (var3 < 0) { - var3 = 0; - } - - Client.camFollowHeight = var3; - return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = Client.camFollowHeight; - return 1; - } else { - return 2; + Scene.Scene_buildVisiblityMap(var17, 500, 800, var2 * 334 / var3, 334); // L: 4238 } - } + + Client.viewportOffsetX = var0; // L: 4241 + Client.viewportOffsetY = var1; // L: 4242 + Client.viewportWidth = var2; // L: 4243 + Client.viewportHeight = var3; // L: 4244 + } // L: 4245 } diff --git a/runescape-client/src/main/java/class232.java b/runescape-client/src/main/java/class232.java index eb6799941f..2fd7075582 100644 --- a/runescape-client/src/main/java/class232.java +++ b/runescape-client/src/main/java/class232.java @@ -1,29 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("hs") +@ObfuscatedName("hw") public class class232 { - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(I)[Llh;", - garbageValue = "-1121273391" + @ObfuscatedName("mx") + @ObfuscatedGetter( + intValue = -149215753 ) - static IndexedSprite[] method4279() { - IndexedSprite[] var0 = new IndexedSprite[class335.SpriteBuffer_spriteCount]; - - for (int var1 = 0; var1 < class335.SpriteBuffer_spriteCount; ++var1) { - IndexedSprite var2 = var0[var1] = new IndexedSprite(); - var2.width = class335.SpriteBuffer_spriteWidth; - var2.height = UserComparator8.SpriteBuffer_spriteHeight; - var2.xOffset = class335.SpriteBuffer_xOffsets[var1]; - var2.yOffset = NPC.SpriteBuffer_yOffsets[var1]; - var2.subWidth = class335.SpriteBuffer_spriteWidths[var1]; - var2.subHeight = class335.SpriteBuffer_spriteHeights[var1]; - var2.palette = class335.SpriteBuffer_spritePalette; - var2.pixels = ItemDefinition.SpriteBuffer_pixels[var1]; - } - - GrandExchangeEvent.method158(); - return var0; - } + @Export("selectedSpellWidget") + static int selectedSpellWidget; } diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java index 255e0dfdae..3dc77959b5 100644 --- a/runescape-client/src/main/java/class234.java +++ b/runescape-client/src/main/java/class234.java @@ -1,28 +1,25 @@ import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("ia") public class class234 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "Lko;" + @ObfuscatedName("d") + @ObfuscatedGetter( + intValue = 710753405 ) - @Export("ItemDefinition_fontPlain11") - static Font ItemDefinition_fontPlain11; - @ObfuscatedName("s") - static String[] field3096; + static int field3100; - @ObfuscatedName("jd") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Lhd;I)V", - garbageValue = "-750902552" + descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;I)Lls;", + garbageValue = "246084812" ) - @Export("invalidateWidget") - static void invalidateWidget(Widget var0) { - if (var0.cycle == Client.field877) { - Client.field813[var0.rootIndex] = true; - } - + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + int var3 = var0.getGroupId(var1); // L: 142 + int var4 = var0.getFileId(var3, var2); // L: 143 + return WorldMapRegion.method611(var0, var3, var4); // L: 144 } } diff --git a/runescape-client/src/main/java/class235.java b/runescape-client/src/main/java/class235.java index 22b26c080c..65da53fafd 100644 --- a/runescape-client/src/main/java/class235.java +++ b/runescape-client/src/main/java/class235.java @@ -1,63 +1,38 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("im") +@ObfuscatedName("iz") public class class235 { - @ObfuscatedName("p") + @ObfuscatedName("hb") @ObfuscatedSignature( - descriptor = "([BIII)Z", - garbageValue = "493872009" + descriptor = "[Llp;" ) - static final boolean method4281(byte[] var0, int var1, int var2) { - boolean var3 = true; - Buffer var4 = new Buffer(var0); - int var5 = -1; + @Export("mapDotSprites") + static Sprite[] mapDotSprites; - label70: - while (true) { - int var6 = var4.method5732(); - if (var6 == 0) { - return var3; - } + @ObfuscatedName("ad") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "1" + ) + @Export("runWidgetOnLoadListener") + static void runWidgetOnLoadListener(int var0) { + if (var0 != -1) { // L: 3836 + if (WorldMapSprite.loadInterface(var0)) { // L: 3837 + Widget[] var1 = Widget.Widget_interfaceComponents[var0]; // L: 3838 - var5 += var6; - int var7 = 0; - boolean var8 = false; - - while (true) { - int var9; - while (!var8) { - var9 = var4.readUShortSmart(); - if (var9 == 0) { - continue label70; - } - - var7 += var9 - 1; - int var10 = var7 & 63; - int var11 = var7 >> 6 & 63; - int var12 = var4.readUnsignedByte() >> 2; - int var13 = var11 + var1; - int var14 = var10 + var2; - if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) { - ObjectDefinition var15 = Canvas.getObjectDefinition(var5); - if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) { - if (!var15.needsModelFiles()) { - ++Client.field690; - var3 = false; - } - - var8 = true; - } + for (int var2 = 0; var2 < var1.length; ++var2) { // L: 3839 + Widget var3 = var1[var2]; // L: 3840 + if (var3.onLoad != null) { // L: 3841 + ScriptEvent var4 = new ScriptEvent(); // L: 3842 + var4.widget = var3; // L: 3843 + var4.args = var3.onLoad; // L: 3844 + class280.runScript(var4, 5000000); // L: 3845 } } - var9 = var4.readUShortSmart(); - if (var9 == 0) { - break; - } - - var4.readUnsignedByte(); } } - } + } // L: 3848 } diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java deleted file mode 100644 index fde7de225a..0000000000 --- a/runescape-client/src/main/java/class236.java +++ /dev/null @@ -1,102 +0,0 @@ -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("id") -public final class class236 { - @ObfuscatedName("c") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "-1064559233" - ) - static final int method4282(int var0, int var1) { - if (var0 == -1) { - return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; - } - } - - @ObfuscatedName("h") - @ObfuscatedSignature( - descriptor = "(Lef;IIII)Z", - garbageValue = "1976024119" - ) - static final boolean method4283(Model var0, int var1, int var2, int var3) { - boolean var4 = ViewportMouse.ViewportMouse_isInViewport; - if (!var4) { - return false; - } else { - int var5; - int var6; - int var7; - int var8; - int var11; - int var12; - int var13; - int var16; - int var17; - if (!ViewportMouse.ViewportMouse_false0) { - var5 = Scene.Scene_cameraPitchSine; - var6 = Scene.Scene_cameraPitchCosine; - var7 = Scene.Scene_cameraYawSine; - var8 = Scene.Scene_cameraYawCosine; - byte var9 = 50; - short var10 = 3500; - var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; - var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; - var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom; - int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom; - int var15 = Rasterizer3D.method3135(var12, var9, var6, var5); - var16 = Rasterizer3D.method3136(var12, var9, var6, var5); - var12 = var15; - var15 = Rasterizer3D.method3135(var14, var10, var6, var5); - var17 = Rasterizer3D.method3136(var14, var10, var6, var5); - var14 = var15; - var15 = Rasterizer3D.method3158(var11, var16, var8, var7); - var16 = Rasterizer3D.method3134(var11, var16, var8, var7); - var11 = var15; - var15 = Rasterizer3D.method3158(var13, var17, var8, var7); - var17 = Rasterizer3D.method3134(var13, var17, var8, var7); - ViewportMouse.field1770 = (var11 + var15) / 2; - class348.field4062 = (var14 + var12) / 2; - SoundSystem.field1466 = (var16 + var17) / 2; - ViewportMouse.field1771 = (var15 - var11) / 2; - ViewportMouse.field1775 = (var14 - var12) / 2; - ViewportMouse.field1773 = (var17 - var16) / 2; - ApproximateRouteStrategy.field630 = Math.abs(ViewportMouse.field1771); - class204.field2422 = Math.abs(ViewportMouse.field1775); - UserComparator7.field2003 = Math.abs(ViewportMouse.field1773); - } - - var5 = var0.xMid + var1; - var6 = var2 + var0.yMid; - var7 = var3 + var0.zMid; - var8 = var0.xMidOffset; - var16 = var0.yMidOffset; - var17 = var0.zMidOffset; - var11 = ViewportMouse.field1770 - var5; - var12 = class348.field4062 - var6; - var13 = SoundSystem.field1466 - var7; - if (Math.abs(var11) > var8 + ApproximateRouteStrategy.field630) { - return false; - } else if (Math.abs(var12) > var16 + class204.field2422) { - return false; - } else if (Math.abs(var13) > var17 + UserComparator7.field2003) { - return false; - } else if (Math.abs(var13 * ViewportMouse.field1775 - var12 * ViewportMouse.field1773) > var16 * UserComparator7.field2003 + var17 * class204.field2422) { - return false; - } else if (Math.abs(var11 * ViewportMouse.field1773 - var13 * ViewportMouse.field1771) > var8 * UserComparator7.field2003 + var17 * ApproximateRouteStrategy.field630) { - return false; - } else { - return Math.abs(var12 * ViewportMouse.field1771 - var11 * ViewportMouse.field1775) <= var8 * class204.field2422 + var16 * ApproximateRouteStrategy.field630; - } - } - } -} diff --git a/runescape-client/src/main/java/class237.java b/runescape-client/src/main/java/class237.java index 4d39314756..c52d53ed3d 100644 --- a/runescape-client/src/main/java/class237.java +++ b/runescape-client/src/main/java/class237.java @@ -1,19 +1,8 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("io") +@ObfuscatedName("if") public class class237 { - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = 1978205417 - ) - public static int field3113; - @ObfuscatedName("c") - @Export("Tiles_hueMultiplier") - static int[] Tiles_hueMultiplier; - static { - Math.sqrt(8192.0D); - } + Math.sqrt(8192.0D); // L: 9 + } // L: 10 } diff --git a/runescape-client/src/main/java/class247.java b/runescape-client/src/main/java/class247.java index da1c675d42..7c7f33a15c 100644 --- a/runescape-client/src/main/java/class247.java +++ b/runescape-client/src/main/java/class247.java @@ -4,332 +4,233 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ix") +@ObfuscatedName("id") public class class247 { - @ObfuscatedName("a") - static int[] field3220; - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("spriteMap") final HashMap spriteMap; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Llv;" + descriptor = "Llr;" ) @Export("bounds") Bounds bounds; - @ObfuscatedName("q") - int[] field3218; - @ObfuscatedName("j") - int[] field3222; - @ObfuscatedName("p") + @ObfuscatedName("s") + int[] field3214; + @ObfuscatedName("t") + int[] field3213; + @ObfuscatedName("i") @ObfuscatedGetter( - intValue = -1283374259 + intValue = 1401897115 ) - int field3219; + int field3216; public class247() { - this.spriteMap = new HashMap(); - this.bounds = new Bounds(0, 0); - this.field3218 = new int[2048]; - this.field3222 = new int[2048]; - this.field3219 = 0; - MouseHandler.method1154(); - } + this.spriteMap = new HashMap(); // L: 10 + this.bounds = new Bounds(0, 0); // L: 11 + this.field3214 = new int[2048]; // L: 12 + this.field3213 = new int[2048]; // L: 13 + this.field3216 = 0; // L: 14 + class7.field39 = new int[2000]; // L: 22 + int var1 = 0; // L: 23 + int var2 = 240; // L: 24 - @ObfuscatedName("o") + int var4; + for (byte var3 = 12; var1 < 16; var2 -= var3) { // L: 25 + var4 = Frames.method3395((double)((float)var2 / 360.0F), 0.9998999834060669D, (double)(0.075F + 0.425F * (float)var1 / 16.0F)); // L: 27 + class7.field39[var1] = var4; // L: 28 + ++var1; // L: 26 + } + + var2 = 48; // L: 30 + + for (int var6 = var2 / 6; var1 < class7.field39.length; var2 -= var6) { // L: 31 32 38 + var4 = var1 * 2; // L: 33 + + for (int var5 = Frames.method3395((double)((float)var2 / 360.0F), 0.9998999834060669D, 0.5D); var1 < var4 && var1 < class7.field39.length; ++var1) { // L: 34 35 + class7.field39[var1] = var5; // L: 36 + } + } + + } // L: 41 + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-170659377" + descriptor = "(IB)V", + garbageValue = "1" ) - void method4486(int var1) { - int var2 = var1 * 2 + 1; - double[] var3 = MouseRecorder.method1248(0.0D, (double)((float)var1 / 3.0F), var1); - double var4 = var3[var1] * var3[var1]; - int[] var6 = new int[var2 * var2]; - boolean var7 = false; + void method4415(int var1) { + int var2 = var1 * 2 + 1; // L: 44 + double[] var3 = Client.method1378(0.0D, (double)((float)var1 / 3.0F), var1); // L: 45 + double var4 = var3[var1] * var3[var1]; // L: 46 + int[] var6 = new int[var2 * var2]; // L: 47 + boolean var7 = false; // L: 48 - for (int var8 = 0; var8 < var2; ++var8) { - for (int var9 = 0; var9 < var2; ++var9) { - int var10 = var6[var9 + var2 * var8] = (int)(256.0D * (var3[var8] * var3[var9] / var4)); - if (!var7 && var10 > 0) { - var7 = true; + for (int var8 = 0; var8 < var2; ++var8) { // L: 49 + for (int var9 = 0; var9 < var2; ++var9) { // L: 50 + int var10 = var6[var9 + var8 * var2] = (int)(256.0D * (var3[var9] * var3[var8] / var4)); // L: 51 + if (!var7 && var10 > 0) { // L: 52 + var7 = true; // L: 53 } } } - Sprite var11 = new Sprite(var6, var2, var2); - this.spriteMap.put(var1, var11); - } + Sprite var11 = new Sprite(var6, var2, var2); // L: 57 + this.spriteMap.put(var1, var11); // L: 58 + } // L: 59 - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)Llz;", - garbageValue = "-1626397648" + descriptor = "(II)Llp;", + garbageValue = "1281699730" ) - Sprite method4487(int var1) { - if (!this.spriteMap.containsKey(var1)) { - this.method4486(var1); + Sprite method4412(int var1) { + if (!this.spriteMap.containsKey(var1)) { // L: 62 + this.method4415(var1); // L: 63 } - return (Sprite)this.spriteMap.get(var1); + return (Sprite)this.spriteMap.get(var1); // L: 65 } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-1291742689" + descriptor = "(IIB)V", + garbageValue = "-58" ) - public final void method4504(int var1, int var2) { - if (this.field3219 < this.field3218.length) { - this.field3218[this.field3219] = var1; - this.field3222[this.field3219] = var2; - ++this.field3219; + public final void method4423(int var1, int var2) { + if (this.field3216 < this.field3214.length) { // L: 69 + this.field3214[this.field3216] = var1; // L: 70 + this.field3213[this.field3216] = var2; // L: 71 + ++this.field3216; // L: 72 } - } + } // L: 73 - @ObfuscatedName("p") + @ObfuscatedName("t") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "2033439477" + garbageValue = "-1013360647" ) - public final void method4489() { - this.field3219 = 0; - } + public final void method4414() { + this.field3216 = 0; // L: 76 + } // L: 77 - @ObfuscatedName("g") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(IILlz;FI)V", - garbageValue = "-2127559947" + descriptor = "(IILlp;FB)V", + garbageValue = "3" ) - public final void method4490(int var1, int var2, Sprite var3, float var4) { - int var5 = (int)(var4 * 18.0F); - Sprite var6 = this.method4487(var5); - int var7 = var5 * 2 + 1; - Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); - Bounds var9 = new Bounds(0, 0); - this.bounds.setHigh(var7, var7); - System.nanoTime(); + public final void method4410(int var1, int var2, Sprite var3, float var4) { + int var5 = (int)(18.0F * var4); // L: 80 + Sprite var6 = this.method4412(var5); // L: 81 + int var7 = var5 * 2 + 1; // L: 82 + Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight); // L: 83 + Bounds var9 = new Bounds(0, 0); // L: 84 + this.bounds.setHigh(var7, var7); // L: 85 + System.nanoTime(); // L: 86 int var10; int var11; int var12; - for (var10 = 0; var10 < this.field3219; ++var10) { - var11 = this.field3218[var10]; - var12 = this.field3222[var10]; - int var13 = (int)((float)(var11 - var1) * var4) - var5; - int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5; - this.bounds.setLow(var13, var14); - this.bounds.method6202(var8, var9); - this.method4512(var6, var3, var9); + for (var10 = 0; var10 < this.field3216; ++var10) { // L: 87 + var11 = this.field3214[var10]; // L: 88 + var12 = this.field3213[var10]; // L: 89 + int var13 = (int)(var4 * (float)(var11 - var1)) - var5; // L: 90 + int var14 = (int)((float)var3.subHeight - var4 * (float)(var12 - var2)) - var5; // L: 91 + this.bounds.setLow(var13, var14); // L: 92 + this.bounds.method6089(var8, var9); // L: 93 + this.method4416(var6, var3, var9); // L: 94 } - System.nanoTime(); - System.nanoTime(); + System.nanoTime(); // L: 96 + System.nanoTime(); // L: 97 - for (var10 = 0; var10 < var3.pixels.length; ++var10) { - if (var3.pixels[var10] == 0) { - var3.pixels[var10] = -16777216; + for (var10 = 0; var10 < var3.pixels.length; ++var10) { // L: 98 + if (var3.pixels[var10] == 0) { // L: 99 + var3.pixels[var10] = -16777216; // L: 100 } else { - var11 = (var3.pixels[var10] + 64 - 1) / 256; - if (var11 <= 0) { - var3.pixels[var10] = -16777216; + var11 = (var3.pixels[var10] + 64 - 1) / 256; // L: 103 + if (var11 <= 0) { // L: 104 + var3.pixels[var10] = -16777216; // L: 105 } else { - if (var11 > field3220.length) { - var11 = field3220.length; + if (var11 > class7.field39.length) { // L: 108 + var11 = class7.field39.length; } - var12 = field3220[var11 - 1]; - var3.pixels[var10] = -16777216 | var12; + var12 = class7.field39[var11 - 1]; // L: 109 + var3.pixels[var10] = -16777216 | var12; // L: 110 } } } - System.nanoTime(); - } + System.nanoTime(); // L: 112 + } // L: 113 - @ObfuscatedName("n") + @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "(Llz;Llz;Llv;B)V", - garbageValue = "-113" + descriptor = "(Llp;Llp;Llr;B)V", + garbageValue = "-42" ) - void method4512(Sprite var1, Sprite var2, Bounds var3) { - if (var3.highX != 0 && var3.highY != 0) { - int var4 = 0; - int var5 = 0; - if (var3.lowX == 0) { + void method4416(Sprite var1, Sprite var2, Bounds var3) { + if (var3.highX != 0 && var3.highY != 0) { // L: 116 + int var4 = 0; // L: 117 + int var5 = 0; // L: 118 + if (var3.lowX == 0) { // L: 119 var4 = var1.subWidth - var3.highX; } - if (var3.lowY == 0) { + if (var3.lowY == 0) { // L: 120 var5 = var1.subHeight - var3.highY; } - int var6 = var4 + var5 * var1.subWidth; - int var7 = var2.subWidth * var3.lowY + var3.lowX; + int var6 = var4 + var5 * var1.subWidth; // L: 121 + int var7 = var3.lowX + var2.subWidth * var3.lowY; // L: 122 - for (int var8 = 0; var8 < var3.highY; ++var8) { - for (int var9 = 0; var9 < var3.highX; ++var9) { - int[] var10000 = var2.pixels; + for (int var8 = 0; var8 < var3.highY; ++var8) { // L: 123 + for (int var9 = 0; var9 < var3.highX; ++var9) { // L: 124 + int[] var10000 = var2.pixels; // L: 125 int var10001 = var7++; var10000[var10001] += var1.pixels[var6++]; } - var6 += var1.subWidth - var3.highX; - var7 += var2.subWidth - var3.highX; + var6 += var1.subWidth - var3.highX; // L: 127 + var7 += var2.subWidth - var3.highX; // L: 128 } } - } + } // L: 130 - @ObfuscatedName("m") + @ObfuscatedName("iu") @ObfuscatedSignature( - descriptor = "(II)Lil;", - garbageValue = "-125199916" + descriptor = "(Lhq;Ljq;IIZB)V", + garbageValue = "0" ) - @Export("getInvDefinition") - public static InvDefinition getInvDefinition(int var0) { - InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); + @Export("addWidgetItemMenuItem") + static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) { + String[] var5 = var1.inventoryActions; // L: 9431 + byte var6 = -1; // L: 9432 + String var7 = null; // L: 9433 + if (var5 != null && var5[var3] != null) { // L: 9434 + if (var3 == 0) { // L: 9435 + var6 = 33; + } else if (var3 == 1) { // L: 9436 + var6 = 34; + } else if (var3 == 2) { // L: 9437 + var6 = 35; + } else if (var3 == 3) { // L: 9438 + var6 = 36; + } else { + var6 = 37; // L: 9439 } - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("fw") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1527669385" - ) - static final void method4496() { - for (int var0 = 0; var0 < Client.npcCount; ++var0) { - int var1 = Client.npcIndices[var0]; - NPC var2 = Client.npcs[var1]; - if (var2 != null) { - TaskHandler.updateActorSequence(var2, var2.definition.size); - } + var7 = var5[var3]; // L: 9440 + } else if (var3 == 4) { // L: 9443 + var6 = 37; // L: 9444 + var7 = "Drop"; // L: 9445 } - } - - @ObfuscatedName("hb") - @ObfuscatedSignature( - descriptor = "(IIIILjava/lang/String;I)V", - garbageValue = "-870187769" - ) - @Export("widgetDefaultMenuAction") - static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) { - Widget var5 = WorldMapLabelSize.getWidgetChild(var1, var2); - if (var5 != null) { - if (var5.onOp != null) { - ScriptEvent var6 = new ScriptEvent(); - var6.widget = var5; - var6.opIndex = var0; - var6.targetName = var4; - var6.args = var5.onOp; - InterfaceParent.runScriptEvent(var6); - } - - boolean var11 = true; - if (var5.contentType > 0) { - var11 = MilliClock.method3586(var5); - } - - if (var11) { - int var8 = KeyHandler.getWidgetFlags(var5); - int var9 = var0 - 1; - boolean var7 = (var8 >> var9 + 1 & 1) != 0; - if (var7) { - PacketBufferNode var10; - if (var0 == 1) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 2) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2318, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 3) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2275, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 4) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2332, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 5) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2291, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 6) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2320, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 7) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 8) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2264, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 9) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2309, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - if (var0 == 10) { - var10 = UserComparator4.getPacketBufferNode(ClientPacket.field2245, Client.packetWriter.isaacCipher); - var10.packetBuffer.writeInt(var1); - var10.packetBuffer.writeShort(var2); - var10.packetBuffer.writeShort(var3); - Client.packetWriter.addNode(var10); - } - - } - } + if (var6 != -1 && var7 != null) { // L: 9448 + Tiles.insertMenuItem(var7, WorldMapAreaData.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4); // L: 9449 } - } + + } // L: 9451 } diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/class25.java index b1bd7bc3e9..5c455475e1 100644 --- a/runescape-client/src/main/java/class25.java +++ b/runescape-client/src/main/java/class25.java @@ -1,26 +1,33 @@ -import net.runelite.mapping.ObfuscatedGetter; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("f") +@ObfuscatedName("e") public class class25 { - @ObfuscatedName("ns") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "[Lhd;" + descriptor = "(I)[Llm;", + garbageValue = "742415234" ) - static Widget[] field124; - @ObfuscatedName("rs") - @ObfuscatedGetter( - intValue = 2108681749 - ) - static int field122; + @Export("FillMode_values") + public static FillMode[] FillMode_values() { + return new FillMode[]{FillMode.GRADIENT, FillMode.SOLID, FillMode.GRADIENT_ALPHA}; // L: 15 + } - @ObfuscatedName("ke") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(II)V", - garbageValue = "-777100102" + descriptor = "(Ljava/lang/Throwable;Ljava/lang/String;)Lme;" ) - static void method245(int var0) { - Client.oculusOrbState = var0; + @Export("newRunException") + public static RunException newRunException(Throwable var0, String var1) { + RunException var2; + if (var0 instanceof RunException) { // L: 99 + var2 = (RunException)var0; // L: 100 + var2.message = var2.message + ' ' + var1; // L: 101 + } else { + var2 = new RunException(var0, var1); // L: 103 + } + + return var2; // L: 104 } } diff --git a/runescape-client/src/main/java/class257.java b/runescape-client/src/main/java/class257.java deleted file mode 100644 index 8907f6f02d..0000000000 --- a/runescape-client/src/main/java/class257.java +++ /dev/null @@ -1,46 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("iz") -public class class257 { - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "[Lih;" - ) - @Export("WorldMapElement_cached") - public static WorldMapElement[] WorldMapElement_cached; - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "-540216390" - ) - public static void method4679(int var0, int var1) { - VarbitDefinition var3 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); - VarbitDefinition var2; - if (var3 != null) { - var2 = var3; - } else { - byte[] var8 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); - var3 = new VarbitDefinition(); - if (var8 != null) { - var3.decode(new Buffer(var8)); - } - - VarbitDefinition.VarbitDefinition_cached.put(var3, (long)var0); - var2 = var3; - } - - int var4 = var2.baseVar; - int var5 = var2.startBit; - int var6 = var2.endBit; - int var7 = Varps.Varps_masks[var6 - var5]; - if (var1 < 0 || var1 > var7) { - var1 = 0; - } - - var7 <<= var5; - Varps.Varps_main[var4] = Varps.Varps_main[var4] & ~var7 | var1 << var5 & var7; - } -} diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java index c5f96e913a..4a2a999a10 100644 --- a/runescape-client/src/main/java/class277.java +++ b/runescape-client/src/main/java/class277.java @@ -1,27 +1,27 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jv") +@ObfuscatedName("jr") public class class277 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( descriptor = "([I[II)V", - garbageValue = "805948782" + garbageValue = "-592561993" ) - public static void method5157(int[] var0, int[] var1) { - if (var0 != null && var1 != null) { - ParamDefinition.ByteArrayPool_alternativeSizes = var0; - VarbitDefinition.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; - Fonts.ByteArrayPool_arrays = new byte[var0.length][][]; + public static void method5089(int[] var0, int[] var1) { + if (var0 != null && var1 != null) { // L: 19 + ByteArrayPool.ByteArrayPool_alternativeSizes = var0; // L: 25 + ByteArrayPool.ByteArrayPool_altSizeArrayCounts = new int[var0.length]; // L: 26 + ByteArrayPool.ByteArrayPool_arrays = new byte[var0.length][][]; // L: 27 - for (int var2 = 0; var2 < ParamDefinition.ByteArrayPool_alternativeSizes.length; ++var2) { - Fonts.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; + for (int var2 = 0; var2 < ByteArrayPool.ByteArrayPool_alternativeSizes.length; ++var2) { // L: 28 + ByteArrayPool.ByteArrayPool_arrays[var2] = new byte[var1[var2]][]; // L: 29 } } else { - ParamDefinition.ByteArrayPool_alternativeSizes = null; - VarbitDefinition.ByteArrayPool_altSizeArrayCounts = null; - Fonts.ByteArrayPool_arrays = null; + ByteArrayPool.ByteArrayPool_alternativeSizes = null; // L: 20 + ByteArrayPool.ByteArrayPool_altSizeArrayCounts = null; // L: 21 + ByteArrayPool.ByteArrayPool_arrays = null; // L: 22 } - } + } // L: 23 31 } diff --git a/runescape-client/src/main/java/class278.java b/runescape-client/src/main/java/class278.java index b8726dba14..d06a7c175e 100644 --- a/runescape-client/src/main/java/class278.java +++ b/runescape-client/src/main/java/class278.java @@ -1,26 +1,16 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jj") +@ObfuscatedName("ja") public class class278 { - @ObfuscatedName("sb") - @ObfuscatedSignature( - descriptor = "Lix;" - ) - public static class247 field3585; + @ObfuscatedName("ae") + @Export("fontHelvetica13") + static java.awt.Font fontHelvetica13; - @ObfuscatedName("ap") - @ObfuscatedSignature( - descriptor = "(ILcs;ZB)I", - garbageValue = "73" - ) - static int method5158(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.LOGOUT) { - Client.logoutTimer = 250; - return 1; - } else { - return 2; - } + @ObfuscatedName("z") + static double method5090(double var0, double var2, double var4) { + double var8 = (var0 - var2) / var4; // L: 10 + double var6 = Math.exp(-var8 * var8 / 2.0D) / Math.sqrt(6.283185307179586D); // L: 12 + return var6 / var4; // L: 14 } } diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java index 50c2eee9c6..43c1ecd493 100644 --- a/runescape-client/src/main/java/class279.java +++ b/runescape-client/src/main/java/class279.java @@ -1,11 +1,36 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("jh") +@ObfuscatedName("jk") public class class279 { - @ObfuscatedName("p") - @Export("Entity_unpackSceneX") - public static int Entity_unpackSceneX(long var0) { - return (int)(var0 >>> 0 & 127L); - } + @ObfuscatedName("gi") + @ObfuscatedSignature( + descriptor = "[Llp;" + ) + @Export("headIconPkSprites") + static Sprite[] headIconPkSprites; + + @ObfuscatedName("r") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;IB)V", + garbageValue = "71" + ) + static final void method5092(String var0, int var1) { + PacketBufferNode var2 = Client.getPacketBufferNode(ClientPacket.field2345, Client.packetWriter.isaacCipher); // L: 248 + var2.packetBuffer.writeByte(Decimator.stringCp1252NullTerminatedByteSize(var0) + 1); // L: 249 + var2.packetBuffer.writeByte(var1); // L: 250 + var2.packetBuffer.writeStringCp1252NullTerminated(var0); // L: 251 + Client.packetWriter.addNode(var2); // L: 252 + } // L: 253 + + @ObfuscatedName("hj") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "1031149310" + ) + static void method5091() { + Client.menuOptionsCount = 0; // L: 7004 + Client.isMenuOpen = false; // L: 7005 + } // L: 7006 } diff --git a/runescape-client/src/main/java/class280.java b/runescape-client/src/main/java/class280.java index b176108df1..e2399eb287 100644 --- a/runescape-client/src/main/java/class280.java +++ b/runescape-client/src/main/java/class280.java @@ -1,101 +1,370 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("jb") +@ObfuscatedName("jy") public class class280 { - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;Lmo;I)Ljava/lang/String;", - garbageValue = "-1896450279" + descriptor = "(Lby;II)V", + garbageValue = "1050583706" ) - public static String method5160(CharSequence var0, LoginType var1) { - if (var0 == null) { - return null; + @Export("runScript") + static void runScript(ScriptEvent var0, int var1) { + Object[] var2 = var0.args; // L: 101 + Script var3; + int var17; + if (class219.isWorldMapEvent(var0.type)) { // L: 103 + Frames.worldMapEvent = (WorldMapEvent)var2[0]; // L: 104 + WorldMapElement var4 = WorldMapSection0.WorldMapElement_get(Frames.worldMapEvent.mapElement); // L: 105 + var3 = class204.getWorldMapScript(var0.type, var4.objectId, var4.category); // L: 106 } else { - int var2 = 0; + var17 = (Integer)var2[0]; // L: 109 + var3 = WorldMapRectangle.getScript(var17); // L: 110 + } - int var3; - for (var3 = var0.length(); var2 < var3 && DesktopPlatformInfoProvider.method6481(var0.charAt(var2)); ++var2) { - } + if (var3 != null) { // L: 112 + Interpreter.Interpreter_intStackSize = 0; // L: 115 + Varps.Interpreter_stringStackSize = 0; // L: 116 + var17 = -1; // L: 117 + int[] var5 = var3.opcodes; // L: 118 + int[] var6 = var3.intOperands; // L: 119 + byte var7 = -1; // L: 120 + Interpreter.Interpreter_frameDepth = 0; // L: 121 + Interpreter.field1131 = false; // L: 122 - while (var3 > var2 && DesktopPlatformInfoProvider.method6481(var0.charAt(var3 - 1))) { - --var3; - } + try { + int var10; + try { + Interpreter.Interpreter_intLocals = new int[var3.localIntCount]; // L: 124 + int var8 = 0; // L: 125 + WorldMapID.Interpreter_stringLocals = new String[var3.localStringCount]; // L: 126 + int var9 = 0; // L: 127 - int var4 = var3 - var2; - if (var4 >= 1) { - byte var6; - if (var1 == null) { - var6 = 12; - } else { - switch(var1.field4060) { - case 4: - var6 = 20; - break; - default: - var6 = 12; + int var11; + String var18; + for (var10 = 1; var10 < var2.length; ++var10) { // L: 128 + if (var2[var10] instanceof Integer) { // L: 129 + var11 = (Integer)var2[var10]; // L: 130 + if (var11 == -2147483647) { // L: 131 + var11 = var0.mouseX; + } + + if (var11 == -2147483646) { // L: 132 + var11 = var0.mouseY; + } + + if (var11 == -2147483645) { // L: 133 + var11 = var0.widget != null ? var0.widget.id * 1163691799 * 1189552295 : -1; + } + + if (var11 == -2147483644) { // L: 134 + var11 = var0.opIndex; + } + + if (var11 == -2147483643) { // L: 135 + var11 = var0.widget != null ? var0.widget.childIndex * -1997993253 * 2095440211 : -1; + } + + if (var11 == -2147483642) { // L: 136 + var11 = var0.dragTarget != null ? var0.dragTarget.id * 1163691799 * 1189552295 : -1; + } + + if (var11 == -2147483641) { // L: 137 + var11 = var0.dragTarget != null ? var0.dragTarget.childIndex * -1997993253 * 2095440211 : -1; + } + + if (var11 == -2147483640) { // L: 138 + var11 = var0.keyTyped; + } + + if (var11 == -2147483639) { // L: 139 + var11 = var0.keyPressed; + } + + Interpreter.Interpreter_intLocals[var8++] = var11; // L: 140 + } else if (var2[var10] instanceof String) { // L: 142 + var18 = (String)var2[var10]; // L: 143 + if (var18.equals("event_opbase")) { // L: 144 + var18 = var0.targetName; + } + + WorldMapID.Interpreter_stringLocals[var9++] = var18; // L: 145 + } } - } - if (var4 <= var6) { - StringBuilder var12 = new StringBuilder(var4); + var10 = 0; // L: 149 + Interpreter.field1135 = var0.field593; // L: 150 - for (int var14 = var2; var14 < var3; ++var14) { - char var7 = var0.charAt(var14); - boolean var8; - if (Character.isISOControl(var7)) { - var8 = false; - } else if (Varps.isAlphaNumeric(var7)) { - var8 = true; + while (true) { + ++var10; // L: 152 + if (var10 > var1) { // L: 153 + throw new RuntimeException(); + } + + ++var17; // L: 154 + int var29 = var5[var17]; + int var20; + if (var29 >= 100) { // L: 155 + boolean var32; + if (var3.intOperands[var17] == 1) { // L: 353 + var32 = true; + } else { + var32 = false; // L: 354 + } + + var20 = WorldMapEvent.method830(var29, var3, var32); // L: 355 + switch(var20) { // L: 356 + case 0: + return; + case 1: + default: + break; + case 2: + throw new IllegalStateException(); // L: 363 + } + } else if (var29 == 0) { // L: 156 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var6[var17]; // L: 157 + } else if (var29 == ScriptOpcodes.GET_VARP) { // L: 160 + var11 = var6[var17]; // L: 161 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Varps.Varps_main[var11]; // L: 162 + } else if (var29 == ScriptOpcodes.SET_VARP) { // L: 165 + var11 = var6[var17]; // L: 166 + Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 167 + Clock.changeGameOptions(var11); // L: 168 + } else if (var29 == ScriptOpcodes.SCONST) { // L: 171 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var3.stringOperands[var17]; // L: 172 + } else if (var29 == ScriptOpcodes.JUMP) { // L: 175 + var17 += var6[var17]; // L: 176 + } else if (var29 == ScriptOpcodes.IF_ICMPNE) { // L: 179 + Interpreter.Interpreter_intStackSize -= 2; // L: 180 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 181 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPEQ) { // L: 184 + Interpreter.Interpreter_intStackSize -= 2; // L: 185 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 186 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPLT) { // L: 189 + Interpreter.Interpreter_intStackSize -= 2; // L: 190 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 191 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGT) { // L: 194 + Interpreter.Interpreter_intStackSize -= 2; // L: 195 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 196 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.RETURN) { // L: 199 + if (Interpreter.Interpreter_frameDepth == 0) { // L: 200 + return; + } + + ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth]; // L: 201 + var3 = var34.script; // L: 202 + var5 = var3.opcodes; // L: 203 + var6 = var3.intOperands; // L: 204 + var17 = var34.pc; // L: 205 + Interpreter.Interpreter_intLocals = var34.intLocals; // L: 206 + WorldMapID.Interpreter_stringLocals = var34.stringLocals; // L: 207 + } else if (var29 == ScriptOpcodes.GET_VARBIT) { // L: 210 + var11 = var6[var17]; // L: 211 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapSection1.getVarbit(var11); // L: 212 + } else if (var29 == ScriptOpcodes.SET_VARBIT) { // L: 215 + var11 = var6[var17]; // L: 216 + Huffman.method4047(var11, Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 217 + } else if (var29 == ScriptOpcodes.IF_ICMPLE) { // L: 220 + Interpreter.Interpreter_intStackSize -= 2; // L: 221 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 222 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.IF_ICMPGE) { // L: 225 + Interpreter.Interpreter_intStackSize -= 2; // L: 226 + if (Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]) { // L: 227 + var17 += var6[var17]; + } + } else if (var29 == ScriptOpcodes.ILOAD) { // L: 230 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_intLocals[var6[var17]]; // L: 231 + } else if (var29 == ScriptOpcodes.ISTORE) { // L: 234 + Interpreter.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 235 + } else if (var29 == ScriptOpcodes.SLOAD) { // L: 238 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = WorldMapID.Interpreter_stringLocals[var6[var17]]; // L: 239 + } else if (var29 == ScriptOpcodes.SSTORE) { // L: 242 + WorldMapID.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]; // L: 243 + } else if (var29 == ScriptOpcodes.JOIN_STRING) { // L: 246 + var11 = var6[var17]; // L: 247 + Varps.Interpreter_stringStackSize -= var11; // L: 248 + String var31 = UserComparator6.method3535(Interpreter.Interpreter_stringStack, Varps.Interpreter_stringStackSize, var11); // L: 249 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var31; // L: 250 + } else if (var29 == ScriptOpcodes.POP_INT) { // L: 253 + --Interpreter.Interpreter_intStackSize; // L: 254 + } else if (var29 == ScriptOpcodes.POP_STRING) { // L: 257 + --Varps.Interpreter_stringStackSize; // L: 258 } else { - char[] var9 = class348.field4065; - int var10 = 0; - - label79: - while (true) { - char var11; - if (var10 >= var9.length) { - var9 = class348.field4064; - - for (var10 = 0; var10 < var9.length; ++var10) { - var11 = var9[var10]; - if (var7 == var11) { - var8 = true; - break label79; - } + int var15; + if (var29 != ScriptOpcodes.INVOKE) { // L: 261 + if (var29 == ScriptOpcodes.GET_VARC_INT) { // L: 284 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ClientPreferences.varcs.getInt(var6[var17]); // L: 285 + } else if (var29 == ScriptOpcodes.SET_VARC_INT) { // L: 288 + ClientPreferences.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 289 + } else if (var29 == ScriptOpcodes.DEFINE_ARRAY) { // L: 292 + var11 = var6[var17] >> 16; // L: 293 + var20 = var6[var17] & 65535; // L: 294 + int var21 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 295 + if (var21 < 0 || var21 > 5000) { // L: 296 + throw new RuntimeException(); // L: 297 } - var8 = false; - break; + Interpreter.Interpreter_arrayLengths[var11] = var21; // L: 299 + byte var22 = -1; // L: 300 + if (var20 == 105) { // L: 301 + var22 = 0; + } + + for (var15 = 0; var15 < var21; ++var15) { // L: 302 + Interpreter.Interpreter_arrays[var11][var15] = var22; + } + } else if (var29 == ScriptOpcodes.GET_ARRAY_INT) { // L: 305 + var11 = var6[var17]; // L: 306 + var20 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 307 + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { // L: 308 + throw new RuntimeException(); // L: 309 + } + + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20]; // L: 311 + } else if (var29 == ScriptOpcodes.SET_ARRAY_INT) { // L: 314 + var11 = var6[var17]; // L: 315 + Interpreter.Interpreter_intStackSize -= 2; // L: 316 + var20 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 317 + if (var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) { // L: 318 + throw new RuntimeException(); // L: 319 + } + + Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 321 + } else if (var29 == ScriptOpcodes.GET_VARC_STRING_OLD) { // L: 324 + var18 = ClientPreferences.varcs.getStringOld(var6[var17]); // L: 325 + if (var18 == null) { // L: 326 + var18 = "null"; + } + + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var18; // L: 327 + } else if (var29 == ScriptOpcodes.SET_VARC_STRING_OLD) { // L: 330 + ClientPreferences.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]); // L: 331 + } else if (var29 == ScriptOpcodes.GET_VARC_STRING) { // L: 334 + var18 = ClientPreferences.varcs.getString(var6[var17]); // L: 335 + Interpreter.Interpreter_stringStack[++Varps.Interpreter_stringStackSize - 1] = var18; // L: 336 + } else if (var29 == ScriptOpcodes.SET_VARC_STRING) { // L: 339 + ClientPreferences.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Varps.Interpreter_stringStackSize]); // L: 340 + } else { + if (var29 != ScriptOpcodes.SWITCH) { // L: 343 + throw new IllegalStateException(); // L: 349 + } + + IterableNodeHashTable var33 = var3.switches[var6[var17]]; // L: 344 + IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]); // L: 345 + if (var30 != null) { // L: 346 + var17 += var30.integer; + } + } + } else { + var11 = var6[var17]; // L: 262 + Script var12 = WorldMapRectangle.getScript(var11); // L: 263 + int[] var13 = new int[var12.localIntCount]; // L: 264 + String[] var14 = new String[var12.localStringCount]; // L: 265 + + for (var15 = 0; var15 < var12.intArgumentCount; ++var15) { // L: 266 + var13[var15] = Interpreter.Interpreter_intStack[var15 + (Interpreter.Interpreter_intStackSize - var12.intArgumentCount)]; } - var11 = var9[var10]; - if (var11 == var7) { - var8 = true; - break; + for (var15 = 0; var15 < var12.stringArgumentCount; ++var15) { // L: 267 + var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Varps.Interpreter_stringStackSize - var12.stringArgumentCount)]; } - ++var10; - } - } - - if (var8) { - char var13 = KitDefinition.method4650(var7); - if (var13 != 0) { - var12.append(var13); + Interpreter.Interpreter_intStackSize -= var12.intArgumentCount; // L: 268 + Varps.Interpreter_stringStackSize -= var12.stringArgumentCount; // L: 269 + ScriptFrame var19 = new ScriptFrame(); // L: 270 + var19.script = var3; // L: 271 + var19.pc = var17; // L: 272 + var19.intLocals = Interpreter.Interpreter_intLocals; // L: 273 + var19.stringLocals = WorldMapID.Interpreter_stringLocals; // L: 274 + Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19; // L: 275 + var3 = var12; // L: 276 + var5 = var12.opcodes; // L: 277 + var6 = var12.intOperands; // L: 278 + var17 = -1; // L: 279 + Interpreter.Interpreter_intLocals = var13; // L: 280 + WorldMapID.Interpreter_stringLocals = var14; // L: 281 } } } + } catch (Exception var27) { // L: 369 + StringBuilder var24 = new StringBuilder(30); // L: 371 + var24.append("").append(var3.key).append(" "); // L: 372 - if (var12.length() == 0) { - return null; + for (var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) { // L: 373 + var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" "); } - return var12.toString(); + var24.append("").append(var7); // L: 374 + Decimator.RunException_sendStackTrace(var24.toString(), var27); // L: 375 + } + } finally { + if (Interpreter.field1131) { // L: 379 + Interpreter.field1132 = true; // L: 380 + ItemContainer.method1213(); // L: 381 + Interpreter.field1132 = false; // L: 382 + Interpreter.field1131 = false; // L: 383 } - } - return null; + } } - } + } // L: 113 386 + + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "(Ljava/lang/String;ZZI)V", + garbageValue = "-1343804215" + ) + @Export("openURL") + public static void openURL(String var0, boolean var1, boolean var2) { + WorldMapData_0.method255(var0, var1, "openjs", var2); // L: 27 + } // L: 28 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IIILjg;II)V", + garbageValue = "1627824934" + ) + static void method5093(int var0, int var1, int var2, ObjectDefinition var3, int var4) { + ObjectSound var5 = new ObjectSound(); // L: 67 + var5.plane = var0; // L: 68 + var5.x = var1 * 128; // L: 69 + var5.y = var2 * 128; // L: 70 + int var6 = var3.sizeX; // L: 71 + int var7 = var3.sizeY; // L: 72 + if (var4 == 1 || var4 == 3) { // L: 73 + var6 = var3.sizeY; // L: 74 + var7 = var3.sizeX; // L: 75 + } + + var5.field1106 = (var6 + var1) * 128; // L: 77 + var5.field1117 = (var7 + var2) * 128; // L: 78 + var5.soundEffectId = var3.ambientSoundId; // L: 79 + var5.field1108 = var3.int4 * 128; // L: 80 + var5.field1109 = var3.int5; // L: 81 + var5.field1115 = var3.int6; // L: 82 + var5.soundEffectIds = var3.soundEffectIds; // L: 83 + if (var3.transforms != null) { // L: 84 + var5.obj = var3; // L: 85 + var5.set(); // L: 86 + } + + ObjectSound.objectSounds.addFirst(var5); // L: 88 + if (var5.soundEffectIds != null) { // L: 89 + var5.field1118 = var5.field1109 + (int)(Math.random() * (double)(var5.field1115 - var5.field1109)); + } + + } // L: 90 } diff --git a/runescape-client/src/main/java/class296.java b/runescape-client/src/main/java/class296.java index 09b401747a..975d7d0364 100644 --- a/runescape-client/src/main/java/class296.java +++ b/runescape-client/src/main/java/class296.java @@ -2,42 +2,12 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ks") +@ObfuscatedName("kh") public class class296 { - @ObfuscatedName("j") + @ObfuscatedName("i") @ObfuscatedSignature( - descriptor = "(CI)C", - garbageValue = "1101109074" + descriptor = "Lls;" ) - static char method5464(char var0) { - return var0 != 181 && var0 != 402 ? Character.toTitleCase(var0) : var0; - } - - @ObfuscatedName("z") - @ObfuscatedSignature( - descriptor = "(CI)Z", - garbageValue = "-2022540422" - ) - @Export("isDigit") - public static boolean isDigit(char var0) { - return var0 >= '0' && var0 <= '9'; - } - - @ObfuscatedName("jy") - @ObfuscatedSignature( - descriptor = "(Lhd;IIII)V", - garbageValue = "-213876459" - ) - @Export("drawCompass") - static final void drawCompass(Widget var0, int var1, int var2, int var3) { - SpriteMask var4 = var0.getSpriteMask(false); - if (var4 != null) { - if (Client.minimapState < 3) { - GrandExchangeOfferNameComparator.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); - } else { - Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); - } - - } - } + @Export("titleboxSprite") + static IndexedSprite titleboxSprite; } diff --git a/runescape-client/src/main/java/class297.java b/runescape-client/src/main/java/class297.java index 7bdc84b380..eb4e956a20 100644 --- a/runescape-client/src/main/java/class297.java +++ b/runescape-client/src/main/java/class297.java @@ -1,13 +1,51 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("km") +@ObfuscatedName("kt") public class class297 { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("cp1252AsciiExtension") public static final char[] cp1252AsciiExtension; + @ObfuscatedName("o") + static byte[][][] field3668; static { - cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; + cp1252AsciiExtension = new char[]{'€', '\u0000', '‚', 'ƒ', '„', '…', '†', '‡', 'ˆ', '‰', 'Š', '‹', 'Œ', '\u0000', 'Ž', '\u0000', '\u0000', '‘', '’', '“', '”', '•', '–', '—', '˜', '™', 'š', '›', 'œ', '\u0000', 'ž', 'Ÿ'}; // L: 4 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)I", + garbageValue = "-486597081" + ) + public static int method5378(int var0) { + --var0; // L: 44 + var0 |= var0 >>> 1; // L: 45 + var0 |= var0 >>> 2; // L: 46 + var0 |= var0 >>> 4; // L: 47 + var0 |= var0 >>> 8; // L: 48 + var0 |= var0 >>> 16; // L: 49 + return var0 + 1; // L: 50 + } + + @ObfuscatedName("io") + @ObfuscatedSignature( + descriptor = "(IB)Ljava/lang/String;", + garbageValue = "115" + ) + @Export("formatItemStacks") + static final String formatItemStacks(int var0) { + String var1 = Integer.toString(var0); // L: 9175 + + for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) { // L: 9176 + var1 = var1.substring(0, var2) + "," + var1.substring(var2); // L: 9177 + } + + if (var1.length() > 9) { // L: 9179 + return " " + WorldMapAreaData.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; + } else { + return var1.length() > 6 ? " " + WorldMapAreaData.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + WorldMapAreaData.colorStartTag(16776960) + var1 + ""; // L: 9180 9181 + } } } diff --git a/runescape-client/src/main/java/class298.java b/runescape-client/src/main/java/class298.java index d1b64cdb14..215a6845d8 100644 --- a/runescape-client/src/main/java/class298.java +++ b/runescape-client/src/main/java/class298.java @@ -2,63 +2,84 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kt") +@ObfuscatedName("ks") public final class class298 { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("base37Table") static final char[] base37Table; - @ObfuscatedName("o") - static long[] field3671; + @ObfuscatedName("k") + static long[] field3673; static { - base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; - field3671 = new long[12]; + base37Table = new char[]{'_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; // L: 4 + field3673 = new long[12]; // L: 5 - for (int var0 = 0; var0 < field3671.length; ++var0) { - field3671[var0] = (long)Math.pow(37.0D, (double)var0); + for (int var0 = 0; var0 < field3673.length; ++var0) { // L: 8 + field3673[var0] = (long)Math.pow(37.0D, (double)var0); } - } + } // L: 9 - @ObfuscatedName("g") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(IZI)Ljava/lang/String;", - garbageValue = "-1481741683" + descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;", + garbageValue = "-2086382894" ) - @Export("intToString") - public static String intToString(int var0, boolean var1) { - if (var1 && var0 >= 0) { - int var3 = var0; - String var2; - if (var1 && var0 >= 0) { - int var4 = 2; + public static String method5386(CharSequence var0) { + int var1 = var0.length(); // L: 11 + StringBuilder var2 = new StringBuilder(var1); // L: 12 - for (int var5 = var0 / 10; var5 != 0; ++var4) { - var5 /= 10; - } - - char[] var6 = new char[var4]; - var6[0] = '+'; - - for (int var7 = var4 - 1; var7 > 0; --var7) { - int var8 = var3; - var3 /= 10; - int var9 = var8 - var3 * 10; - if (var9 >= 10) { - var6[var7] = (char)(var9 + 87); + for (int var3 = 0; var3 < var1; ++var3) { // L: 13 + char var4 = var0.charAt(var3); // L: 14 + if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') { // L: 15 + if (var4 == ' ') { // L: 16 + var2.append('+'); + } else { + byte var5 = class227.charToByteCp1252(var4); // L: 18 + var2.append('%'); // L: 19 + int var6 = var5 >> 4 & 15; // L: 20 + if (var6 >= 10) { // L: 21 + var2.append((char)(var6 + 55)); } else { - var6[var7] = (char)(var9 + 48); + var2.append((char)(var6 + 48)); // L: 22 + } + + var6 = var5 & 15; // L: 23 + if (var6 >= 10) { // L: 24 + var2.append((char)(var6 + 55)); + } else { + var2.append((char)(var6 + 48)); } } - - var2 = new String(var6); } else { - var2 = Integer.toString(var0, 10); + var2.append(var4); // L: 25 } - - return var2; - } else { - return Integer.toString(var0); } + + return var2.toString(); // L: 28 } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(II)[B", + garbageValue = "1967636466" + ) + @Export("ByteArrayPool_getArray") + public static synchronized byte[] ByteArrayPool_getArray(int var0) { + return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72 + } + + @ObfuscatedName("fb") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "108" + ) + @Export("playSoundJingle") + static void playSoundJingle(int var0, int var1) { + if (Client.musicVolume != 0 && var0 != -1) { // L: 3312 + Script.method2322(GrandExchangeEvent.archive11, var0, 0, Client.musicVolume, false); // L: 3313 + Client.field704 = true; // L: 3314 + } + + } // L: 3316 } diff --git a/runescape-client/src/main/java/class299.java b/runescape-client/src/main/java/class299.java index e7c1431785..e15ae921c9 100644 --- a/runescape-client/src/main/java/class299.java +++ b/runescape-client/src/main/java/class299.java @@ -1,89 +1,103 @@ import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("kr") +@ObfuscatedName("ke") public class class299 { - @ObfuscatedName("m") - public static char[] field3677; - @ObfuscatedName("o") - static char[] field3674; - @ObfuscatedName("q") + @ObfuscatedName("z") + static char[] field3676; + @ObfuscatedName("k") static char[] field3675; - @ObfuscatedName("j") - static int[] field3673; + @ObfuscatedName("s") + static char[] field3674; + @ObfuscatedName("t") + static int[] field3677; static { - field3677 = new char[64]; + field3676 = new char[64]; // L: 7 int var0; - for (var0 = 0; var0 < 26; ++var0) { - field3677[var0] = (char)(var0 + 65); + for (var0 = 0; var0 < 26; ++var0) { // L: 8 + field3676[var0] = (char)(var0 + 65); } - for (var0 = 26; var0 < 52; ++var0) { - field3677[var0] = (char)(var0 + 97 - 26); + for (var0 = 26; var0 < 52; ++var0) { // L: 9 + field3676[var0] = (char)(var0 + 97 - 26); } - for (var0 = 52; var0 < 62; ++var0) { - field3677[var0] = (char)(var0 + 48 - 52); + for (var0 = 52; var0 < 62; ++var0) { // L: 10 + field3676[var0] = (char)(var0 + 48 - 52); } - field3677[62] = '+'; - field3677[63] = '/'; - field3674 = new char[64]; + field3676[62] = '+'; // L: 11 + field3676[63] = '/'; // L: 12 + field3675 = new char[64]; // L: 18 - for (var0 = 0; var0 < 26; ++var0) { - field3674[var0] = (char)(var0 + 65); - } - - for (var0 = 26; var0 < 52; ++var0) { - field3674[var0] = (char)(var0 + 97 - 26); - } - - for (var0 = 52; var0 < 62; ++var0) { - field3674[var0] = (char)(var0 + 48 - 52); - } - - field3674[62] = '*'; - field3674[63] = '-'; - field3675 = new char[64]; - - for (var0 = 0; var0 < 26; ++var0) { + for (var0 = 0; var0 < 26; ++var0) { // L: 19 field3675[var0] = (char)(var0 + 65); } - for (var0 = 26; var0 < 52; ++var0) { + for (var0 = 26; var0 < 52; ++var0) { // L: 20 field3675[var0] = (char)(var0 + 97 - 26); } - for (var0 = 52; var0 < 62; ++var0) { + for (var0 = 52; var0 < 62; ++var0) { // L: 21 field3675[var0] = (char)(var0 + 48 - 52); } - field3675[62] = '-'; - field3675[63] = '_'; - field3673 = new int[128]; + field3675[62] = '*'; // L: 22 + field3675[63] = '-'; // L: 23 + field3674 = new char[64]; // L: 29 - for (var0 = 0; var0 < field3673.length; ++var0) { - field3673[var0] = -1; + for (var0 = 0; var0 < 26; ++var0) { // L: 30 + field3674[var0] = (char)(var0 + 65); } - for (var0 = 65; var0 <= 90; ++var0) { - field3673[var0] = var0 - 65; + for (var0 = 26; var0 < 52; ++var0) { // L: 31 + field3674[var0] = (char)(var0 + 97 - 26); } - for (var0 = 97; var0 <= 122; ++var0) { - field3673[var0] = var0 - 97 + 26; + for (var0 = 52; var0 < 62; ++var0) { // L: 32 + field3674[var0] = (char)(var0 + 48 - 52); } - for (var0 = 48; var0 <= 57; ++var0) { - field3673[var0] = var0 - 48 + 52; + field3674[62] = '-'; // L: 33 + field3674[63] = '_'; // L: 34 + field3677 = new int[128]; // L: 40 + + for (var0 = 0; var0 < field3677.length; ++var0) { // L: 41 + field3677[var0] = -1; } - int[] var2 = field3673; - field3673[43] = 62; - var2[42] = 62; - int[] var1 = field3673; - field3673[47] = 63; - var1[45] = 63; - } + for (var0 = 65; var0 <= 90; ++var0) { // L: 42 + field3677[var0] = var0 - 65; + } + + for (var0 = 97; var0 <= 122; ++var0) { // L: 43 + field3677[var0] = var0 - 97 + 26; + } + + for (var0 = 48; var0 <= 57; ++var0) { // L: 44 + field3677[var0] = var0 - 48 + 52; + } + + int[] var2 = field3677; // L: 45 + field3677[43] = 62; // L: 46 + var2[42] = 62; // L: 47 + int[] var1 = field3677; // L: 48 + field3677[47] = 63; // L: 49 + var1[45] = 63; // L: 50 + } // L: 51 + + @ObfuscatedName("w") + @ObfuscatedSignature( + descriptor = "(IIB)V", + garbageValue = "-48" + ) + public static final void method5393(int var0, int var1) { + ViewportMouse.ViewportMouse_x = var0; // L: 86 + ViewportMouse.ViewportMouse_y = var1; // L: 87 + ViewportMouse.ViewportMouse_isInViewport = true; // L: 88 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 89 + ViewportMouse.ViewportMouse_false0 = false; // L: 90 + } // L: 91 } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 51400f6fe1..851da7d8e5 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -1,215 +1,1493 @@ +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.util.Random; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("j") +@ObfuscatedName("t") public class class3 implements Enumerated { - @ObfuscatedName("qs") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Llz;" + descriptor = "Lt;" ) - @Export("sceneMinimapSprite") - static Sprite sceneMinimapSprite; - @ObfuscatedName("m") + static final class3 field23; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lj;" + descriptor = "Lt;" ) - public static final class3 field10; - @ObfuscatedName("o") + static final class3 field13; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lj;" + descriptor = "Lt;" ) - public static final class3 field8; - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Lj;" - ) - public static final class3 field9; - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = 1514445555 - ) - final int field14; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -658537441 - ) - public final int field15; - @ObfuscatedName("g") - public final Class field12; + static final class3 field24; @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "Lm;" + @ObfuscatedGetter( + intValue = -1676805267 ) - public final class0 field13; + static int field25; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lhq;" + ) + static Widget field12; + @ObfuscatedName("es") + @ObfuscatedSignature( + descriptor = "Liw;" + ) + @Export("archive17") + static Archive archive17; + @ObfuscatedName("t") + @ObfuscatedGetter( + intValue = 1942324961 + ) + final int field15; + @ObfuscatedName("i") + @ObfuscatedGetter( + intValue = -83927061 + ) + public final int field16; + @ObfuscatedName("o") + public final Class field17; + @ObfuscatedName("x") + @ObfuscatedSignature( + descriptor = "Lz;" + ) + final class0 field18; static { - field10 = new class3(2, 0, Integer.class, new class1()); - field8 = new class3(1, 1, Long.class, new class2()); - field9 = new class3(0, 2, String.class, new class4()); + field23 = new class3(0, 0, Integer.class, new class1()); // L: 10 + field13 = new class3(1, 1, Long.class, new class2()); // L: 23 + field24 = new class3(2, 2, String.class, new class4()); // L: 36 } @ObfuscatedSignature( - descriptor = "(IILjava/lang/Class;Lm;)V" + descriptor = "(IILjava/lang/Class;Lz;)V" ) class3(int var1, int var2, Class var3, class0 var4) { - this.field14 = var1; - this.field15 = var2; - this.field12 = var3; - this.field13 = var4; - } + this.field15 = var1; // L: 59 + this.field16 = var2; // L: 60 + this.field17 = var3; // L: 61 + this.field18 = var4; // L: 62 + } // L: 63 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field15; + return this.field16; // L: 94 } - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkn;I)Ljava/lang/Object;", - garbageValue = "-1114505867" + descriptor = "(Lkf;I)Ljava/lang/Object;", + garbageValue = "101023804" ) - public Object method40(Buffer var1) { - return this.field13.vmethod47(var1); + public Object method46(Buffer var1) { + return this.field18.vmethod61(var1); // L: 98 } - @ObfuscatedName("o") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)[Lu;", - garbageValue = "849855680" + descriptor = "(I)[Lt;", + garbageValue = "-127122137" ) - public static class7[] method41() { - return new class7[]{class7.field30}; + public static class3[] method47() { + return new class3[]{field23, field13, field24}; // L: 55 } - @ObfuscatedName("q") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(III)Lbr;", - garbageValue = "-1323441814" + descriptor = "(Ljava/lang/Object;Lkf;B)V", + garbageValue = "69" ) - @Export("Messages_getByChannelAndID") - static Message Messages_getByChannelAndID(int var0, int var1) { - ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0); - return var2.getMessage(var1); - } + public static void method43(Object var0, Buffer var1) { + Class var3 = var0.getClass(); // L: 67 + class3[] var5 = method47(); // L: 72 + int var6 = 0; - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(B)Lch;", - garbageValue = "12" - ) - @Export("getNextWorldListWorld") - static World getNextWorldListWorld() { - return World.World_listCount < World.World_count ? class13.World_worlds[++World.World_listCount - 1] : null; - } - - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "([BI)V", - garbageValue = "-2060767069" - ) - @Export("SpriteBuffer_decode") - public static void SpriteBuffer_decode(byte[] var0) { - Buffer var1 = new Buffer(var0); - var1.offset = var0.length - 2; - class335.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - class335.SpriteBuffer_xOffsets = new int[class335.SpriteBuffer_spriteCount]; - NPC.SpriteBuffer_yOffsets = new int[class335.SpriteBuffer_spriteCount]; - class335.SpriteBuffer_spriteWidths = new int[class335.SpriteBuffer_spriteCount]; - class335.SpriteBuffer_spriteHeights = new int[class335.SpriteBuffer_spriteCount]; - ItemDefinition.SpriteBuffer_pixels = new byte[class335.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8; - class335.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - UserComparator8.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); - int var2 = (var1.readUnsignedByte() & 255) + 1; - - int var3; - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - class335.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - NPC.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - class335.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); - } - - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - class335.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); - } - - var1.offset = var0.length - 7 - class335.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; - class335.SpriteBuffer_spritePalette = new int[var2]; - - for (var3 = 1; var3 < var2; ++var3) { - class335.SpriteBuffer_spritePalette[var3] = var1.readMedium(); - if (class335.SpriteBuffer_spritePalette[var3] == 0) { - class335.SpriteBuffer_spritePalette[var3] = 1; + class3 var4; + while (true) { + if (var6 >= var5.length) { + var4 = null; // L: 83 + break; } + + class3 var7 = var5[var6]; // L: 74 + if (var3 == var7.field17) { // L: 76 + var4 = var7; // L: 77 + break; + } + + ++var6; // L: 73 } - var1.offset = 0; + if (var4 == null) { + throw new IllegalArgumentException(); // L: 86 + } else { + class0 var2 = var4.field18; // L: 87 + var2.vmethod70(var0, var1); // L: 90 + } + } // L: 91 - for (var3 = 0; var3 < class335.SpriteBuffer_spriteCount; ++var3) { - int var4 = class335.SpriteBuffer_spriteWidths[var3]; - int var5 = class335.SpriteBuffer_spriteHeights[var3]; - int var6 = var5 * var4; - byte[] var7 = new byte[var6]; - ItemDefinition.SpriteBuffer_pixels[var3] = var7; - int var8 = var1.readUnsignedByte(); - int var9; - if (var8 == 0) { - for (var9 = 0; var9 < var6; ++var9) { - var7[var9] = var1.readByte(); + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(Lbw;I)V", + garbageValue = "823083332" + ) + @Export("doCycleTitle") + static void doCycleTitle(GameShell var0) { + if (Login.worldSelectOpen) { // L: 264 + GameBuild.method4217(var0); // L: 265 + } else { + int var3; + if ((MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) { // L: 268 + Tile.clientPreferences.titleMusicDisabled = !Tile.clientPreferences.titleMusicDisabled; // L: 269 + WorldMapData_1.savePreferences(); // L: 270 + if (!Tile.clientPreferences.titleMusicDisabled) { // L: 271 + Archive var1 = CollisionMap.archive6; // L: 272 + int var2 = var1.getGroupId("scape main"); // L: 274 + var3 = var1.getFileId(var2, ""); // L: 275 + Script.method2322(var1, var2, var3, 255, false); // L: 276 + } else { + class206.midiPcmStream.clear(); // L: 280 + class206.musicPlayerStatus = 1; // L: 281 + class204.musicTrackArchive = null; // L: 282 } - } else if (var8 == 1) { - for (var9 = 0; var9 < var4; ++var9) { - for (int var10 = 0; var10 < var5; ++var10) { - var7[var9 + var10 * var4] = var1.readByte(); + } + + if (Client.gameState != 5) { // L: 285 + if (-1L == Login.field1232) { // L: 286 + Login.field1232 = PacketWriter.currentTimeMillis() + 1000L; // L: 287 + } + + long var30 = PacketWriter.currentTimeMillis(); // L: 289 + if (GrandExchangeOffer.method207() && -1L == Login.field1233) { // L: 290 291 + Login.field1233 = var30; // L: 292 + if (Login.field1233 > Login.field1232) { // L: 293 + Login.field1232 = Login.field1233; // L: 294 } } + + if (Client.gameState == 10 || Client.gameState == 11) { // L: 298 + if (Language.Language_EN == class58.clientLanguage) { // L: 299 + if (MouseHandler.MouseHandler_lastButton == 1 || !ScriptEvent.mouseCam && MouseHandler.MouseHandler_lastButton == 4) { // L: 300 + var3 = Login.xPadding + 5; // L: 301 + short var4 = 463; // L: 302 + byte var5 = 100; // L: 303 + byte var6 = 35; // L: 304 + if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var5 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var4 + var6) { // L: 305 + if (ScriptFrame.loadWorlds()) { // L: 307 + Login.worldSelectOpen = true; // L: 308 + Login.worldSelectPage = 0; // L: 309 + Login.worldSelectPagesCount = 0; // L: 310 + } + + return; // L: 313 + } + } + + if (WorldMapScaleHandler.World_request != null && ScriptFrame.loadWorlds()) { // L: 316 317 + Login.worldSelectOpen = true; // L: 318 + Login.worldSelectPage = 0; // L: 319 + Login.worldSelectPagesCount = 0; // L: 320 + } + } + + var3 = MouseHandler.MouseHandler_lastButton; // L: 324 + int var54 = MouseHandler.MouseHandler_lastPressedX; // L: 325 + int var55 = MouseHandler.MouseHandler_lastPressedY; // L: 326 + if (var3 == 0) { // L: 327 + var54 = MouseHandler.MouseHandler_x; // L: 328 + var55 = MouseHandler.MouseHandler_y; // L: 329 + } + + if (!ScriptEvent.mouseCam && var3 == 4) { // L: 331 + var3 = 1; + } + + short var58; + int var59; + if (Login.loginIndex == 0) { // L: 332 + boolean var65 = false; // L: 333 + + while (class60.isKeyDown()) { // L: 334 + if (PlayerAppearance.field2581 == 84) { // L: 335 + var65 = true; // L: 336 + } + } + + var59 = IsaacCipher.loginBoxCenter - 80; // L: 339 + var58 = 291; // L: 340 + if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 341 + class280.openURL(HealthBarDefinition.method4563("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false); // L: 342 + } + + var59 = IsaacCipher.loginBoxCenter + 80; // L: 344 + if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20 || var65) { // L: 345 + if ((Client.worldProperties & 33554432) != 0) { // L: 346 + Login.Login_response0 = ""; // L: 347 + Login.Login_response1 = "This is a Beta world."; // L: 348 + Login.Login_response2 = "Your normal account will not be affected."; // L: 349 + Login.Login_response3 = ""; // L: 350 + Login.loginIndex = 1; // L: 351 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 353 + Login.currentLoginField = 1; // L: 354 + } else { + Login.currentLoginField = 0; // L: 357 + } + } else if ((Client.worldProperties & 4) != 0) { // L: 361 + if ((Client.worldProperties & 1024) != 0) { // L: 362 + Login.Login_response1 = "This is a High Risk PvP world."; // L: 363 + Login.Login_response2 = "Players can attack each other almost everywhere"; // L: 364 + Login.Login_response3 = "and the Protect Item prayer won't work."; // L: 365 + } else { + Login.Login_response1 = "This is a PvP world."; // L: 368 + Login.Login_response2 = "Players can attack each other"; // L: 369 + Login.Login_response3 = "almost everywhere."; // L: 370 + } + + Login.Login_response0 = "Warning!"; // L: 372 + Login.loginIndex = 1; // L: 373 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 375 + Login.currentLoginField = 1; // L: 376 + } else { + Login.currentLoginField = 0; // L: 379 + } + } else if ((Client.worldProperties & 1024) != 0) { // L: 383 + Login.Login_response1 = "This is a High Risk world."; // L: 384 + Login.Login_response2 = "The Protect Item prayer will"; // L: 385 + Login.Login_response3 = "not work on this world."; // L: 386 + Login.Login_response0 = "Warning!"; // L: 387 + Login.loginIndex = 1; // L: 388 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 390 + Login.currentLoginField = 1; // L: 391 + } else { + Login.currentLoginField = 0; // L: 394 + } + } else { + class41.Login_promptCredentials(false); // L: 399 + } + } + } else { + short var7; + int var56; + if (Login.loginIndex == 1) { // L: 403 + while (true) { + if (!class60.isKeyDown()) { // L: 404 + var56 = IsaacCipher.loginBoxCenter - 80; // L: 412 + var7 = 321; // L: 413 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 414 + class41.Login_promptCredentials(false); // L: 415 + } + + var56 = IsaacCipher.loginBoxCenter + 80; // L: 417 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 418 + Login.loginIndex = 0; // L: 419 + } + break; + } + + if (PlayerAppearance.field2581 == 84) { // L: 405 + class41.Login_promptCredentials(false); // L: 406 + } else if (PlayerAppearance.field2581 == 13) { // L: 408 + Login.loginIndex = 0; // L: 409 + } + } + } else { + int var10; + String var12; + short var57; + boolean var61; + if (Login.loginIndex == 2) { // L: 422 + var57 = 201; // L: 423 + var56 = var57 + 52; // L: 424 + if (var3 == 1 && var55 >= var56 - 12 && var55 < var56 + 2) { // L: 425 + Login.currentLoginField = 0; + } + + var56 += 15; // L: 426 + if (var3 == 1 && var55 >= var56 - 12 && var55 < var56 + 2) { // L: 427 + Login.currentLoginField = 1; + } + + var56 += 15; // L: 428 + var57 = 361; // L: 429 + if (GrandExchangeOfferNameComparator.field112 != null) { // L: 430 + var59 = GrandExchangeOfferNameComparator.field112.highX / 2; // L: 431 + if (var3 == 1 && var54 >= GrandExchangeOfferNameComparator.field112.lowX - var59 && var54 <= var59 + GrandExchangeOfferNameComparator.field112.lowX && var55 >= var57 - 15 && var55 < var57) { // L: 432 + switch(Login.field1213) { // L: 433 + case 1: + UrlRequester.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 436 + Login.loginIndex = 5; // L: 437 + return; // L: 438 + case 2: + class280.openURL("https://support.runescape.com/hc/en-gb", true, false); // L: 442 + } + } + } + + var59 = IsaacCipher.loginBoxCenter - 80; // L: 448 + var58 = 321; // L: 449 + if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 450 + Login.Login_username = Login.Login_username.trim(); // L: 451 + if (Login.Login_username.length() == 0) { // L: 452 + UrlRequester.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 453 + return; // L: 454 + } + + if (Login.Login_password.length() == 0) { // L: 456 + UrlRequester.setLoginResponseString("", "Please enter your password.", ""); // L: 457 + return; // L: 458 + } + + UrlRequester.setLoginResponseString("", "Connecting to server...", ""); // L: 460 + class22.method245(false); // L: 461 + CollisionMap.updateGameState(20); // L: 462 + return; // L: 463 + } + + var59 = Login.loginBoxX + 180 + 80; // L: 465 + if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 466 + Login.loginIndex = 0; // L: 467 + Login.Login_username = ""; // L: 468 + Login.Login_password = ""; // L: 469 + LoginScreenAnimation.field1070 = 0; // L: 470 + WorldMapLabelSize.otp = ""; // L: 471 + Login.field1223 = true; // L: 472 + } + + var59 = IsaacCipher.loginBoxCenter + -117; // L: 474 + var58 = 277; // L: 475 + Login.field1224 = var54 >= var59 && var54 < var59 + GrandExchangeOfferNameComparator.field114 && var55 >= var58 && var55 < var58 + ReflectionCheck.field1364; // L: 476 + if (var3 == 1 && Login.field1224) { // L: 477 + Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered; // L: 478 + if (!Client.Login_isUsernameRemembered && Tile.clientPreferences.rememberedUsername != null) { // L: 479 + Tile.clientPreferences.rememberedUsername = null; // L: 480 + WorldMapData_1.savePreferences(); // L: 481 + } + } + + var59 = IsaacCipher.loginBoxCenter + 24; // L: 484 + var58 = 277; // L: 485 + Login.field1201 = var54 >= var59 && var54 < var59 + GrandExchangeOfferNameComparator.field114 && var55 >= var58 && var55 < var58 + ReflectionCheck.field1364; // L: 486 + if (var3 == 1 && Login.field1201) { // L: 487 + Tile.clientPreferences.hideUsername = !Tile.clientPreferences.hideUsername; // L: 488 + if (!Tile.clientPreferences.hideUsername) { // L: 489 + Login.Login_username = ""; // L: 490 + Tile.clientPreferences.rememberedUsername = null; // L: 491 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 493 + Login.currentLoginField = 1; // L: 494 + } else { + Login.currentLoginField = 0; // L: 497 + } + } + + WorldMapData_1.savePreferences(); // L: 501 + } + + label1256: + while (true) { + Transferable var33; + int var68; + do { + while (true) { + label1220: + do { + while (true) { + while (class60.isKeyDown()) { // L: 503 + if (PlayerAppearance.field2581 != 13) { // L: 504 + if (Login.currentLoginField != 0) { // L: 513 + continue label1220; + } + + char var63 = PacketWriter.field1350; // L: 514 + + for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length() && var63 != "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10); ++var10) { // L: 516 517 + } + + if (PlayerAppearance.field2581 == 85 && Login.Login_username.length() > 0) { // L: 520 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (PlayerAppearance.field2581 == 84 || PlayerAppearance.field2581 == 80) { // L: 521 + Login.currentLoginField = 1; + } + + char var67 = PacketWriter.field1350; // L: 523 + boolean var64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var67) != -1; // L: 525 + if (var64 && Login.Login_username.length() < 320) { // L: 527 + Login.Login_username = Login.Login_username + PacketWriter.field1350; + } + } else { + Login.loginIndex = 0; // L: 505 + Login.Login_username = ""; // L: 506 + Login.Login_password = ""; // L: 507 + LoginScreenAnimation.field1070 = 0; // L: 508 + WorldMapLabelSize.otp = ""; // L: 509 + Login.field1223 = true; // L: 510 + } + } + + return; // L: 1085 + } + } while(Login.currentLoginField != 1); // L: 529 + + if (PlayerAppearance.field2581 == 85 && Login.Login_password.length() > 0) { // L: 530 + Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1); // L: 531 + } else if (PlayerAppearance.field2581 == 84 || PlayerAppearance.field2581 == 80) { // L: 533 + Login.currentLoginField = 0; // L: 534 + if (PlayerAppearance.field2581 == 84) { // L: 535 + Login.Login_username = Login.Login_username.trim(); // L: 536 + if (Login.Login_username.length() == 0) { // L: 537 + UrlRequester.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 538 + return; // L: 539 + } + + if (Login.Login_password.length() == 0) { // L: 541 + UrlRequester.setLoginResponseString("", "Please enter your password.", ""); // L: 542 + return; // L: 543 + } + + UrlRequester.setLoginResponseString("", "Connecting to server...", ""); // L: 545 + class22.method245(false); // L: 546 + CollisionMap.updateGameState(20); // L: 547 + return; // L: 548 + } + } + + if ((KeyHandler.KeyHandler_pressedKeys[82] || KeyHandler.KeyHandler_pressedKeys[87]) && PlayerAppearance.field2581 == 67) { // L: 551 + Clipboard var32 = Toolkit.getDefaultToolkit().getSystemClipboard(); // L: 552 + var33 = var32.getContents(class2.client); // L: 553 + var68 = 20 - Login.Login_password.length(); // L: 554 + break; + } + + if (Tiles.method1187(PacketWriter.field1350)) { // L: 579 + char var66 = PacketWriter.field1350; // L: 581 + var61 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var66) != -1; // L: 583 + if (var61 && Login.Login_password.length() < 20) { // L: 585 586 + Login.Login_password = Login.Login_password + PacketWriter.field1350; // L: 587 + } + } + } + } while(var68 <= 0); // L: 555 + + try { + var12 = (String)var33.getTransferData(DataFlavor.stringFlavor); // L: 557 + int var69 = Math.min(var68, var12.length()); // L: 558 + int var14 = 0; + + while (true) { + if (var14 >= var69) { + Login.Login_password = Login.Login_password + var12.substring(0, var69); // L: 573 + continue label1256; + } + + if (!Tiles.method1187(var12.charAt(var14))) { // L: 561 + break; + } + + char var16 = var12.charAt(var14); // L: 563 + boolean var15 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".indexOf(var16) != -1; // L: 565 + if (!var15) { // L: 567 + break; + } + + ++var14; // L: 559 + } + + Login.loginIndex = 3; // L: 569 + return; // L: 570 + } catch (UnsupportedFlavorException var52) { // L: 575 + } catch (IOException var53) { // L: 576 + } + } + } else if (Login.loginIndex == 3) { // L: 595 + var56 = Login.loginBoxX + 180; // L: 596 + var7 = 276; // L: 597 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 598 + class41.Login_promptCredentials(false); // L: 599 + } + + var56 = Login.loginBoxX + 180; // L: 601 + var7 = 326; // L: 602 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 603 + UrlRequester.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 604 + Login.loginIndex = 5; // L: 605 + return; // L: 606 + } + } else { + int var9; + if (Login.loginIndex == 4) { // L: 609 + var56 = Login.loginBoxX + 180 - 80; // L: 610 + var7 = 321; // L: 611 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 612 + WorldMapLabelSize.otp.trim(); // L: 613 + if (WorldMapLabelSize.otp.length() != 6) { // L: 614 + UrlRequester.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 615 + return; // L: 616 + } + + LoginScreenAnimation.field1070 = Integer.parseInt(WorldMapLabelSize.otp); // L: 618 + WorldMapLabelSize.otp = ""; // L: 619 + class22.method245(true); // L: 620 + UrlRequester.setLoginResponseString("", "Connecting to server...", ""); // L: 621 + CollisionMap.updateGameState(20); // L: 622 + return; // L: 623 + } + + if (var3 == 1 && var54 >= Login.loginBoxX + 180 - 9 && var54 <= Login.loginBoxX + 180 + 130 && var55 >= 263 && var55 <= 296) { // L: 625 + Login.field1223 = !Login.field1223; // L: 626 + } + + if (var3 == 1 && var54 >= Login.loginBoxX + 180 - 34 && var54 <= Login.loginBoxX + 34 + 180 && var55 >= 351 && var55 <= 363) { // L: 628 + class280.openURL(HealthBarDefinition.method4563("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false); // L: 629 + } + + var56 = Login.loginBoxX + 180 + 80; // L: 631 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 632 + Login.loginIndex = 0; // L: 633 + Login.Login_username = ""; // L: 634 + Login.Login_password = ""; // L: 635 + LoginScreenAnimation.field1070 = 0; // L: 636 + WorldMapLabelSize.otp = ""; // L: 637 + } + + while (class60.isKeyDown()) { // L: 639 + boolean var8 = false; // L: 640 + + for (var9 = 0; var9 < "1234567890".length(); ++var9) { // L: 641 + if (PacketWriter.field1350 == "1234567890".charAt(var9)) { // L: 642 + var8 = true; // L: 643 + break; // L: 644 + } + } + + if (PlayerAppearance.field2581 == 13) { // L: 647 + Login.loginIndex = 0; // L: 648 + Login.Login_username = ""; // L: 649 + Login.Login_password = ""; // L: 650 + LoginScreenAnimation.field1070 = 0; // L: 651 + WorldMapLabelSize.otp = ""; // L: 652 + } else { + if (PlayerAppearance.field2581 == 85 && WorldMapLabelSize.otp.length() > 0) { // L: 655 + WorldMapLabelSize.otp = WorldMapLabelSize.otp.substring(0, WorldMapLabelSize.otp.length() - 1); + } + + if (PlayerAppearance.field2581 == 84) { // L: 656 + WorldMapLabelSize.otp.trim(); // L: 657 + if (WorldMapLabelSize.otp.length() != 6) { // L: 658 + UrlRequester.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 659 + return; // L: 660 + } + + LoginScreenAnimation.field1070 = Integer.parseInt(WorldMapLabelSize.otp); // L: 662 + WorldMapLabelSize.otp = ""; // L: 663 + class22.method245(true); // L: 664 + UrlRequester.setLoginResponseString("", "Connecting to server...", ""); // L: 665 + CollisionMap.updateGameState(20); // L: 666 + return; // L: 667 + } + + if (var8 && WorldMapLabelSize.otp.length() < 6) { // L: 669 + WorldMapLabelSize.otp = WorldMapLabelSize.otp + PacketWriter.field1350; + } + } + } + } else if (Login.loginIndex == 5) { // L: 673 + var56 = Login.loginBoxX + 180 - 80; // L: 674 + var7 = 321; // L: 675 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 676 + Login.Login_username = Login.Login_username.trim(); // L: 678 + if (Login.Login_username.length() == 0) { // L: 679 + UrlRequester.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 680 + } else { + long var34 = class13.method134(); // L: 684 + byte var60; + if (0L == var34) { // L: 685 + var60 = 5; + } else { + var12 = Login.Login_username; // L: 688 + Random var36 = new Random(); // L: 690 + Buffer var76 = new Buffer(128); // L: 691 + Buffer var77 = new Buffer(128); // L: 692 + int[] var78 = new int[]{var36.nextInt(), var36.nextInt(), (int)(var34 >> 32), (int)var34}; // L: 693 694 695 696 697 + var76.writeByte(10); // L: 698 + + int var17; + for (var17 = 0; var17 < 4; ++var17) { // L: 699 + var76.writeInt(var36.nextInt()); // L: 700 + } + + var76.writeInt(var78[0]); // L: 702 + var76.writeInt(var78[1]); // L: 703 + var76.writeLong(var34); // L: 704 + var76.writeLong(0L); // L: 705 + + for (var17 = 0; var17 < 4; ++var17) { // L: 706 + var76.writeInt(var36.nextInt()); // L: 707 + } + + var76.encryptRsa(class89.field1161, class89.field1164); // L: 709 + var77.writeByte(10); // L: 710 + + for (var17 = 0; var17 < 3; ++var17) { // L: 711 + var77.writeInt(var36.nextInt()); // L: 712 + } + + var77.writeLong(var36.nextLong()); // L: 714 + var77.writeLongMedium(var36.nextLong()); // L: 715 + WorldMapData_1.method783(var77); // L: 716 + var77.writeLong(var36.nextLong()); // L: 717 + var77.encryptRsa(class89.field1161, class89.field1164); // L: 718 + var17 = Decimator.stringCp1252NullTerminatedByteSize(var12); // L: 719 + if (var17 % 8 != 0) { // L: 720 + var17 += 8 - var17 % 8; + } + + Buffer var70 = new Buffer(var17); // L: 721 + var70.writeStringCp1252NullTerminated(var12); // L: 722 + var70.offset = var17; // L: 723 + var70.xteaEncryptAll(var78); // L: 724 + Buffer var19 = new Buffer(var70.offset + var76.offset + var77.offset + 5); // L: 725 + var19.writeByte(2); // L: 726 + var19.writeByte(var76.offset); // L: 727 + var19.writeBytes(var76.array, 0, var76.offset); // L: 728 + var19.writeByte(var77.offset); // L: 729 + var19.writeBytes(var77.array, 0, var77.offset); // L: 730 + var19.writeShort(var70.offset); // L: 731 + var19.writeBytes(var70.array, 0, var70.offset); // L: 732 + String var71 = class2.method40(var19.array); // L: 733 + + byte var11; + try { + URL var72 = new URL(HealthBarDefinition.method4563("services", false) + "m=accountappeal/login.ws"); // L: 735 + URLConnection var73 = var72.openConnection(); // L: 736 + var73.setDoInput(true); // L: 737 + var73.setDoOutput(true); // L: 738 + var73.setConnectTimeout(5000); // L: 739 + OutputStreamWriter var74 = new OutputStreamWriter(var73.getOutputStream()); // L: 740 + var74.write("data2=" + class298.method5386(var71) + "&dest=" + class298.method5386("passwordchoice.ws")); // L: 741 + var74.flush(); // L: 742 + InputStream var75 = var73.getInputStream(); // L: 743 + var19 = new Buffer(new byte[1000]); // L: 744 + + while (true) { + int var25 = var75.read(var19.array, var19.offset, 1000 - var19.offset); // L: 746 + if (var25 == -1) { // L: 747 + var74.close(); // L: 754 + var75.close(); // L: 755 + String var79 = new String(var19.array); // L: 756 + if (var79.startsWith("OFFLINE")) { // L: 757 + var11 = 4; // L: 758 + } else if (var79.startsWith("WRONG")) { // L: 761 + var11 = 7; // L: 762 + } else if (var79.startsWith("RELOAD")) { // L: 765 + var11 = 3; // L: 766 + } else if (var79.startsWith("Not permitted for social network accounts.")) { // L: 769 + var11 = 6; // L: 770 + } else { + var19.xteaDecryptAll(var78); // L: 773 + + while (var19.offset > 0 && var19.array[var19.offset - 1] == 0) { // L: 774 + --var19.offset; // L: 775 + } + + var79 = new String(var19.array, 0, var19.offset); // L: 777 + boolean var26; + if (var79 == null) { // L: 780 + var26 = false; // L: 781 + } else { + label1379: { + try { + new URL(var79); + } catch (MalformedURLException var48) { // L: 787 + var26 = false; // L: 788 + break label1379; // L: 789 + } + + var26 = true; // L: 791 + } + } + + if (var26) { // L: 793 + class280.openURL(var79, true, false); // L: 794 + var11 = 2; // L: 795 + } else { + var11 = 5; // L: 797 + } + } + break; + } + + var19.offset += var25; // L: 748 + if (var19.offset >= 1000) { // L: 749 + var11 = 5; // L: 750 + break; + } + } + } catch (Throwable var49) { // L: 799 + var49.printStackTrace(); // L: 800 + var11 = 5; // L: 801 + } + + var60 = var11; // L: 804 + } + + switch(var60) { // L: 806 + case 2: + UrlRequester.setLoginResponseString(Strings.field3067, Strings.field3015, Strings.field3069); // L: 820 + Login.loginIndex = 6; // L: 821 + break; // L: 822 + case 3: + UrlRequester.setLoginResponseString("", "Error connecting to server.", ""); // L: 824 + break; + case 4: + UrlRequester.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 808 + break; // L: 809 + case 5: + UrlRequester.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 811 + break; // L: 812 + case 6: + UrlRequester.setLoginResponseString("", "Error connecting to server.", ""); // L: 817 + break; // L: 818 + case 7: + UrlRequester.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 814 + } + } + + return; // L: 828 + } + + var56 = Login.loginBoxX + 180 + 80; // L: 830 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 831 + class41.Login_promptCredentials(true); // L: 832 + } + + var58 = 361; // L: 834 + if (MusicPatchPcmStream.field2519 != null) { // L: 835 + var9 = MusicPatchPcmStream.field2519.highX / 2; // L: 836 + if (var3 == 1 && var54 >= MusicPatchPcmStream.field2519.lowX - var9 && var54 <= var9 + MusicPatchPcmStream.field2519.lowX && var55 >= var58 - 15 && var55 < var58) { // L: 837 + class280.openURL(HealthBarDefinition.method4563("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false); // L: 838 + } + } + + while (class60.isKeyDown()) { // L: 841 + var61 = false; // L: 842 + + for (var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var10) { // L: 843 + if (PacketWriter.field1350 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var10)) { // L: 844 + var61 = true; // L: 845 + break; // L: 846 + } + } + + if (PlayerAppearance.field2581 == 13) { // L: 849 + class41.Login_promptCredentials(true); // L: 850 + } else { + if (PlayerAppearance.field2581 == 85 && Login.Login_username.length() > 0) { // L: 853 + Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1); + } + + if (PlayerAppearance.field2581 == 84) { // L: 854 + Login.Login_username = Login.Login_username.trim(); // L: 856 + if (Login.Login_username.length() == 0) { // L: 857 + UrlRequester.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 858 + } else { + long var41 = class13.method134(); // L: 862 + byte var62; + if (var41 == 0L) { // L: 863 + var62 = 5; + } else { + String var37 = Login.Login_username; // L: 866 + Random var38 = new Random(); // L: 868 + Buffer var39 = new Buffer(128); // L: 869 + Buffer var43 = new Buffer(128); // L: 870 + int[] var18 = new int[]{var38.nextInt(), var38.nextInt(), (int)(var41 >> 32), (int)var41}; // L: 871 872 873 874 875 + var39.writeByte(10); // L: 876 + + int var44; + for (var44 = 0; var44 < 4; ++var44) { // L: 877 + var39.writeInt(var38.nextInt()); // L: 878 + } + + var39.writeInt(var18[0]); // L: 880 + var39.writeInt(var18[1]); // L: 881 + var39.writeLong(var41); // L: 882 + var39.writeLong(0L); // L: 883 + + for (var44 = 0; var44 < 4; ++var44) { // L: 884 + var39.writeInt(var38.nextInt()); // L: 885 + } + + var39.encryptRsa(class89.field1161, class89.field1164); // L: 887 + var43.writeByte(10); // L: 888 + + for (var44 = 0; var44 < 3; ++var44) { // L: 889 + var43.writeInt(var38.nextInt()); // L: 890 + } + + var43.writeLong(var38.nextLong()); // L: 892 + var43.writeLongMedium(var38.nextLong()); // L: 893 + WorldMapData_1.method783(var43); // L: 894 + var43.writeLong(var38.nextLong()); // L: 895 + var43.encryptRsa(class89.field1161, class89.field1164); // L: 896 + var44 = Decimator.stringCp1252NullTerminatedByteSize(var37); // L: 897 + if (var44 % 8 != 0) { // L: 898 + var44 += 8 - var44 % 8; + } + + Buffer var20 = new Buffer(var44); // L: 899 + var20.writeStringCp1252NullTerminated(var37); // L: 900 + var20.offset = var44; // L: 901 + var20.xteaEncryptAll(var18); // L: 902 + Buffer var21 = new Buffer(var20.offset + var39.offset + var43.offset + 5); // L: 903 + var21.writeByte(2); // L: 904 + var21.writeByte(var39.offset); // L: 905 + var21.writeBytes(var39.array, 0, var39.offset); // L: 906 + var21.writeByte(var43.offset); // L: 907 + var21.writeBytes(var43.array, 0, var43.offset); // L: 908 + var21.writeShort(var20.offset); // L: 909 + var21.writeBytes(var20.array, 0, var20.offset); // L: 910 + String var22 = class2.method40(var21.array); // L: 911 + + byte var13; + try { + URL var23 = new URL(HealthBarDefinition.method4563("services", false) + "m=accountappeal/login.ws"); // L: 913 + URLConnection var24 = var23.openConnection(); // L: 914 + var24.setDoInput(true); // L: 915 + var24.setDoOutput(true); // L: 916 + var24.setConnectTimeout(5000); // L: 917 + OutputStreamWriter var40 = new OutputStreamWriter(var24.getOutputStream()); // L: 918 + var40.write("data2=" + class298.method5386(var22) + "&dest=" + class298.method5386("passwordchoice.ws")); // L: 919 + var40.flush(); // L: 920 + InputStream var45 = var24.getInputStream(); // L: 921 + var21 = new Buffer(new byte[1000]); // L: 922 + + while (true) { + int var46 = var45.read(var21.array, var21.offset, 1000 - var21.offset); // L: 924 + if (var46 == -1) { // L: 925 + var40.close(); // L: 932 + var45.close(); // L: 933 + String var27 = new String(var21.array); // L: 934 + if (var27.startsWith("OFFLINE")) { // L: 935 + var13 = 4; // L: 936 + } else if (var27.startsWith("WRONG")) { // L: 939 + var13 = 7; // L: 940 + } else if (var27.startsWith("RELOAD")) { // L: 943 + var13 = 3; // L: 944 + } else if (var27.startsWith("Not permitted for social network accounts.")) { // L: 947 + var13 = 6; // L: 948 + } else { + var21.xteaDecryptAll(var18); // L: 951 + + while (var21.offset > 0 && var21.array[var21.offset - 1] == 0) { // L: 952 + --var21.offset; // L: 953 + } + + var27 = new String(var21.array, 0, var21.offset); // L: 955 + boolean var28; + if (var27 == null) { // L: 958 + var28 = false; // L: 959 + } else { + label1381: { + try { + new URL(var27); + } catch (MalformedURLException var50) { // L: 965 + var28 = false; // L: 966 + break label1381; // L: 967 + } + + var28 = true; // L: 969 + } + } + + if (var28) { // L: 971 + class280.openURL(var27, true, false); // L: 972 + var13 = 2; // L: 973 + } else { + var13 = 5; // L: 975 + } + } + break; + } + + var21.offset += var46; // L: 926 + if (var21.offset >= 1000) { // L: 927 + var13 = 5; // L: 928 + break; + } + } + } catch (Throwable var51) { // L: 977 + var51.printStackTrace(); // L: 978 + var13 = 5; // L: 979 + } + + var62 = var13; // L: 982 + } + + switch(var62) { // L: 984 + case 2: + UrlRequester.setLoginResponseString(Strings.field3067, Strings.field3015, Strings.field3069); // L: 986 + Login.loginIndex = 6; // L: 987 + break; // L: 988 + case 3: + UrlRequester.setLoginResponseString("", "Error connecting to server.", ""); // L: 999 + break; // L: 1000 + case 4: + UrlRequester.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 990 + break; // L: 991 + case 5: + UrlRequester.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 996 + break; // L: 997 + case 6: + UrlRequester.setLoginResponseString("", "Error connecting to server.", ""); // L: 993 + break; // L: 994 + case 7: + UrlRequester.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 1002 + } + } + + return; // L: 1006 + } + + if (var61 && Login.Login_username.length() < 320) { // L: 1008 + Login.Login_username = Login.Login_username + PacketWriter.field1350; + } + } + } + } else if (Login.loginIndex != 6) { // L: 1012 + if (Login.loginIndex == 7) { // L: 1023 + var56 = Login.loginBoxX + 180 - 80; // L: 1024 + var7 = 321; // L: 1025 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1026 + class280.openURL(HealthBarDefinition.method4563("secure", true) + "m=dob/set_dob.ws", true, false); // L: 1027 + UrlRequester.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1028 + Login.loginIndex = 6; // L: 1029 + return; // L: 1030 + } + + var56 = Login.loginBoxX + 180 + 80; // L: 1032 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1033 + class41.Login_promptCredentials(true); // L: 1034 + } + } else if (Login.loginIndex == 8) { // L: 1037 + var56 = Login.loginBoxX + 180 - 80; // L: 1038 + var7 = 321; // L: 1039 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1040 + class280.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 1041 + UrlRequester.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1042 + Login.loginIndex = 6; // L: 1043 + return; // L: 1044 + } + + var56 = Login.loginBoxX + 180 + 80; // L: 1046 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1047 + class41.Login_promptCredentials(true); // L: 1048 + } + } else if (Login.loginIndex == 12) { // L: 1051 + String var47 = ""; // L: 1052 + switch(Login.field1210) { // L: 1053 + case 0: + var47 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans"; // L: 1055 + break; // L: 1056 + case 1: + var47 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked"; // L: 1058 + break; // L: 1059 + default: + class41.Login_promptCredentials(false); // L: 1061 + } + + var59 = Login.loginBoxX + 180; // L: 1064 + var58 = 276; // L: 1065 + if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 1066 + class280.openURL(var47, true, false); // L: 1067 + UrlRequester.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 1068 + Login.loginIndex = 6; // L: 1069 + return; // L: 1070 + } + + var59 = Login.loginBoxX + 180; // L: 1072 + var58 = 326; // L: 1073 + if (var3 == 1 && var54 >= var59 - 75 && var54 <= var59 + 75 && var55 >= var58 - 20 && var55 <= var58 + 20) { // L: 1074 + class41.Login_promptCredentials(false); // L: 1075 + } + } else if (Login.loginIndex == 24) { // L: 1078 + var56 = Login.loginBoxX + 180; // L: 1079 + var7 = 301; // L: 1080 + if (var3 == 1 && var54 >= var56 - 75 && var54 <= var56 + 75 && var55 >= var7 - 20 && var55 <= var7 + 20) { // L: 1081 + class41.Login_promptCredentials(false); // L: 1082 + } + } + } else { + while (true) { + do { + if (!class60.isKeyDown()) { // L: 1013 + var57 = 321; // L: 1018 + if (var3 == 1 && var55 >= var57 - 20 && var55 <= var57 + 20) { // L: 1019 + class41.Login_promptCredentials(true); // L: 1020 + } + + return; + } + } while(PlayerAppearance.field2581 != 84 && PlayerAppearance.field2581 != 13); // L: 1014 + + class41.Login_promptCredentials(true); // L: 1015 + } + } + } + } + } + + } } } + } // L: 266 - } - - @ObfuscatedName("fg") + @ObfuscatedName("ed") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "-2027582422" + garbageValue = "1948911757" ) - static final void method33() { - int[] var0 = Players.Players_indices; + @Export("load") + static void load() { + int var27; + if (Client.titleLoadingStage == 0) { // L: 1446 + ScriptEvent.scene = new Scene(4, 104, 104, Tiles.Tiles_heights); // L: 1447 - int var1; - for (var1 = 0; var1 < Players.Players_count; ++var1) { - Player var2 = Client.players[var0[var1]]; - if (var2 != null && var2.overheadTextCyclesRemaining > 0) { - --var2.overheadTextCyclesRemaining; - if (var2.overheadTextCyclesRemaining == 0) { - var2.overheadText = null; + for (var27 = 0; var27 < 4; ++var27) { // L: 1448 + Client.collisionMaps[var27] = new CollisionMap(104, 104); + } + + ApproximateRouteStrategy.sceneMinimapSprite = new Sprite(512, 512); // L: 1449 + Login.Login_loadingText = "Starting game engine..."; // L: 1450 + Login.Login_loadingPercent = 5; // L: 1451 + Client.titleLoadingStage = 20; // L: 1452 + } else if (Client.titleLoadingStage == 20) { // L: 1455 + Login.Login_loadingText = "Prepared visibility map"; // L: 1456 + Login.Login_loadingPercent = 10; // L: 1457 + Client.titleLoadingStage = 30; // L: 1458 + } else if (Client.titleLoadingStage == 30) { // L: 1461 + class182.archive0 = WorldMapLabelSize.newArchive(0, false, true, true); // L: 1462 + Client.archive1 = WorldMapLabelSize.newArchive(1, false, true, true); // L: 1463 + NetFileRequest.archive2 = WorldMapLabelSize.newArchive(2, true, false, true); // L: 1464 + WorldMapID.archive3 = WorldMapLabelSize.newArchive(3, false, true, true); // L: 1465 + GrandExchangeOfferUnitPriceComparator.archive4 = WorldMapLabelSize.newArchive(4, false, true, true); // L: 1466 + WorldMapLabel.archive5 = WorldMapLabelSize.newArchive(5, true, true, true); // L: 1467 + CollisionMap.archive6 = WorldMapLabelSize.newArchive(6, true, true, true); // L: 1468 + WorldMapSection1.archive7 = WorldMapLabelSize.newArchive(7, false, true, true); // L: 1469 + Huffman.archive8 = WorldMapLabelSize.newArchive(8, false, true, true); // L: 1470 + UrlRequester.archive9 = WorldMapLabelSize.newArchive(9, false, true, true); // L: 1471 + Occluder.archive10 = WorldMapLabelSize.newArchive(10, false, true, true); // L: 1472 + GrandExchangeEvent.archive11 = WorldMapLabelSize.newArchive(11, false, true, true); // L: 1473 + ApproximateRouteStrategy.archive12 = WorldMapLabelSize.newArchive(12, false, true, true); // L: 1474 + TilePaint.archive13 = WorldMapLabelSize.newArchive(13, true, false, true); // L: 1475 + PlayerAppearance.archive14 = WorldMapLabelSize.newArchive(14, false, true, true); // L: 1476 + PlayerAppearance.archive15 = WorldMapLabelSize.newArchive(15, false, true, true); // L: 1477 + archive17 = WorldMapLabelSize.newArchive(17, true, true, true); // L: 1478 + MouseRecorder.archive18 = WorldMapLabelSize.newArchive(18, false, true, true); // L: 1479 + WorldMapData_1.archive19 = WorldMapLabelSize.newArchive(19, false, true, true); // L: 1480 + FontName.archive20 = WorldMapLabelSize.newArchive(20, false, true, true); // L: 1481 + Login.Login_loadingText = "Connecting to update server"; // L: 1482 + Login.Login_loadingPercent = 20; // L: 1483 + Client.titleLoadingStage = 40; // L: 1484 + } else if (Client.titleLoadingStage == 40) { // L: 1487 + byte var36 = 0; // L: 1488 + var27 = var36 + class182.archive0.percentage() * 4 / 100; // L: 1489 + var27 += Client.archive1.percentage() * 4 / 100; // L: 1490 + var27 += NetFileRequest.archive2.percentage() * 2 / 100; // L: 1491 + var27 += WorldMapID.archive3.percentage() * 2 / 100; // L: 1492 + var27 += GrandExchangeOfferUnitPriceComparator.archive4.percentage() * 6 / 100; // L: 1493 + var27 += WorldMapLabel.archive5.percentage() * 4 / 100; // L: 1494 + var27 += CollisionMap.archive6.percentage() * 2 / 100; // L: 1495 + var27 += WorldMapSection1.archive7.percentage() * 56 / 100; // L: 1496 + var27 += Huffman.archive8.percentage() * 2 / 100; // L: 1497 + var27 += UrlRequester.archive9.percentage() * 2 / 100; // L: 1498 + var27 += Occluder.archive10.percentage() * 2 / 100; // L: 1499 + var27 += GrandExchangeEvent.archive11.percentage() * 2 / 100; // L: 1500 + var27 += ApproximateRouteStrategy.archive12.percentage() * 2 / 100; // L: 1501 + var27 += TilePaint.archive13.percentage() * 2 / 100; // L: 1502 + var27 += PlayerAppearance.archive14.percentage() * 2 / 100; // L: 1503 + var27 += PlayerAppearance.archive15.percentage() * 2 / 100; // L: 1504 + var27 += WorldMapData_1.archive19.percentage() / 100; // L: 1505 + var27 += MouseRecorder.archive18.percentage() / 100; // L: 1506 + var27 += FontName.archive20.percentage() / 100; // L: 1507 + var27 += archive17.method4340() && archive17.isFullyLoaded() ? 1 : 0; // L: 1508 + if (var27 != 100) { // L: 1509 + if (var27 != 0) { // L: 1510 + Login.Login_loadingText = "Checking for updates - " + var27 + "%"; } + + Login.Login_loadingPercent = 30; // L: 1511 + } else { + ViewportMouse.method3082(class182.archive0, "Animations"); // L: 1514 + ViewportMouse.method3082(Client.archive1, "Skeletons"); // L: 1515 + ViewportMouse.method3082(GrandExchangeOfferUnitPriceComparator.archive4, "Sound FX"); // L: 1516 + ViewportMouse.method3082(WorldMapLabel.archive5, "Maps"); // L: 1517 + ViewportMouse.method3082(CollisionMap.archive6, "Music Tracks"); // L: 1518 + ViewportMouse.method3082(WorldMapSection1.archive7, "Models"); // L: 1519 + ViewportMouse.method3082(Huffman.archive8, "Sprites"); // L: 1520 + ViewportMouse.method3082(GrandExchangeEvent.archive11, "Music Jingles"); // L: 1521 + ViewportMouse.method3082(PlayerAppearance.archive14, "Music Samples"); // L: 1522 + ViewportMouse.method3082(PlayerAppearance.archive15, "Music Patches"); // L: 1523 + ViewportMouse.method3082(WorldMapData_1.archive19, "World Map"); // L: 1524 + ViewportMouse.method3082(MouseRecorder.archive18, "World Map Geography"); // L: 1525 + ViewportMouse.method3082(FontName.archive20, "World Map Ground"); // L: 1526 + NetSocket.spriteIds = new GraphicsDefaults(); // L: 1527 + NetSocket.spriteIds.decode(archive17); // L: 1528 + Login.Login_loadingText = "Loaded update list"; // L: 1529 + Login.Login_loadingPercent = 30; // L: 1530 + Client.titleLoadingStage = 45; // L: 1531 + } + } else if (Client.titleLoadingStage == 45) { // L: 1534 + class2.method37(22050, !Client.isLowDetail, 2); // L: 1535 + MidiPcmStream var33 = new MidiPcmStream(); // L: 1536 + var33.method3813(9, 128); // L: 1537 + WorldMapManager.pcmPlayer0 = TileItem.method2205(GameShell.taskHandler, 0, 22050); // L: 1538 + WorldMapManager.pcmPlayer0.setStream(var33); // L: 1539 + BoundaryObject.method3385(PlayerAppearance.archive15, PlayerAppearance.archive14, GrandExchangeOfferUnitPriceComparator.archive4, var33); // L: 1540 + IntHashTable.pcmPlayer1 = TileItem.method2205(GameShell.taskHandler, 1, 2048); // L: 1541 + Players.pcmStreamMixer = new PcmStreamMixer(); // L: 1542 + IntHashTable.pcmPlayer1.setStream(Players.pcmStreamMixer); // L: 1543 + class9.decimator = new Decimator(22050, PcmPlayer.field1447); // L: 1544 + Login.Login_loadingText = "Prepared sound engine"; // L: 1545 + Login.Login_loadingPercent = 35; // L: 1546 + Client.titleLoadingStage = 50; // L: 1547 + DevicePcmPlayerProvider.WorldMapElement_fonts = new Fonts(Huffman.archive8, TilePaint.archive13); // L: 1548 + } else if (Client.titleLoadingStage == 50) { // L: 1551 + var27 = FontName.method5439().length; // L: 1552 + Client.fontsMap = DevicePcmPlayerProvider.WorldMapElement_fonts.createMap(FontName.method5439()); // L: 1553 + if (Client.fontsMap.size() < var27) { // L: 1554 + Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var27 + "%"; // L: 1555 + Login.Login_loadingPercent = 40; // L: 1556 + } else { + DynamicObject.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11); // L: 1559 + ItemDefinition.fontPlain12 = (Font)Client.fontsMap.get(FontName.FontName_plain12); // L: 1560 + class4.fontBold12 = (Font)Client.fontsMap.get(FontName.FontName_bold12); // L: 1561 + WorldMapArea.platformInfo = Client.platformInfoProvider.get(); // L: 1562 + Login.Login_loadingText = "Loaded fonts"; // L: 1563 + Login.Login_loadingPercent = 40; // L: 1564 + Client.titleLoadingStage = 60; // L: 1565 + } + } else { + int var3; + Archive var28; + Archive var29; + if (Client.titleLoadingStage == 60) { // L: 1568 + var28 = Occluder.archive10; // L: 1570 + var29 = Huffman.archive8; // L: 1571 + var3 = 0; // L: 1573 + if (var28.tryLoadFileByNames("title.jpg", "")) { // L: 1574 + ++var3; + } + + if (var29.tryLoadFileByNames("logo", "")) { // L: 1575 + ++var3; + } + + if (var29.tryLoadFileByNames("logo_deadman_mode", "")) { // L: 1576 + ++var3; + } + + if (var29.tryLoadFileByNames("logo_seasonal_mode", "")) { // L: 1577 + ++var3; + } + + if (var29.tryLoadFileByNames("titlebox", "")) { // L: 1578 + ++var3; + } + + if (var29.tryLoadFileByNames("titlebutton", "")) { // L: 1579 + ++var3; + } + + if (var29.tryLoadFileByNames("runes", "")) { // L: 1580 + ++var3; + } + + if (var29.tryLoadFileByNames("title_mute", "")) { // L: 1581 + ++var3; + } + + if (var29.tryLoadFileByNames("options_radio_buttons,0", "")) { // L: 1582 + ++var3; + } + + if (var29.tryLoadFileByNames("options_radio_buttons,2", "")) { // L: 1583 + ++var3; + } + + if (var29.tryLoadFileByNames("options_radio_buttons,4", "")) { // L: 1584 + ++var3; + } + + if (var29.tryLoadFileByNames("options_radio_buttons,6", "")) { // L: 1585 + ++var3; + } + + var29.tryLoadFileByNames("sl_back", ""); // L: 1586 + var29.tryLoadFileByNames("sl_flags", ""); // L: 1587 + var29.tryLoadFileByNames("sl_arrows", ""); // L: 1588 + var29.tryLoadFileByNames("sl_stars", ""); // L: 1589 + var29.tryLoadFileByNames("sl_button", ""); // L: 1590 + byte var35 = 12; // L: 1596 + if (var3 < var35) { // L: 1599 + Login.Login_loadingText = "Loading title screen - " + var3 * 100 / var35 + "%"; // L: 1600 + Login.Login_loadingPercent = 50; // L: 1601 + } else { + Login.Login_loadingText = "Loaded title screen"; // L: 1604 + Login.Login_loadingPercent = 50; // L: 1605 + CollisionMap.updateGameState(5); // L: 1606 + Client.titleLoadingStage = 70; // L: 1607 + } + } else if (Client.titleLoadingStage == 70) { // L: 1610 + if (!NetFileRequest.archive2.isFullyLoaded()) { // L: 1611 + Login.Login_loadingText = "Loading config - " + NetFileRequest.archive2.loadPercent() + "%"; // L: 1612 + Login.Login_loadingPercent = 60; // L: 1613 + } else { + Archive var32 = NetFileRequest.archive2; // L: 1616 + class1.FloorOverlayDefinition_archive = var32; // L: 1618 + Varcs.method2257(NetFileRequest.archive2); // L: 1620 + Entity.method3381(NetFileRequest.archive2, WorldMapSection1.archive7); // L: 1621 + var28 = NetFileRequest.archive2; // L: 1622 + var29 = WorldMapSection1.archive7; // L: 1623 + boolean var34 = Client.isLowDetail; // L: 1624 + ObjectDefinition.ObjectDefinition_archive = var28; // L: 1626 + DirectByteArrayCopier.ObjectDefinition_modelsArchive = var29; // L: 1627 + ObjectDefinition.ObjectDefinition_isLowDetail = var34; // L: 1628 + Archive var30 = NetFileRequest.archive2; // L: 1630 + Archive var5 = WorldMapSection1.archive7; // L: 1631 + NPCDefinition.NpcDefinition_archive = var30; // L: 1633 + NPCDefinition.NpcDefinition_modelArchive = var5; // L: 1634 + Script.method2325(NetFileRequest.archive2); // L: 1636 + UserComparator9.method3487(NetFileRequest.archive2, WorldMapSection1.archive7, Client.isMembersWorld, DynamicObject.fontPlain11); // L: 1637 + Archive var6 = NetFileRequest.archive2; // L: 1638 + Archive var7 = class182.archive0; // L: 1639 + Archive var8 = Client.archive1; // L: 1640 + SequenceDefinition.SequenceDefinition_archive = var6; // L: 1642 + SequenceDefinition.SequenceDefinition_animationsArchive = var7; // L: 1643 + GrandExchangeOfferAgeComparator.SequenceDefinition_skeletonsArchive = var8; // L: 1644 + Archive var9 = NetFileRequest.archive2; // L: 1646 + Archive var10 = WorldMapSection1.archive7; // L: 1647 + SpotAnimationDefinition.SpotAnimationDefinition_archive = var9; // L: 1649 + SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var10; // L: 1650 + Archive var11 = NetFileRequest.archive2; // L: 1652 + VarbitDefinition.VarbitDefinition_archive = var11; // L: 1654 + class227.method4185(NetFileRequest.archive2); // L: 1656 + Archive var12 = WorldMapID.archive3; // L: 1657 + Archive var13 = WorldMapSection1.archive7; // L: 1658 + Archive var14 = Huffman.archive8; // L: 1659 + Archive var15 = TilePaint.archive13; // L: 1660 + Widget.Widget_archive = var12; // L: 1662 + Widget.Widget_modelsArchive = var13; // L: 1663 + Messages.Widget_spritesArchive = var14; // L: 1664 + HealthBar.Widget_fontsArchive = var15; // L: 1665 + Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][]; // L: 1666 + Bounds.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()]; // L: 1667 + class4.method73(NetFileRequest.archive2); // L: 1669 + class225.method4129(NetFileRequest.archive2); // L: 1670 + Archive var16 = NetFileRequest.archive2; // L: 1671 + VarcInt.VarcInt_archive = var16; // L: 1673 + Archive var17 = NetFileRequest.archive2; // L: 1675 + ParamDefinition.ParamDefinition_archive = var17; // L: 1677 + ClientPreferences.varcs = new Varcs(); // L: 1679 + Archive var18 = NetFileRequest.archive2; // L: 1680 + Archive var19 = Huffman.archive8; // L: 1681 + Archive var20 = TilePaint.archive13; // L: 1682 + HitSplatDefinition.HitSplatDefinition_archive = var18; // L: 1684 + HitSplatDefinition.field3364 = var19; // L: 1685 + HitSplatDefinition.HitSplatDefinition_fontsArchive = var20; // L: 1686 + Archive var21 = NetFileRequest.archive2; // L: 1688 + Archive var22 = Huffman.archive8; // L: 1689 + HealthBarDefinition.HealthBarDefinition_archive = var21; // L: 1691 + HealthBarDefinition.HitSplatDefinition_spritesArchive = var22; // L: 1692 + Archive var23 = NetFileRequest.archive2; // L: 1694 + Archive var24 = Huffman.archive8; // L: 1695 + WorldMapElement.WorldMapElement_archive = var24; // L: 1697 + if (var23.isFullyLoaded()) { // L: 1698 + WorldMapElement.WorldMapElement_count = var23.getGroupFileCount(35); // L: 1701 + WorldMapElement.WorldMapElement_cached = new WorldMapElement[WorldMapElement.WorldMapElement_count]; // L: 1702 + + for (int var25 = 0; var25 < WorldMapElement.WorldMapElement_count; ++var25) { // L: 1703 + byte[] var26 = var23.takeFile(35, var25); // L: 1704 + WorldMapElement.WorldMapElement_cached[var25] = new WorldMapElement(var25); // L: 1705 + if (var26 != null) { // L: 1706 + WorldMapElement.WorldMapElement_cached[var25].decode(new Buffer(var26)); // L: 1707 + WorldMapElement.WorldMapElement_cached[var25].method4469(); // L: 1708 + } + } + } + + Login.Login_loadingText = "Loaded config"; // L: 1712 + Login.Login_loadingPercent = 60; // L: 1713 + Client.titleLoadingStage = 80; // L: 1714 + } + } else if (Client.titleLoadingStage == 80) { // L: 1717 + var27 = 0; // L: 1718 + if (LoginPacket.compass == null) { // L: 1719 + LoginPacket.compass = AbstractUserComparator.SpriteBuffer_getSprite(Huffman.archive8, NetSocket.spriteIds.compass, 0); + } else { + ++var27; // L: 1720 + } + + if (FontName.redHintArrowSprite == null) { // L: 1721 + FontName.redHintArrowSprite = AbstractUserComparator.SpriteBuffer_getSprite(Huffman.archive8, NetSocket.spriteIds.field3831, 0); + } else { + ++var27; // L: 1722 + } + + if (ReflectionCheck.mapSceneSprites == null) { // L: 1723 + ReflectionCheck.mapSceneSprites = UserComparator5.method3515(Huffman.archive8, NetSocket.spriteIds.mapScenes, 0); + } else { + ++var27; // L: 1724 + } + + if (class279.headIconPkSprites == null) { // L: 1725 + class279.headIconPkSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.headIconsPk, 0); + } else { + ++var27; // L: 1726 + } + + if (Client.headIconPrayerSprites == null) { // L: 1727 + Client.headIconPrayerSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3839, 0); + } else { + ++var27; // L: 1728 + } + + if (Varcs.headIconHintSprites == null) { // L: 1729 + Varcs.headIconHintSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3835, 0); + } else { + ++var27; // L: 1730 + } + + if (VarbitDefinition.mapMarkerSprites == null) { // L: 1731 + VarbitDefinition.mapMarkerSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3838, 0); + } else { + ++var27; // L: 1732 + } + + if (ArchiveLoader.crossSprites == null) { // L: 1733 + ArchiveLoader.crossSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3837, 0); + } else { + ++var27; // L: 1734 + } + + if (class235.mapDotSprites == null) { // L: 1735 + class235.mapDotSprites = GameBuild.method4214(Huffman.archive8, NetSocket.spriteIds.field3836, 0); + } else { + ++var27; // L: 1736 + } + + if (GrandExchangeEvent.scrollBarSprites == null) { // L: 1737 + GrandExchangeEvent.scrollBarSprites = UserComparator5.method3515(Huffman.archive8, NetSocket.spriteIds.field3834, 0); + } else { + ++var27; // L: 1738 + } + + if (GrandExchangeOfferWorldComparator.modIconSprites == null) { // L: 1739 + GrandExchangeOfferWorldComparator.modIconSprites = UserComparator5.method3515(Huffman.archive8, NetSocket.spriteIds.field3840, 0); + } else { + ++var27; // L: 1740 + } + + if (var27 < 11) { // L: 1741 + Login.Login_loadingText = "Loading sprites - " + var27 * 100 / 12 + "%"; // L: 1742 + Login.Login_loadingPercent = 70; // L: 1743 + } else { + AbstractFont.AbstractFont_modIconSprites = GrandExchangeOfferWorldComparator.modIconSprites; // L: 1746 + FontName.redHintArrowSprite.normalize(); // L: 1747 + int var1 = (int)(Math.random() * 21.0D) - 10; // L: 1748 + int var2 = (int)(Math.random() * 21.0D) - 10; // L: 1749 + var3 = (int)(Math.random() * 21.0D) - 10; // L: 1750 + int var4 = (int)(Math.random() * 41.0D) - 20; // L: 1751 + ReflectionCheck.mapSceneSprites[0].shiftColors(var4 + var1, var2 + var4, var4 + var3); // L: 1752 + Login.Login_loadingText = "Loaded sprites"; // L: 1753 + Login.Login_loadingPercent = 70; // L: 1754 + Client.titleLoadingStage = 90; // L: 1755 + } + } else if (Client.titleLoadingStage == 90) { // L: 1758 + if (!UrlRequester.archive9.isFullyLoaded()) { // L: 1759 + Login.Login_loadingText = "Loading textures - " + "0%"; // L: 1760 + Login.Login_loadingPercent = 90; // L: 1761 + } else { + class41.textureProvider = new TextureProvider(UrlRequester.archive9, Huffman.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128); // L: 1764 + Rasterizer3D.Rasterizer3D_setTextureLoader(class41.textureProvider); // L: 1765 + Rasterizer3D.Rasterizer3D_setBrightness(0.8D); // L: 1766 + Client.titleLoadingStage = 100; // L: 1767 + } + } else if (Client.titleLoadingStage == 100) { // L: 1770 + var27 = class41.textureProvider.getLoadedPercentage(); // L: 1771 + if (var27 < 100) { // L: 1772 + Login.Login_loadingText = "Loading textures - " + var27 + "%"; // L: 1773 + Login.Login_loadingPercent = 90; // L: 1774 + } else { + Login.Login_loadingText = "Loaded textures"; // L: 1777 + Login.Login_loadingPercent = 90; // L: 1778 + Client.titleLoadingStage = 110; // L: 1779 + } + } else if (Client.titleLoadingStage == 110) { // L: 1782 + ByteArrayPool.mouseRecorder = new MouseRecorder(); // L: 1783 + GameShell.taskHandler.newThreadTask(ByteArrayPool.mouseRecorder, 10); // L: 1784 + Login.Login_loadingText = "Loaded input handler"; // L: 1785 + Login.Login_loadingPercent = 92; // L: 1786 + Client.titleLoadingStage = 120; // L: 1787 + } else if (Client.titleLoadingStage == 120) { // L: 1790 + if (!Occluder.archive10.tryLoadFileByNames("huffman", "")) { // L: 1791 + Login.Login_loadingText = "Loading wordpack - " + 0 + "%"; // L: 1792 + Login.Login_loadingPercent = 94; // L: 1793 + } else { + Huffman var0 = new Huffman(Occluder.archive10.takeFileByNames("huffman", "")); // L: 1796 + class219.huffman = var0; // L: 1798 + Login.Login_loadingText = "Loaded wordpack"; // L: 1800 + Login.Login_loadingPercent = 94; // L: 1801 + Client.titleLoadingStage = 130; // L: 1802 + } + } else if (Client.titleLoadingStage == 130) { // L: 1805 + if (!WorldMapID.archive3.isFullyLoaded()) { // L: 1806 + Login.Login_loadingText = "Loading interfaces - " + WorldMapID.archive3.loadPercent() * 4 / 5 + "%"; // L: 1807 + Login.Login_loadingPercent = 96; // L: 1808 + } else if (!ApproximateRouteStrategy.archive12.isFullyLoaded()) { // L: 1811 + Login.Login_loadingText = "Loading interfaces - " + (80 + ApproximateRouteStrategy.archive12.loadPercent() / 6) + "%"; // L: 1812 + Login.Login_loadingPercent = 96; // L: 1813 + } else if (!TilePaint.archive13.isFullyLoaded()) { // L: 1816 + Login.Login_loadingText = "Loading interfaces - " + (96 + TilePaint.archive13.loadPercent() / 50) + "%"; // L: 1817 + Login.Login_loadingPercent = 96; // L: 1818 + } else { + Login.Login_loadingText = "Loaded interfaces"; // L: 1821 + Login.Login_loadingPercent = 98; // L: 1822 + Client.titleLoadingStage = 140; // L: 1823 + } + } else if (Client.titleLoadingStage == 140) { // L: 1826 + Login.Login_loadingPercent = 100; // L: 1827 + if (!WorldMapData_1.archive19.tryLoadGroupByName(WorldMapCacheName.field322.name)) { // L: 1828 + Login.Login_loadingText = "Loading world map - " + WorldMapData_1.archive19.groupLoadPercentByName(WorldMapCacheName.field322.name) / 10 + "%"; // L: 1829 + } else { + if (Message.worldMap == null) { // L: 1832 + Message.worldMap = new WorldMap(); // L: 1833 + Message.worldMap.init(WorldMapData_1.archive19, MouseRecorder.archive18, FontName.archive20, class4.fontBold12, Client.fontsMap, ReflectionCheck.mapSceneSprites); // L: 1834 + } + + Login.Login_loadingText = "Loaded world map"; // L: 1836 + Client.titleLoadingStage = 150; // L: 1837 + } + } else if (Client.titleLoadingStage == 150) { // L: 1840 + CollisionMap.updateGameState(10); // L: 1841 } } - - for (var1 = 0; var1 < Client.npcCount; ++var1) { - int var4 = Client.npcIndices[var1]; - NPC var3 = Client.npcs[var4]; - if (var3 != null && var3.overheadTextCyclesRemaining > 0) { - --var3.overheadTextCyclesRemaining; - if (var3.overheadTextCyclesRemaining == 0) { - var3.overheadText = null; - } - } - } - - } + } // L: 1453 1459 1485 1512 1532 1549 1557 1566 1602 1608 1614 1715 1744 1756 1762 1768 1775 1780 1788 1794 1803 1809 1814 1819 1824 1830 1838 1842 1844 } diff --git a/runescape-client/src/main/java/class300.java b/runescape-client/src/main/java/class300.java new file mode 100644 index 0000000000..d329a5a05f --- /dev/null +++ b/runescape-client/src/main/java/class300.java @@ -0,0 +1,13 @@ +import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; + +@ObfuscatedName("kd") +public final class class300 { + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Ldd;" + ) + @Export("pcmPlayerProvider") + public static PlayerProvider pcmPlayerProvider; +} diff --git a/runescape-client/src/main/java/class303.java b/runescape-client/src/main/java/class303.java index 51a882e462..a3ca29d163 100644 --- a/runescape-client/src/main/java/class303.java +++ b/runescape-client/src/main/java/class303.java @@ -1,49 +1,150 @@ -import java.io.IOException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("kw") +@ObfuscatedName("kv") public class class303 { - @ObfuscatedName("gi") + @ObfuscatedName("ap") @ObfuscatedSignature( - descriptor = "(ZI)V", - garbageValue = "-1926493501" + descriptor = "(ILcy;ZI)I", + garbageValue = "-723609398" ) - static final void method5528(boolean var0) { - Timer.playPcmPlayers(); - ++Client.packetWriter.pendingWrites; - if (Client.packetWriter.pendingWrites >= 50 || var0) { - Client.packetWriter.pendingWrites = 0; - if (!Client.field722 && Client.packetWriter.getSocket() != null) { - PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2285, Client.packetWriter.isaacCipher); - Client.packetWriter.addNode(var1); - - try { - Client.packetWriter.flush(); - } catch (IOException var3) { - Client.field722 = true; - } + static int method5451(int var0, Script var1, boolean var2) { + int var4; + int var9; + if (var0 == ScriptOpcodes.ADD) { // L: 2416 + Interpreter.Interpreter_intStackSize -= 2; // L: 2417 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2418 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2419 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 + var9; // L: 2420 + return 1; // L: 2421 + } else if (var0 == ScriptOpcodes.SUB) { // L: 2423 + Interpreter.Interpreter_intStackSize -= 2; // L: 2424 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2425 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2426 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 - var4; // L: 2427 + return 1; // L: 2428 + } else if (var0 == ScriptOpcodes.MULTIPLY) { // L: 2430 + Interpreter.Interpreter_intStackSize -= 2; // L: 2431 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2432 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2433 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var4 * var9; // L: 2434 + return 1; // L: 2435 + } else if (var0 == ScriptOpcodes.DIV) { // L: 2437 + Interpreter.Interpreter_intStackSize -= 2; // L: 2438 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2439 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2440 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 / var4; // L: 2441 + return 1; // L: 2442 + } else if (var0 == ScriptOpcodes.RANDOM) { // L: 2444 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2445 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var9); // L: 2446 + return 1; // L: 2447 + } else if (var0 == ScriptOpcodes.RANDOMINC) { // L: 2449 + var9 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]; // L: 2450 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var9 + 1)); // L: 2451 + return 1; // L: 2452 + } else if (var0 == ScriptOpcodes.INTERPOLATE) { // L: 2454 + Interpreter.Interpreter_intStackSize -= 5; // L: 2455 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2456 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2457 + int var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2458 + int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 2459 + int var11 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 4]; // L: 2460 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 + (var11 - var10) * (var4 - var9) / (var6 - var10); // L: 2461 + return 1; // L: 2462 + } else if (var0 == ScriptOpcodes.ADDPERCENT) { // L: 2464 + Interpreter.Interpreter_intStackSize -= 2; // L: 2465 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2466 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2467 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 + var9 * var4 / 100; // L: 2468 + return 1; // L: 2469 + } else if (var0 == ScriptOpcodes.SETBIT) { // L: 2471 + Interpreter.Interpreter_intStackSize -= 2; // L: 2472 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2473 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2474 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 | 1 << var4; // L: 2475 + return 1; // L: 2476 + } else if (var0 == ScriptOpcodes.CLEARBIT) { // L: 2478 + Interpreter.Interpreter_intStackSize -= 2; // L: 2479 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2480 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2481 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 & -1 - (1 << var4); // L: 2482 + return 1; // L: 2483 + } else if (var0 == ScriptOpcodes.TESTBIT) { // L: 2485 + Interpreter.Interpreter_intStackSize -= 2; // L: 2486 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2487 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2488 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var9 & 1 << var4) != 0 ? 1 : 0; // L: 2489 + return 1; // L: 2490 + } else if (var0 == ScriptOpcodes.MOD) { // L: 2492 + Interpreter.Interpreter_intStackSize -= 2; // L: 2493 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2494 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2495 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 % var4; // L: 2496 + return 1; // L: 2497 + } else if (var0 == ScriptOpcodes.POW) { // L: 2499 + Interpreter.Interpreter_intStackSize -= 2; // L: 2500 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2501 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2502 + if (var9 == 0) { // L: 2503 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, (double)var4); // L: 2504 } - } - } - - @ObfuscatedName("kg") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "-1" - ) - static void method5525() { - if (class278.field3585 != null) { - Client.field942 = Client.cycle; - class278.field3585.method4489(); - - for (int var0 = 0; var0 < Client.players.length; ++var0) { - if (Client.players[var0] != null) { - class278.field3585.method4504((Client.players[var0].x >> 7) + class182.baseX, (Client.players[var0].y >> 7) + SecureRandomFuture.baseY); + return 1; // L: 2505 + } else if (var0 == ScriptOpcodes.INVPOW) { // L: 2507 + Interpreter.Interpreter_intStackSize -= 2; // L: 2508 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2509 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2510 + if (var9 == 0) { // L: 2511 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 2512 + return 1; // L: 2513 + } else { + switch(var4) { // L: 2515 + case 0: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; // L: 2538 + break; // L: 2539 + case 1: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9; // L: 2528 + break; // L: 2529 + case 2: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt((double)var9); // L: 2523 + break; // L: 2524 + case 3: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.cbrt((double)var9); // L: 2518 + break; + case 4: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.sqrt(Math.sqrt((double)var9)); // L: 2533 + break; // L: 2534 + default: + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)Math.pow((double)var9, 1.0D / (double)var4); // L: 2543 } - } - } + return 1; // L: 2547 + } + } else if (var0 == ScriptOpcodes.AND) { // L: 2549 + Interpreter.Interpreter_intStackSize -= 2; // L: 2550 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2551 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2552 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 & var4; // L: 2553 + return 1; // L: 2554 + } else if (var0 == ScriptOpcodes.OR) { // L: 2556 + Interpreter.Interpreter_intStackSize -= 2; // L: 2557 + var9 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2558 + var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2559 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var9 | var4; // L: 2560 + return 1; // L: 2561 + } else if (var0 == ScriptOpcodes.SCALE) { // L: 2563 + Interpreter.Interpreter_intStackSize -= 3; // L: 2564 + long var3 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 2565 + long var5 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 2566 + long var7 = (long)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 2567 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (int)(var7 * var3 / var5); // L: 2568 + return 1; // L: 2569 + } else { + return 2; // L: 2571 + } } } diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java index 35374169ea..30eb43bbc6 100644 --- a/runescape-client/src/main/java/class306.java +++ b/runescape-client/src/main/java/class306.java @@ -1,16 +1,11 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kg") +@ObfuscatedName("ki") public final class class306 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - longValue = 4078807176419591129L + longValue = 4608600077918488349L ) static long field3723; - @ObfuscatedName("o") - @ObfuscatedGetter( - longValue = 5600259578615977693L - ) - static long field3726; } diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java index 1467e10dc4..9db7efca3b 100644 --- a/runescape-client/src/main/java/class307.java +++ b/runescape-client/src/main/java/class307.java @@ -1,250 +1,113 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ky") +@ObfuscatedName("kq") public class class307 { - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "-549793273" + descriptor = "(CI)C", + garbageValue = "-2104430234" ) - static int method5650(int var0, Script var1, boolean var2) { - if (var0 < 1000) { - return ArchiveLoader.method1213(var0, var1, var2); - } else if (var0 < 1100) { - return GrandExchangeOfferOwnWorldComparator.method1342(var0, var1, var2); - } else if (var0 < 1200) { - return InvDefinition.method4530(var0, var1, var2); - } else if (var0 < 1300) { - return PlayerType.method4289(var0, var1, var2); - } else if (var0 < 1400) { - return GrandExchangeOfferWorldComparator.method137(var0, var1, var2); - } else if (var0 < 1500) { - return Tiles.method1199(var0, var1, var2); - } else if (var0 < 1600) { - return MusicPatchNode.method3964(var0, var1, var2); - } else if (var0 < 1700) { - return ReflectionCheck.method2418(var0, var1, var2); - } else if (var0 < 1800) { - return PendingSpawn.method1808(var0, var1, var2); - } else if (var0 < 1900) { - return class7.method100(var0, var1, var2); - } else if (var0 < 2000) { - return SoundSystem.method2630(var0, var1, var2); - } else if (var0 < 2100) { - return GrandExchangeOfferOwnWorldComparator.method1342(var0, var1, var2); - } else if (var0 < 2200) { - return InvDefinition.method4530(var0, var1, var2); - } else if (var0 < 2300) { - return PlayerType.method4289(var0, var1, var2); - } else if (var0 < 2400) { - return GrandExchangeOfferWorldComparator.method137(var0, var1, var2); - } else if (var0 < 2500) { - return Tiles.method1199(var0, var1, var2); - } else if (var0 < 2600) { - return Huffman.method4099(var0, var1, var2); - } else if (var0 < 2700) { - return Clock.method3641(var0, var1, var2); - } else if (var0 < 2800) { - return GrandExchangeOffer.method194(var0, var1, var2); - } else if (var0 < 2900) { - return WorldMapManager.method717(var0, var1, var2); - } else if (var0 < 3000) { - return SoundSystem.method2630(var0, var1, var2); - } else if (var0 < 3200) { - return WorldMapEvent.method836(var0, var1, var2); - } else if (var0 < 3300) { - return MusicPatchNode.method3969(var0, var1, var2); - } else if (var0 < 3400) { - return UrlRequester.method3424(var0, var1, var2); - } else if (var0 < 3500) { - return SecureRandomFuture.method2272(var0, var1, var2); - } else if (var0 < 3700) { - return class4.method63(var0, var1, var2); - } else if (var0 < 4000) { - return NPCDefinition.method4922(var0, var1, var2); - } else if (var0 < 4100) { - return SecureRandomCallable.method1203(var0, var1, var2); - } else if (var0 < 4200) { - return TileItemPile.method2902(var0, var1, var2); - } else if (var0 < 4300) { - return TextureProvider.method2888(var0, var1, var2); - } else if (var0 < 5100) { - return Entity.method3376(var0, var1, var2); - } else if (var0 < 5400) { - return class231.method4277(var0, var1, var2); - } else if (var0 < 5600) { - return class231.method4278(var0, var1, var2); - } else if (var0 < 5700) { - return class278.method5158(var0, var1, var2); - } else if (var0 < 6300) { - return AttackOption.method2180(var0, var1, var2); - } else if (var0 < 6600) { - return LoginScreenAnimation.method1883(var0, var1, var2); - } else { - return var0 < 6700 ? WorldMapIcon_0.method265(var0, var1, var2) : 2; + public static char method5555(char var0) { + switch(var0) { // L: 48 + case ' ': + case '-': + case '_': + case ' ': + return '_'; // L: 62 + case '#': + case '[': + case ']': + return var0; // L: 92 + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + return 'a'; // L: 117 + case 'Ç': + case 'ç': + return 'c'; // L: 79 + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + return 'e'; // L: 88 + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + return 'i'; // L: 57 + case 'Ñ': + case 'ñ': + return 'n'; // L: 95 + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + return 'o'; // L: 106 + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + return 'u'; // L: 74 + case 'ß': + return 'b'; // L: 50 + case 'ÿ': + case 'Ÿ': + return 'y'; // L: 65 + default: + return Character.toLowerCase(var0); // L: 76 } } - @ObfuscatedName("gy") + @ObfuscatedName("w") @ObfuscatedSignature( - descriptor = "(IIIIIB)V", - garbageValue = "51" + descriptor = "(B)[Lls;", + garbageValue = "1" ) - @Export("drawObject") - static final void drawObject(int var0, int var1, int var2, int var3, int var4) { - long var5 = UserComparator3.scene.getBoundaryObjectTag(var0, var1, var2); - int var7; - int var8; - int var9; - int var10; - int var14; - int var26; - if (var5 != 0L) { - var7 = UserComparator3.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = var3; - boolean var12 = 0L != var5; - if (var12) { - boolean var13 = (int)(var5 >>> 16 & 1L) == 1; - var12 = !var13; - } + static IndexedSprite[] method5558() { + IndexedSprite[] var0 = new IndexedSprite[class335.SpriteBuffer_spriteCount]; // L: 154 - if (var12) { - var10 = var4; - } - - int[] var19 = class3.sceneMinimapSprite.pixels; - var26 = var1 * 4 + (103 - var2) * 2048 + 24624; - var14 = Language.Entity_unpackID(var5); - ObjectDefinition var15 = Canvas.getObjectDefinition(var14); - if (var15.mapSceneId != -1) { - IndexedSprite var16 = UserComparator6.mapSceneSprites[var15.mapSceneId]; - if (var16 != null) { - int var17 = (var15.sizeX * 4 - var16.subWidth) / 2; - int var18 = (var15.sizeY * 4 - var16.subHeight) / 2; - var16.drawAt(var17 + var1 * 4 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48); - } - } else { - if (var9 == 0 || var9 == 2) { - if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 1) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; - } - } - - if (var9 == 3) { - if (var8 == 0) { - var19[var26] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 3) { - var19[var26 + 1536] = var10; - } - } - - if (var9 == 2) { - if (var8 == 3) { - var19[var26] = var10; - var19[var26 + 512] = var10; - var19[var26 + 1024] = var10; - var19[var26 + 1536] = var10; - } else if (var8 == 0) { - var19[var26] = var10; - var19[var26 + 1] = var10; - var19[var26 + 2] = var10; - var19[var26 + 3] = var10; - } else if (var8 == 1) { - var19[var26 + 3] = var10; - var19[var26 + 512 + 3] = var10; - var19[var26 + 1024 + 3] = var10; - var19[var26 + 1536 + 3] = var10; - } else if (var8 == 2) { - var19[var26 + 1536] = var10; - var19[var26 + 1536 + 1] = var10; - var19[var26 + 1536 + 2] = var10; - var19[var26 + 1536 + 3] = var10; - } - } - } - } - - var5 = UserComparator3.scene.getGameObjectTag(var0, var1, var2); - if (var5 != 0L) { - var7 = UserComparator3.scene.getObjectFlags(var0, var1, var2, var5); - var8 = var7 >> 6 & 3; - var9 = var7 & 31; - var10 = Language.Entity_unpackID(var5); - ObjectDefinition var20 = Canvas.getObjectDefinition(var10); - if (var20.mapSceneId != -1) { - IndexedSprite var28 = UserComparator6.mapSceneSprites[var20.mapSceneId]; - if (var28 != null) { - var26 = (var20.sizeX * 4 - var28.subWidth) / 2; - var14 = (var20.sizeY * 4 - var28.subHeight) / 2; - var28.drawAt(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48); - } - } else if (var9 == 9) { - int var25 = 15658734; - boolean var27 = var5 != 0L; - if (var27) { - boolean var23 = (int)(var5 >>> 16 & 1L) == 1; - var27 = !var23; - } - - if (var27) { - var25 = 15597568; - } - - int[] var24 = class3.sceneMinimapSprite.pixels; - int var29 = var1 * 4 + (103 - var2) * 2048 + 24624; - if (var8 != 0 && var8 != 2) { - var24[var29] = var25; - var24[var29 + 1 + 512] = var25; - var24[var29 + 1024 + 2] = var25; - var24[var29 + 1536 + 3] = var25; - } else { - var24[var29 + 1536] = var25; - var24[var29 + 1 + 1024] = var25; - var24[var29 + 512 + 2] = var25; - var24[var29 + 3] = var25; - } - } - } - - var5 = UserComparator3.scene.getFloorDecorationTag(var0, var1, var2); - if (0L != var5) { - var7 = Language.Entity_unpackID(var5); - ObjectDefinition var21 = Canvas.getObjectDefinition(var7); - if (var21.mapSceneId != -1) { - IndexedSprite var22 = UserComparator6.mapSceneSprites[var21.mapSceneId]; - if (var22 != null) { - var10 = (var21.sizeX * 4 - var22.subWidth) / 2; - int var11 = (var21.sizeY * 4 - var22.subHeight) / 2; - var22.drawAt(var1 * 4 + var10 + 48, (104 - var2 - var21.sizeY) * 4 + var11 + 48); - } - } + for (int var1 = 0; var1 < class335.SpriteBuffer_spriteCount; ++var1) { // L: 155 + IndexedSprite var2 = var0[var1] = new IndexedSprite(); // L: 156 + var2.width = class335.SpriteBuffer_spriteWidth; // L: 157 + var2.height = class335.SpriteBuffer_spriteHeight; // L: 158 + var2.xOffset = Username.SpriteBuffer_xOffsets[var1]; // L: 159 + var2.yOffset = class335.SpriteBuffer_yOffsets[var1]; // L: 160 + var2.subWidth = class335.SpriteBuffer_spriteWidths[var1]; // L: 161 + var2.subHeight = class335.SpriteBuffer_spriteHeights[var1]; // L: 162 + var2.palette = TaskHandler.SpriteBuffer_spritePalette; // L: 163 + var2.pixels = class92.SpriteBuffer_pixels[var1]; // L: 164 } + Username.SpriteBuffer_xOffsets = null; // L: 167 + class335.SpriteBuffer_yOffsets = null; // L: 168 + class335.SpriteBuffer_spriteWidths = null; // L: 169 + class335.SpriteBuffer_spriteHeights = null; // L: 170 + TaskHandler.SpriteBuffer_spritePalette = null; // L: 171 + class92.SpriteBuffer_pixels = null; // L: 172 + return var0; // L: 174 } } diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java index d78ebe3825..38b3976f60 100644 --- a/runescape-client/src/main/java/class310.java +++ b/runescape-client/src/main/java/class310.java @@ -1,71 +1,71 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("kz") +@ObfuscatedName("kn") public class class310 { - @ObfuscatedName("m") + @ObfuscatedName("z") @Export("writeRandomDat") public static void writeRandomDat(byte[] var0, int var1, byte[] var2, int var3, int var4) { - if (var2 == var0) { - if (var3 == var1) { + if (var2 == var0) { // L: 12 + if (var3 == var1) { // L: 13 return; } - if (var3 > var1 && var3 < var4 + var1) { - --var4; - var1 += var4; - var3 += var4; - var4 = var1 - var4; + if (var3 > var1 && var3 < var4 + var1) { // L: 14 + --var4; // L: 15 + var1 += var4; // L: 16 + var3 += var4; // L: 17 + var4 = var1 - var4; // L: 18 - for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; - var2[var3--] = var0[var1--]; + for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 19 20 28 + var2[var3--] = var0[var1--]; // L: 21 + var2[var3--] = var0[var1--]; // L: 22 + var2[var3--] = var0[var1--]; // L: 23 + var2[var3--] = var0[var1--]; // L: 24 + var2[var3--] = var0[var1--]; // L: 25 + var2[var3--] = var0[var1--]; // L: 26 + var2[var3--] = var0[var1--]; // L: 27 } - for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { + for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) { // L: 30 31 } - return; + return; // L: 32 } } - var4 += var1; + var4 += var1; // L: 35 - for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; - var2[var3++] = var0[var1++]; + for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 36 37 45 + var2[var3++] = var0[var1++]; // L: 38 + var2[var3++] = var0[var1++]; // L: 39 + var2[var3++] = var0[var1++]; // L: 40 + var2[var3++] = var0[var1++]; // L: 41 + var2[var3++] = var0[var1++]; // L: 42 + var2[var3++] = var0[var1++]; // L: 43 + var2[var3++] = var0[var1++]; // L: 44 } - for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { + for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) { // L: 47 48 } - } + } // L: 49 - @ObfuscatedName("z") + @ObfuscatedName("m") @Export("clearIntArray") public static void clearIntArray(int[] var0, int var1, int var2) { - for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; - var0[var1++] = 0; + for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) { // L: 364 365 373 + var0[var1++] = 0; // L: 366 + var0[var1++] = 0; // L: 367 + var0[var1++] = 0; // L: 368 + var0[var1++] = 0; // L: 369 + var0[var1++] = 0; // L: 370 + var0[var1++] = 0; // L: 371 + var0[var1++] = 0; // L: 372 } - for (var2 += 7; var1 < var2; var0[var1++] = 0) { + for (var2 += 7; var1 < var2; var0[var1++] = 0) { // L: 375 376 } - } + } // L: 377 } diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java index a62de4ed5b..7e036aca13 100644 --- a/runescape-client/src/main/java/class322.java +++ b/runescape-client/src/main/java/class322.java @@ -3,62 +3,62 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("lx") +@ObfuscatedName("ly") public enum class322 implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lly;" ) - field3841(4, 0), + field3841(1, 0), + @ObfuscatedName("k") + @ObfuscatedSignature( + descriptor = "Lly;" + ) + field3842(5, 2), + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "Lly;" + ) + field3843(2, 5), + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "Lly;" + ) + field3848(4, 6), + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "Lly;" + ) + field3845(3, 7), @ObfuscatedName("o") @ObfuscatedSignature( - descriptor = "Llx;" + descriptor = "Lly;" ) - field3836(2, 2), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - field3837(5, 5), - @ObfuscatedName("j") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - field3838(0, 6), - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - field3839(1, 7), - @ObfuscatedName("g") - @ObfuscatedSignature( - descriptor = "Llx;" - ) - field3840(3, 8); + field3846(0, 8); - @ObfuscatedName("n") + @ObfuscatedName("x") @ObfuscatedGetter( - intValue = -970737945 + intValue = -437447657 ) - final int field3835; - @ObfuscatedName("u") + final int field3847; + @ObfuscatedName("w") @ObfuscatedGetter( - intValue = -900565137 + intValue = 1336869107 ) - final int field3842; + final int field3844; class322(int var3, int var4) { - this.field3835 = var3; - this.field3842 = var4; - } + this.field3847 = var3; // L: 18 + this.field3844 = var4; // L: 19 + } // L: 20 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3842; + return this.field3844; // L: 23 } } diff --git a/runescape-client/src/main/java/class329.java b/runescape-client/src/main/java/class329.java deleted file mode 100644 index a2043aeab0..0000000000 --- a/runescape-client/src/main/java/class329.java +++ /dev/null @@ -1,25 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lr") -public class class329 { - @ObfuscatedName("rk") - @ObfuscatedGetter( - intValue = 542004201 - ) - static int field3867; - - @ObfuscatedName("n") - @ObfuscatedSignature( - descriptor = "(Lic;Ljava/lang/String;Ljava/lang/String;B)Llh;", - garbageValue = "48" - ) - @Export("SpriteBuffer_getIndexedSpriteByName") - public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { - int var3 = var0.getGroupId(var1); - int var4 = var0.getFileId(var3, var2); - return Buddy.method5355(var0, var3, var4); - } -} diff --git a/runescape-client/src/main/java/class332.java b/runescape-client/src/main/java/class332.java deleted file mode 100644 index 15743e8d03..0000000000 --- a/runescape-client/src/main/java/class332.java +++ /dev/null @@ -1,109 +0,0 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("lw") -public enum class332 implements Enumerated { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Llw;" - ) - @Export("SOLID") - SOLID(0, 0), - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "Llw;" - ) - field3880(1, 1), - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "Llw;" - ) - field3881(2, 2); - - @ObfuscatedName("j") - @ObfuscatedGetter( - intValue = -1792088277 - ) - public final int field3882; - @ObfuscatedName("p") - @ObfuscatedGetter( - intValue = -1134818825 - ) - @Export("index") - final int index; - - class332(int var3, int var4) { - this.field3882 = var3; - this.index = var4; - } - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "-995092303" - ) - @Export("rsOrdinal") - public int rsOrdinal() { - return this.index; - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/Throwable;I)Ljava/lang/String;", - garbageValue = "-353829952" - ) - static String method6316(Throwable var0) throws IOException { - String var1; - if (var0 instanceof RunException) { - RunException var2 = (RunException)var0; - var1 = var2.message + " | "; - var0 = var2.throwable; - } else { - var1 = ""; - } - - StringWriter var12 = new StringWriter(); - PrintWriter var3 = new PrintWriter(var12); - var0.printStackTrace(var3); - var3.close(); - String var4 = var12.toString(); - BufferedReader var5 = new BufferedReader(new StringReader(var4)); - String var6 = var5.readLine(); - - while (true) { - while (true) { - String var7 = var5.readLine(); - if (var7 == null) { - var1 = var1 + "| " + var6; - return var1; - } - - int var8 = var7.indexOf(40); - int var9 = var7.indexOf(41, var8 + 1); - if (var8 >= 0 && var9 >= 0) { - String var10 = var7.substring(var8 + 1, var9); - int var11 = var10.indexOf(".java:"); - if (var11 >= 0) { - var10 = var10.substring(0, var11) + var10.substring(var11 + 5); - var1 = var1 + var10 + ' '; - continue; - } - - var7 = var7.substring(0, var8); - } - - var7 = var7.trim(); - var7 = var7.substring(var7.lastIndexOf(32) + 1); - var7 = var7.substring(var7.lastIndexOf(9) + 1); - var1 = var1 + var7 + ' '; - } - } - } -} diff --git a/runescape-client/src/main/java/class335.java b/runescape-client/src/main/java/class335.java index 2cbcf5c6ef..0c4f9f5889 100644 --- a/runescape-client/src/main/java/class335.java +++ b/runescape-client/src/main/java/class335.java @@ -2,30 +2,33 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("lg") +@ObfuscatedName("lj") public class class335 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedGetter( - intValue = 238852743 + intValue = -245984031 ) @Export("SpriteBuffer_spriteCount") static int SpriteBuffer_spriteCount; - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 1435600367 + intValue = -112832063 ) @Export("SpriteBuffer_spriteWidth") static int SpriteBuffer_spriteWidth; - @ObfuscatedName("j") - @Export("SpriteBuffer_xOffsets") - static int[] SpriteBuffer_xOffsets; - @ObfuscatedName("g") + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 707136589 + ) + @Export("SpriteBuffer_spriteHeight") + static int SpriteBuffer_spriteHeight; + @ObfuscatedName("i") + @Export("SpriteBuffer_yOffsets") + static int[] SpriteBuffer_yOffsets; + @ObfuscatedName("o") @Export("SpriteBuffer_spriteWidths") static int[] SpriteBuffer_spriteWidths; - @ObfuscatedName("n") + @ObfuscatedName("x") @Export("SpriteBuffer_spriteHeights") static int[] SpriteBuffer_spriteHeights; - @ObfuscatedName("u") - @Export("SpriteBuffer_spritePalette") - static int[] SpriteBuffer_spritePalette; } diff --git a/runescape-client/src/main/java/class336.java b/runescape-client/src/main/java/class336.java index f0c6ed1233..c632a4411c 100644 --- a/runescape-client/src/main/java/class336.java +++ b/runescape-client/src/main/java/class336.java @@ -1,15 +1,101 @@ -import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; +import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("ll") +@ObfuscatedName("le") public class class336 { - @ObfuscatedName("w") - @Export("musicTrackBoolean") - public static boolean musicTrackBoolean; - @ObfuscatedName("y") + @ObfuscatedName("ax") @ObfuscatedSignature( - descriptor = "Llh;" + descriptor = "(ILcy;ZB)I", + garbageValue = "-81" ) - static IndexedSprite field3912; + static int method6380(int var0, Script var1, boolean var2) { + if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) { // L: 3201 + Interpreter.Interpreter_intStackSize -= 2; // L: 3202 + Client.field769 = (short)class197.method3741(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]); // L: 3203 + if (Client.field769 <= 0) { // L: 3204 + Client.field769 = 256; + } + + Client.field928 = (short)class197.method3741(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]); // L: 3205 + if (Client.field928 <= 0) { // L: 3206 + Client.field928 = 256; + } + + return 1; // L: 3207 + } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { // L: 3209 + Interpreter.Interpreter_intStackSize -= 2; // L: 3210 + Client.zoomHeight = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3211 + if (Client.zoomHeight <= 0) { // L: 3212 + Client.zoomHeight = 256; + } + + Client.zoomWidth = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3213 + if (Client.zoomWidth <= 0) { // L: 3214 + Client.zoomWidth = 320; + } + + return 1; // L: 3215 + } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { // L: 3217 + Interpreter.Interpreter_intStackSize -= 4; // L: 3218 + Client.field931 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize]; // L: 3219 + if (Client.field931 <= 0) { // L: 3220 + Client.field931 = 1; + } + + Client.field932 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]; // L: 3221 + if (Client.field932 <= 0) { // L: 3222 + Client.field932 = 32767; + } else if (Client.field932 < Client.field931) { // L: 3223 + Client.field932 = Client.field931; + } + + Client.field938 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]; // L: 3224 + if (Client.field938 <= 0) { // L: 3225 + Client.field938 = 1; + } + + Client.field934 = (short)Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3]; // L: 3226 + if (Client.field934 <= 0) { // L: 3227 + Client.field934 = 32767; + } else if (Client.field934 < Client.field938) { // L: 3228 + Client.field934 = Client.field938; + } + + return 1; // L: 3229 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { // L: 3231 + if (Client.viewportWidget != null) { // L: 3232 + class231.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); // L: 3233 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportWidth; // L: 3234 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.viewportHeight; // L: 3235 + } else { + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3238 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1; // L: 3239 + } + + return 1; // L: 3241 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { // L: 3243 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomHeight; // L: 3244 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.zoomWidth; // L: 3245 + return 1; // L: 3246 + } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { // L: 3248 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapManager.method725(Client.field769); // L: 3249 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = WorldMapManager.method725(Client.field928); // L: 3250 + return 1; // L: 3251 + } else if (var0 == 6220) { // L: 3253 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3254 + return 1; // L: 3255 + } else if (var0 == 6221) { // L: 3257 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0; // L: 3258 + return 1; // L: 3259 + } else if (var0 == 6222) { // L: 3261 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = FloorDecoration.canvasWidth; // L: 3262 + return 1; // L: 3263 + } else if (var0 == 6223) { // L: 3265 + Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = GameShell.canvasHeight; // L: 3266 + return 1; // L: 3267 + } else { + return 2; // L: 3269 + } + } } diff --git a/runescape-client/src/main/java/class346.java b/runescape-client/src/main/java/class346.java index 30e957c977..27bd37c75a 100644 --- a/runescape-client/src/main/java/class346.java +++ b/runescape-client/src/main/java/class346.java @@ -1,21 +1,21 @@ import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mi") +@ObfuscatedName("mp") public class class346 { - @ObfuscatedName("z") - static final int[] field4043; - @ObfuscatedName("w") - static final int[] field4046; + @ObfuscatedName("m") + static final int[] field4050; + @ObfuscatedName("n") + static final int[] field4053; static { - field4043 = new int[2048]; - field4046 = new int[2048]; - double var0 = 0.0030679615757712823D; + field4050 = new int[2048]; // L: 13 + field4053 = new int[2048]; // L: 14 + double var0 = 0.0030679615757712823D; // L: 17 - for (int var2 = 0; var2 < 2048; ++var2) { - field4043[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2)); - field4046[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2)); + for (int var2 = 0; var2 < 2048; ++var2) { // L: 18 + field4050[var2] = (int)(65536.0D * Math.sin((double)var2 * var0)); // L: 19 + field4053[var2] = (int)(65536.0D * Math.cos((double)var2 * var0)); // L: 20 } - } + } // L: 22 } diff --git a/runescape-client/src/main/java/class348.java b/runescape-client/src/main/java/class348.java index eb0da65d37..43a1258d85 100644 --- a/runescape-client/src/main/java/class348.java +++ b/runescape-client/src/main/java/class348.java @@ -1,20 +1,14 @@ -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; -@ObfuscatedName("mj") +@ObfuscatedName("mi") public class class348 { - @ObfuscatedName("q") + @ObfuscatedName("s") + static final char[] field4067; + @ObfuscatedName("t") static final char[] field4065; - @ObfuscatedName("j") - static final char[] field4064; - @ObfuscatedName("g") - @ObfuscatedGetter( - intValue = 270973117 - ) - static int field4062; static { - field4065 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; - field4064 = new char[]{'[', ']', '#'}; + field4067 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'}; // L: 8 + field4065 = new char[]{'[', ']', '#'}; // L: 9 } } diff --git a/runescape-client/src/main/java/class349.java b/runescape-client/src/main/java/class349.java deleted file mode 100644 index 98b4919f60..0000000000 --- a/runescape-client/src/main/java/class349.java +++ /dev/null @@ -1,19 +0,0 @@ -import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedName; -import net.runelite.mapping.ObfuscatedSignature; - -@ObfuscatedName("md") -public class class349 { - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - @Export("EnumDefinition_archive") - static AbstractArchive EnumDefinition_archive; - @ObfuscatedName("w") - @ObfuscatedSignature( - descriptor = "Lic;" - ) - @Export("Widget_spritesArchive") - static AbstractArchive Widget_spritesArchive; -} diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java index a155897083..e8f4ab7782 100644 --- a/runescape-client/src/main/java/class39.java +++ b/runescape-client/src/main/java/class39.java @@ -3,349 +3,68 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("al") +@ObfuscatedName("ah") public class class39 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Lah;" ) - static final class39 field296; - @ObfuscatedName("o") + static final class39 field279; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lal;" + descriptor = "Lah;" ) - static final class39 field293; - @ObfuscatedName("q") + static final class39 field280; + @ObfuscatedName("g") + static int[][] field282; + @ObfuscatedName("h") + @ObfuscatedSignature( + descriptor = "Lds;" + ) + @Export("soundCache") + static SoundCache soundCache; + @ObfuscatedName("s") @ObfuscatedGetter( - intValue = -946944109 + intValue = -812273923 ) @Export("value") final int value; static { - field296 = new class39(0); - field293 = new class39(1); + field279 = new class39(0); // L: 4 + field280 = new class39(1); // L: 5 } class39(int var1) { this.value = var1; + } // L: 10 + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "([BB)Lat;", + garbageValue = "87" + ) + static WorldMapSprite method613(byte[] var0) { + return var0 == null ? new WorldMapSprite() : new WorldMapSprite(MouseHandler.convertJpgToSprite(var0).pixels); // L: 19 20 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(III)Z", - garbageValue = "-1422185207" + descriptor = "(IB)Z", + garbageValue = "91" ) - static boolean method615(int var0, int var1) { - return var0 != 4 || var1 < 8; + @Export("Widget_hasContinueOption") + public static boolean Widget_hasContinueOption(int var0) { + return (var0 & 1) != 0; // L: 9 } - @ObfuscatedName("gk") + @ObfuscatedName("fl") @ObfuscatedSignature( - descriptor = "(Lgl;I)V", - garbageValue = "-980354844" + descriptor = "(I)I", + garbageValue = "488436516" ) - static final void method616(class194 var0) { - PacketBuffer var1 = Client.packetWriter.packetBuffer; - int var2; - int var4; - int var5; - int var6; - int var7; - int var8; - int var9; - int var10; - int var11; - int var13; - byte var14; - if (class194.field2358 == var0) { - var2 = var1.method5757(); - byte var3 = var1.method5751(); - var4 = var1.method5755(); - var5 = var1.method5748(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.field734[var6]; - var9 = var1.method5936(); - var10 = (var9 >> 4 & 7) + Player.field638; - var11 = (var9 & 7) + class41.field302; - byte var12 = var1.method5751(); - var13 = var1.method5757(); - var14 = var1.method5730(); - int var15 = var1.method5867(); - byte var16 = var1.method5750(); - Player var17; - if (var2 == Client.localPlayerIndex) { - var17 = class60.localPlayer; - } else { - var17 = Client.players[var2]; - } - - if (var17 != null) { - ObjectDefinition var18 = Canvas.getObjectDefinition(var15); - int var19; - int var20; - if (var7 != 1 && var7 != 3) { - var19 = var18.sizeX; - var20 = var18.sizeY; - } else { - var19 = var18.sizeY; - var20 = var18.sizeX; - } - - int var21 = var10 + (var19 >> 1); - int var22 = var10 + (var19 + 1 >> 1); - int var23 = var11 + (var20 >> 1); - int var24 = var11 + (var20 + 1 >> 1); - int[][] var25 = Tiles.Tiles_heights[TileItemPile.Client_plane]; - int var26 = var25[var21][var24] + var25[var22][var23] + var25[var21][var23] + var25[var22][var24] >> 2; - int var27 = (var10 << 7) + (var19 << 6); - int var28 = (var11 << 7) + (var20 << 6); - Model var29 = var18.getModel(var6, var7, var25, var27, var26, var28); - if (var29 != null) { - TileItem.updatePendingSpawn(TileItemPile.Client_plane, var10, var11, var8, -1, 0, 0, var13 + 1, var4 + 1); - var17.animationCycleStart = var13 + Client.cycle; - var17.animationCycleEnd = var4 + Client.cycle; - var17.model0 = var29; - var17.field661 = var19 * 64 + var10 * 128; - var17.field653 = var20 * 64 + var11 * 128; - var17.tileHeight2 = var26; - byte var30; - if (var16 > var3) { - var30 = var16; - var16 = var3; - var3 = var30; - } - - if (var12 > var14) { - var30 = var12; - var12 = var14; - var14 = var30; - } - - var17.field648 = var10 + var16; - var17.field650 = var10 + var3; - var17.field649 = var12 + var11; - var17.field651 = var14 + var11; - } - } - } - - int var37; - if (class194.field2357 == var0) { - var2 = var1.method5755(); - var37 = var1.method5755(); - var4 = var1.method5936(); - var5 = (var4 >> 4 & 7) + Player.field638; - var6 = (var4 & 7) + class41.field302; - var7 = var1.method5746(); - if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) { - var5 = var5 * 128 + 64; - var6 = var6 * 128 + 64; - GraphicsObject var41 = new GraphicsObject(var37, TileItemPile.Client_plane, var5, var6, Language.getTileHeight(var5, var6, TileItemPile.Client_plane) - var7, var2, Client.cycle); - Client.graphicsObjects.addFirst(var41); - } - - } else if (class194.field2355 == var0) { - var2 = var1.readUnsignedByte(); - var37 = (var2 >> 4 & 7) + Player.field638; - var4 = (var2 & 7) + class41.field302; - var5 = var1.method5867(); - var6 = var1.method5746(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field734[var7]; - if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104) { - TileItem.updatePendingSpawn(TileItemPile.Client_plane, var37, var4, var9, var5, var7, var8, 0, -1); - } - - } else if (class194.field2361 == var0) { - var2 = var1.method5748(); - var37 = (var2 >> 4 & 7) + Player.field638; - var4 = (var2 & 7) + class41.field302; - var5 = var1.method5755(); - var6 = var1.readUnsignedByte(); - var7 = var6 >> 2; - var8 = var6 & 3; - var9 = Client.field734[var7]; - if (var37 >= 0 && var4 >= 0 && var37 < 103 && var4 < 103) { - if (var9 == 0) { - BoundaryObject var32 = UserComparator3.scene.method3213(TileItemPile.Client_plane, var37, var4); - if (var32 != null) { - var11 = Language.Entity_unpackID(var32.tag); - if (var7 == 2) { - var32.entity1 = new DynamicObject(var11, 2, var8 + 4, TileItemPile.Client_plane, var37, var4, var5, false, var32.entity1); - var32.entity2 = new DynamicObject(var11, 2, var8 + 1 & 3, TileItemPile.Client_plane, var37, var4, var5, false, var32.entity2); - } else { - var32.entity1 = new DynamicObject(var11, var7, var8, TileItemPile.Client_plane, var37, var4, var5, false, var32.entity1); - } - } - } - - if (var9 == 1) { - WallDecoration var42 = UserComparator3.scene.method3214(TileItemPile.Client_plane, var37, var4); - if (var42 != null) { - var11 = Language.Entity_unpackID(var42.tag); - if (var7 != 4 && var7 != 5) { - if (var7 == 6) { - var42.entity1 = new DynamicObject(var11, 4, var8 + 4, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity1); - } else if (var7 == 7) { - var42.entity1 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity1); - } else if (var7 == 8) { - var42.entity1 = new DynamicObject(var11, 4, var8 + 4, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity1); - var42.entity2 = new DynamicObject(var11, 4, (var8 + 2 & 3) + 4, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity2); - } - } else { - var42.entity1 = new DynamicObject(var11, 4, var8, TileItemPile.Client_plane, var37, var4, var5, false, var42.entity1); - } - } - } - - if (var9 == 2) { - GameObject var43 = UserComparator3.scene.method3215(TileItemPile.Client_plane, var37, var4); - if (var7 == 11) { - var7 = 10; - } - - if (var43 != null) { - var43.entity = new DynamicObject(Language.Entity_unpackID(var43.tag), var7, var8, TileItemPile.Client_plane, var37, var4, var5, false, var43.entity); - } - } - - if (var9 == 3) { - FloorDecoration var44 = UserComparator3.scene.getFloorDecoration(TileItemPile.Client_plane, var37, var4); - if (var44 != null) { - var44.entity = new DynamicObject(Language.Entity_unpackID(var44.tag), 22, var8, TileItemPile.Client_plane, var37, var4, var5, false, var44.entity); - } - } - } - - } else if (class194.field2353 == var0) { - var2 = var1.method5746(); - var37 = (var2 >> 4 & 7) + Player.field638; - var4 = (var2 & 7) + class41.field302; - var5 = var1.method5746(); - var6 = var5 >> 2; - var7 = var5 & 3; - var8 = Client.field734[var6]; - if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104) { - TileItem.updatePendingSpawn(TileItemPile.Client_plane, var37, var4, var8, -1, var6, var7, 0, -1); - } - - } else if (class194.field2354 == var0) { - var2 = var1.readUnsignedByte(); - var37 = (var2 >> 4 & 7) + Player.field638; - var4 = (var2 & 7) + class41.field302; - var5 = var1.readUnsignedShort(); - var6 = var1.method5867(); - var7 = var1.method5867(); - if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104) { - NodeDeque var31 = Client.groundItems[TileItemPile.Client_plane][var37][var4]; - if (var31 != null) { - for (TileItem var33 = (TileItem)var31.last(); var33 != null; var33 = (TileItem)var31.previous()) { - if ((var7 & 32767) == var33.id && var6 == var33.quantity) { - var33.quantity = var5; - break; - } - } - - class41.updateItemPile(var37, var4); - } - } - - } else { - TileItem var34; - if (class194.field2359 == var0) { - var2 = var1.method5757(); - var37 = var1.readUnsignedByte(); - var4 = (var37 >> 4 & 7) + Player.field638; - var5 = (var37 & 7) + class41.field302; - var6 = var1.readUnsignedShort(); - if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) { - var34 = new TileItem(); - var34.id = var6; - var34.quantity = var2; - if (Client.groundItems[TileItemPile.Client_plane][var4][var5] == null) { - Client.groundItems[TileItemPile.Client_plane][var4][var5] = new NodeDeque(); - } - - Client.groundItems[TileItemPile.Client_plane][var4][var5].addFirst(var34); - class41.updateItemPile(var4, var5); - } - - } else if (class194.field2360 == var0) { - var2 = var1.method5746(); - var37 = (var2 >> 4 & 7) + Player.field638; - var4 = (var2 & 7) + class41.field302; - byte var38 = var1.method5730(); - var6 = var1.method5746() * 4; - var7 = var1.method5759(); - var8 = var1.method5755(); - var9 = var1.readUnsignedShort(); - var10 = var1.readUnsignedShort(); - var11 = var1.method5748(); - int var39 = var1.readUnsignedByte() * 4; - var13 = var1.method5748(); - var14 = var1.readByte(); - int var40 = var14 + var37; - var5 = var38 + var4; - if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104 && var40 >= 0 && var5 >= 0 && var40 < 104 && var5 < 104 && var10 != 65535) { - var37 = var37 * 128 + 64; - var4 = var4 * 128 + 64; - var40 = var40 * 128 + 64; - var5 = var5 * 128 + 64; - Projectile var35 = new Projectile(var10, TileItemPile.Client_plane, var37, var4, Language.getTileHeight(var37, var4, TileItemPile.Client_plane) - var39, var9 + Client.cycle, var8 + Client.cycle, var13, var11, var7, var6); - var35.setDestination(var40, var5, Language.getTileHeight(var40, var5, TileItemPile.Client_plane) - var6, var9 + Client.cycle); - Client.projectiles.addFirst(var35); - } - - } else if (class194.field2363 != var0) { - if (class194.field2362 == var0) { - var2 = var1.method5746(); - var37 = var2 >> 4 & 15; - var4 = var2 & 7; - var5 = var1.method5867(); - var6 = var1.method5748(); - var7 = (var6 >> 4 & 7) + Player.field638; - var8 = (var6 & 7) + class41.field302; - var9 = var1.method5746(); - if (var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) { - var10 = var37 + 1; - if (class60.localPlayer.pathX[0] >= var7 - var10 && class60.localPlayer.pathX[0] <= var7 + var10 && class60.localPlayer.pathY[0] >= var8 - var10 && class60.localPlayer.pathY[0] <= var10 + var8 && Client.areaSoundEffectVolume != 0 && var4 > 0 && Client.soundEffectCount < 50) { - Client.soundEffectIds[Client.soundEffectCount] = var5; - Client.queuedSoundEffectLoops[Client.soundEffectCount] = var4; - Client.queuedSoundEffectDelays[Client.soundEffectCount] = var9; - Client.soundEffects[Client.soundEffectCount] = null; - Client.soundLocations[Client.soundEffectCount] = var37 + (var8 << 8) + (var7 << 16); - ++Client.soundEffectCount; - } - } - } - - } else { - var2 = var1.readUnsignedByte(); - var37 = (var2 >> 4 & 7) + Player.field638; - var4 = (var2 & 7) + class41.field302; - var5 = var1.method5755(); - if (var37 >= 0 && var4 >= 0 && var37 < 104 && var4 < 104) { - NodeDeque var36 = Client.groundItems[TileItemPile.Client_plane][var37][var4]; - if (var36 != null) { - for (var34 = (TileItem)var36.last(); var34 != null; var34 = (TileItem)var36.previous()) { - if ((var5 & 32767) == var34.id) { - var34.remove(); - break; - } - } - - if (var36.last() == null) { - Client.groundItems[TileItemPile.Client_plane][var37][var4] = null; - } - - class41.updateItemPile(var37, var4); - } - } - - } - } + @Export("getWindowedMode") + static int getWindowedMode() { + return Client.isResizable ? 2 : 1; // L: 3862 } } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 4002064d3b..958a1698dd 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -1,608 +1,120 @@ -import java.io.File; -import java.io.RandomAccessFile; import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("p") +@ObfuscatedName("i") final class class4 implements class0 { - @ObfuscatedName("pk") - @Export("ClanChat_inClanChat") - static boolean ClanChat_inClanChat; - @ObfuscatedName("ha") + @ObfuscatedName("fd") @ObfuscatedSignature( - descriptor = "[Llh;" + descriptor = "Lkr;" ) - @Export("modIconSprites") - static IndexedSprite[] modIconSprites; + @Export("fontBold12") + static Font fontBold12; - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/lang/Object;Lkn;B)V", - garbageValue = "0" + descriptor = "(Ljava/lang/Object;Lkf;B)V", + garbageValue = "21" ) - public void vmethod59(Object var1, Buffer var2) { - this.method46((String)var1, var2); - } + public void vmethod70(Object var1, Buffer var2) { + this.method59((String)var1, var2); // L: 46 + } // L: 47 - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;B)Ljava/lang/Object;", - garbageValue = "114" + descriptor = "(Lkf;I)Ljava/lang/Object;", + garbageValue = "-453860591" ) - public Object vmethod47(Buffer var1) { - return var1.readStringCp1252NullTerminated(); - } - - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;Lkn;I)V", - garbageValue = "-1456597328" - ) - void method46(String var1, Buffer var2) { - var2.writeStringCp1252NullTerminated(var1); + public Object vmethod61(Buffer var1) { + return var1.readStringCp1252NullTerminated(); // L: 42 } @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "([BIII)Ljava/lang/String;", - garbageValue = "-1273544207" + descriptor = "(Ljava/lang/String;Lkf;I)V", + garbageValue = "-758974757" ) - public static String method48(byte[] var0, int var1, int var2) { - char[] var3 = new char[var2]; - int var4 = 0; - int var5 = var1; + void method59(String var1, Buffer var2) { + var2.writeStringCp1252NullTerminated(var1); // L: 38 + } // L: 39 - int var8; - for (int var6 = var2 + var1; var5 < var6; var3[var4++] = (char)var8) { - int var7 = var0[var5++] & 255; - if (var7 < 128) { - if (var7 == 0) { - var8 = 65533; - } else { - var8 = var7; - } - } else if (var7 < 192) { - var8 = 65533; - } else if (var7 < 224) { - if (var5 < var6 && (var0[var5] & 192) == 128) { - var8 = (var7 & 31) << 6 | var0[var5++] & 63; - if (var8 < 128) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 240) { - if (var5 + 1 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128) { - var8 = (var7 & 15) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 < 2048) { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else if (var7 < 248) { - if (var5 + 2 < var6 && (var0[var5] & 192) == 128 && (var0[var5 + 1] & 192) == 128 && (var0[var5 + 2] & 192) == 128) { - var8 = (var7 & 7) << 18 | (var0[var5++] & 63) << 12 | (var0[var5++] & 63) << 6 | var0[var5++] & 63; - if (var8 >= 65536 && var8 <= 1114111) { - var8 = 65533; - } else { - var8 = 65533; - } - } else { - var8 = 65533; - } - } else { - var8 = 65533; + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(Lic;I)V", + garbageValue = "-1502572430" + ) + public static void method73(AbstractArchive var0) { + InvDefinition.InvDefinition_archive = var0; // L: 17 + } // L: 18 + + @ObfuscatedName("iw") + @ObfuscatedSignature( + descriptor = "([Lhq;Lhq;ZB)V", + garbageValue = "73" + ) + @Export("revalidateWidgetScroll") + static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) { + int var3 = var1.scrollWidth != 0 ? var1.scrollWidth * -1105005447 * -1556531767 : var1.width * 1613274363 * 1200164403; // L: 9211 + int var4 = var1.scrollHeight != 0 ? var1.scrollHeight * 1626628049 * 298473777 : var1.height * 1137118319 * 1991496335; // L: 9212 + KeyHandler.resizeInterface(var0, var1.id, var3, var4, var2); // L: 9213 + if (var1.children != null) { // L: 9214 + KeyHandler.resizeInterface(var1.children, var1.id, var3, var4, var2); + } + + InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id); // L: 9215 + if (var5 != null) { // L: 9216 + int var6 = var5.group; // L: 9217 + if (WorldMapSprite.loadInterface(var6)) { // L: 9219 + KeyHandler.resizeInterface(Widget.Widget_interfaceComponents[var6], -1, var3, var4, var2); // L: 9220 } } - return new String(var3, 0, var4); - } + if (var1.contentType == 1337) { // L: 9223 + } - @ObfuscatedName("o") + } // L: 9224 + + @ObfuscatedName("ja") @ObfuscatedSignature( - descriptor = "(IB)Lie;", - garbageValue = "0" + descriptor = "(Lhq;I)Z", + garbageValue = "1437525598" ) - @Export("SpotAnimationDefinition_get") - public static SpotAnimationDefinition SpotAnimationDefinition_get(int var0) { - SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); - if (var1 != null) { - return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(IIII)Lcs;", - garbageValue = "-1977243752" - ) - @Export("getWorldMapScript") - static Script getWorldMapScript(int var0, int var1, int var2) { - int var3 = ViewportMouse.method3091(var1, var0); - Script var4 = VerticalAlignment.method4517(var3, var0); - if (var4 != null) { - return var4; - } else { - int var5 = (var2 + 40000 << 8) + var0; - var4 = VerticalAlignment.method4517(var5, var0); - return var4 != null ? var4 : null; - } - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "([Ljava/lang/String;[SIIB)V", - garbageValue = "-1" - ) - @Export("sortItemsByName") - static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { - if (var2 < var3) { - int var4 = (var3 + var2) / 2; - int var5 = var2; - String var6 = var0[var4]; - var0[var4] = var0[var3]; - var0[var3] = var6; - short var7 = var1[var4]; - var1[var4] = var1[var3]; - var1[var3] = var7; - - for (int var8 = var2; var8 < var3; ++var8) { - if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { - String var9 = var0[var8]; - var0[var8] = var0[var5]; - var0[var5] = var9; - short var10 = var1[var8]; - var1[var8] = var1[var5]; - var1[var5++] = var10; - } - } - - var0[var3] = var0[var5]; - var0[var5] = var6; - var1[var3] = var1[var5]; - var1[var5] = var7; - sortItemsByName(var0, var1, var2, var5 - 1); - sortItemsByName(var0, var1, var5 + 1, var3); - } - - } - - @ObfuscatedName("q") - @ObfuscatedSignature( - descriptor = "(Ljava/io/File;ZS)Z", - garbageValue = "4093" - ) - static boolean method58(File var0, boolean var1) { - try { - RandomAccessFile var2 = new RandomAccessFile(var0, "rw"); - int var3 = var2.read(); - var2.seek(0L); - var2.write(var3); - var2.seek(0L); - var2.close(); - var0.delete(); - return true; - } catch (Exception var4) { - return false; - } - } - - @ObfuscatedName("ax") - @ObfuscatedSignature( - descriptor = "(ILcs;ZB)I", - garbageValue = "0" - ) - static int method63(int var0, Script var1, boolean var2) { - if (var0 == ScriptOpcodes.FRIEND_COUNT) { - if (ModeWhere.friendSystem.field1094 == 0) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -2; - } else if (ModeWhere.friendSystem.field1094 == 1) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ModeWhere.friendSystem.friendsList.getSize(); - } - - return 1; + static final boolean method60(Widget var0) { + int var1 = var0.contentType; // L: 10523 + if (var1 == 205) { // L: 10524 + Client.logoutTimer = 250; // L: 10525 + return true; // L: 10526 } else { + int var2; int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ModeWhere.friendSystem.method1923() && var3 >= 0 && var3 < ModeWhere.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)ModeWhere.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } + if (var1 >= 300 && var1 <= 313) { // L: 10528 + var2 = (var1 - 300) / 2; // L: 10529 + var3 = var1 & 1; // L: 10530 + Client.playerAppearance.changeAppearance(var2, var3 == 1); // L: 10531 + } - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ModeWhere.friendSystem.method1923() && var3 >= 0 && var3 < ModeWhere.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ((Buddy)ModeWhere.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } + if (var1 >= 314 && var1 <= 323) { // L: 10533 + var2 = (var1 - 314) / 2; // L: 10534 + var3 = var1 & 1; // L: 10535 + Client.playerAppearance.method4102(var2, var3 == 1); // L: 10536 + } - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ModeWhere.friendSystem.method1923() && var3 >= 0 && var3 < ModeWhere.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ((Buddy)ModeWhere.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } + if (var1 == 324) { + Client.playerAppearance.changeSex(false); // L: 10538 + } - return 1; + if (var1 == 325) { // L: 10539 + Client.playerAppearance.changeSex(true); + } + + if (var1 == 326) { // L: 10540 + PacketBufferNode var4 = Client.getPacketBufferNode(ClientPacket.field2307, Client.packetWriter.isaacCipher); // L: 10542 + Client.playerAppearance.write(var4.packetBuffer); // L: 10543 + Client.packetWriter.addNode(var4); // L: 10544 + return true; // L: 10545 } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - class52.method873(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - ModeWhere.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - ModeWhere.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - ModeWhere.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - ModeWhere.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - var5 = BuddyRankComparator.method3556(var5); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ModeWhere.friendSystem.isFriended(new Username(var5, class195.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (ClientPreferences.clanChat != null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ClientPreferences.clanChat.name; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (ClientPreferences.clanChat != null) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClientPreferences.clanChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize()) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ClientPreferences.clanChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ((Buddy)ClientPreferences.clanChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ((Buddy)ClientPreferences.clanChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClientPreferences.clanChat != null ? ClientPreferences.clanChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - class9.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ClientPreferences.clanChat != null ? ClientPreferences.clanChat.rank * -1947222095 * 2143365457 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - Canvas.Clan_joinChat(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - GrandExchangeOffer.Clan_leaveChat(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!ModeWhere.friendSystem.method1923()) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ModeWhere.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ModeWhere.friendSystem.method1923() && var3 >= 0 && var3 < ModeWhere.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)ModeWhere.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--WorldMapEvent.Interpreter_stringStackSize]; - var5 = BuddyRankComparator.method3556(var5); - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = ModeWhere.friendSystem.isIgnored(new Username(var5, class195.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize() && ClientPreferences.clanChat.get(var3).getUsername().equals(class60.localPlayer.username)) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (ClientPreferences.clanChat != null && ClientPreferences.clanChat.owner != null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ClientPreferences.clanChat.owner; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize() && ((ClanMate)ClientPreferences.clanChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - ModeWhere.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - ModeWhere.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - ModeWhere.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - ModeWhere.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - ModeWhere.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize] == 1; - if (ClientPreferences.clanChat != null) { - ClientPreferences.clanChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - if (ClientPreferences.clanChat != null && var3 < ClientPreferences.clanChat.getSize() && ((ClanMate)ClientPreferences.clanChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } + return false; // L: 10547 } } } - - @ObfuscatedName("jq") - @ObfuscatedSignature( - descriptor = "(Lhd;I)V", - garbageValue = "1118535641" - ) - static final void method57(Widget var0) { - int var1 = var0.contentType; - if (var1 == 324) { - if (Client.field868 == -1) { - Client.field868 = var0.spriteId2; - Client.field938 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field868; - } else { - var0.spriteId2 = Client.field938; - } - - } else if (var1 == 325) { - if (Client.field868 == -1) { - Client.field868 = var0.spriteId2; - Client.field938 = var0.spriteId; - } - - if (Client.playerAppearance.isFemale) { - var0.spriteId2 = Client.field938; - } else { - var0.spriteId2 = Client.field868; - } - - } else if (var1 == 327) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 0; - } else if (var1 == 328) { - var0.modelAngleX = 150; - var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; - var0.modelType = 5; - var0.modelId = 1; - } - } } diff --git a/runescape-client/src/main/java/class41.java b/runescape-client/src/main/java/class41.java index ae3c7cf34f..a4137af3b9 100644 --- a/runescape-client/src/main/java/class41.java +++ b/runescape-client/src/main/java/class41.java @@ -1,507 +1,162 @@ -import java.io.IOException; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ac") +@ObfuscatedName("ax") public class class41 { - @ObfuscatedName("gm") - @Export("regions") - static int[] regions; - @ObfuscatedName("ge") - @ObfuscatedGetter( - intValue = -2009129273 + @ObfuscatedName("jc") + @ObfuscatedSignature( + descriptor = "Ldt;" ) - static int field302; + @Export("textureProvider") + static TextureProvider textureProvider; - @ObfuscatedName("m") + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "(I)[Lis;", + garbageValue = "306746421" + ) + public static StudioGame[] method624() { + return new StudioGame[]{StudioGame.game4, StudioGame.game3, StudioGame.oldscape, StudioGame.stellardawn, StudioGame.game5, StudioGame.runescape}; // L: 17 + } + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(IILgk;Lft;B)Z", + garbageValue = "68" + ) + static final boolean method619(int var0, int var1, RouteStrategy var2, CollisionMap var3) { + int var4 = var0; // L: 190 + int var5 = var1; // L: 191 + byte var6 = 64; // L: 192 + byte var7 = 64; // L: 193 + int var8 = var0 - var6; // L: 194 + int var9 = var1 - var7; // L: 195 + class182.directions[var6][var7] = 99; // L: 196 + class182.distances[var6][var7] = 0; // L: 197 + byte var10 = 0; // L: 198 + int var11 = 0; // L: 199 + class182.bufferX[var10] = var0; // L: 200 + byte var10001 = var10; + int var18 = var10 + 1; + class182.bufferY[var10001] = var1; // L: 201 + int[][] var12 = var3.flags; // L: 202 + + while (var18 != var11) { // L: 203 + var4 = class182.bufferX[var11]; // L: 204 + var5 = class182.bufferY[var11]; // L: 205 + var11 = var11 + 1 & 4095; // L: 206 + int var16 = var4 - var8; // L: 207 + int var17 = var5 - var9; // L: 208 + int var13 = var4 - var3.xInset; // L: 209 + int var14 = var5 - var3.yInset; // L: 210 + if (var2.hasArrived(2, var4, var5, var3)) { // L: 211 + class182.field2135 = var4; // L: 212 + class182.field2136 = var5; // L: 213 + return true; // L: 214 + } + + int var15 = class182.distances[var16][var17] + 1; // L: 216 + if (var16 > 0 && class182.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) { // L: 217 218 219 220 + class182.bufferX[var18] = var4 - 1; // L: 221 + class182.bufferY[var18] = var5; // L: 222 + var18 = var18 + 1 & 4095; // L: 223 + class182.directions[var16 - 1][var17] = 2; // L: 224 + class182.distances[var16 - 1][var17] = var15; // L: 225 + } + + if (var16 < 126 && class182.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) { // L: 227 228 229 230 + class182.bufferX[var18] = var4 + 1; // L: 231 + class182.bufferY[var18] = var5; // L: 232 + var18 = var18 + 1 & 4095; // L: 233 + class182.directions[var16 + 1][var17] = 8; // L: 234 + class182.distances[var16 + 1][var17] = var15; // L: 235 + } + + if (var17 > 0 && class182.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) { // L: 237 238 239 240 + class182.bufferX[var18] = var4; // L: 241 + class182.bufferY[var18] = var5 - 1; // L: 242 + var18 = var18 + 1 & 4095; // L: 243 + class182.directions[var16][var17 - 1] = 1; // L: 244 + class182.distances[var16][var17 - 1] = var15; // L: 245 + } + + if (var17 < 126 && class182.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) { // L: 247 248 249 250 + class182.bufferX[var18] = var4; // L: 251 + class182.bufferY[var18] = var5 + 1; // L: 252 + var18 = var18 + 1 & 4095; // L: 253 + class182.directions[var16][var17 + 1] = 4; // L: 254 + class182.distances[var16][var17 + 1] = var15; // L: 255 + } + + if (var16 > 0 && var17 > 0 && class182.directions[var16 - 1][var17 - 1] == 0 && (var12[var13 - 1][var14] & 19136830) == 0 && (var12[var13 - 1][var14 - 1] & 19136782) == 0 && (var12[var13][var14 - 1] & 19136911) == 0) { // L: 257 258 259 260 261 + class182.bufferX[var18] = var4 - 1; // L: 262 + class182.bufferY[var18] = var5 - 1; // L: 263 + var18 = var18 + 1 & 4095; // L: 264 + class182.directions[var16 - 1][var17 - 1] = 3; // L: 265 + class182.distances[var16 - 1][var17 - 1] = var15; // L: 266 + } + + if (var16 < 126 && var17 > 0 && class182.directions[var16 + 1][var17 - 1] == 0 && (var12[var13 + 1][var14 - 1] & 19136911) == 0 && (var12[var13 + 2][var14 - 1] & 19136899) == 0 && (var12[var13 + 2][var14] & 19136995) == 0) { // L: 268 269 270 271 272 + class182.bufferX[var18] = var4 + 1; // L: 273 + class182.bufferY[var18] = var5 - 1; // L: 274 + var18 = var18 + 1 & 4095; // L: 275 + class182.directions[var16 + 1][var17 - 1] = 9; // L: 276 + class182.distances[var16 + 1][var17 - 1] = var15; // L: 277 + } + + if (var16 > 0 && var17 < 126 && class182.directions[var16 - 1][var17 + 1] == 0 && (var12[var13 - 1][var14 + 1] & 19136830) == 0 && (var12[var13 - 1][var14 + 2] & 19136824) == 0 && (var12[var13][var14 + 2] & 19137016) == 0) { // L: 279 280 281 282 283 + class182.bufferX[var18] = var4 - 1; // L: 284 + class182.bufferY[var18] = var5 + 1; // L: 285 + var18 = var18 + 1 & 4095; // L: 286 + class182.directions[var16 - 1][var17 + 1] = 6; // L: 287 + class182.distances[var16 - 1][var17 + 1] = var15; // L: 288 + } + + if (var16 < 126 && var17 < 126 && class182.directions[var16 + 1][var17 + 1] == 0 && (var12[var13 + 1][var14 + 2] & 19137016) == 0 && (var12[var13 + 2][var14 + 2] & 19136992) == 0 && (var12[var13 + 2][var14 + 1] & 19136995) == 0) { // L: 290 291 292 293 294 + class182.bufferX[var18] = var4 + 1; // L: 295 + class182.bufferY[var18] = var5 + 1; // L: 296 + var18 = var18 + 1 & 4095; // L: 297 + class182.directions[var16 + 1][var17 + 1] = 12; // L: 298 + class182.distances[var16 + 1][var17 + 1] = var15; // L: 299 + } + } + + class182.field2135 = var4; // L: 302 + class182.field2136 = var5; // L: 303 + return false; // L: 304 + } + + @ObfuscatedName("i") + @ObfuscatedSignature( + descriptor = "(I)I", + garbageValue = "2053521560" + ) + public static int method622() { + return KeyHandler.KeyHandler_idleCycles; // L: 174 + } + + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(ZI)V", - garbageValue = "-1502584802" + garbageValue = "-1795227808" ) - public static void method624(boolean var0) { - if (NetCache.NetCache_socket != null) { - try { - Buffer var1 = new Buffer(4); - var1.writeByte(var0 ? 2 : 3); - var1.writeMedium(0); - NetCache.NetCache_socket.write(var1.array, 0, 4); - } catch (IOException var4) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var3) { - } - - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - } - + @Export("Login_promptCredentials") + static void Login_promptCredentials(boolean var0) { + Login.Login_response1 = ""; // L: 1088 + Login.Login_response2 = "Enter your username/email & password."; // L: 1089 + Login.Login_response3 = ""; // L: 1090 + Login.loginIndex = 2; // L: 1091 + if (var0) { // L: 1092 + Login.Login_password = ""; } - } - @ObfuscatedName("u") - @ObfuscatedSignature( - descriptor = "(IIIIIILem;Lfz;I)V", - garbageValue = "-1774275667" - ) - static final void method623(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) { - if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) { - if (var0 < Tiles.Tiles_minPlane) { - Tiles.Tiles_minPlane = var0; - } - - ObjectDefinition var8 = Canvas.getObjectDefinition(var3); - int var9; - int var10; - if (var4 != 1 && var4 != 3) { - var9 = var8.sizeX; - var10 = var8.sizeY; - } else { - var9 = var8.sizeY; - var10 = var8.sizeX; - } - - int var11; - int var12; - if (var9 + var1 <= 104) { - var11 = (var9 >> 1) + var1; - var12 = (var9 + 1 >> 1) + var1; - } else { - var11 = var1; - var12 = var1 + 1; - } - - int var13; - int var14; - if (var10 + var2 <= 104) { - var13 = (var10 >> 1) + var2; - var14 = var2 + (var10 + 1 >> 1); - } else { - var13 = var2; - var14 = var2 + 1; - } - - int[][] var15 = Tiles.Tiles_heights[var0]; - int var16 = var15[var11][var14] + var15[var12][var13] + var15[var11][var13] + var15[var12][var14] >> 2; - int var17 = (var1 << 7) + (var9 << 6); - int var18 = (var2 << 7) + (var10 << 6); - long var19 = class206.calculateTag(var1, var2, 2, var8.int1 == 0, var3); - int var21 = var5 + (var4 << 6); - if (var8.int3 == 1) { - var21 += 256; - } - - if (var8.hasSound()) { - class195.method3747(var0, var1, var2, var8, var4); - } - - Object var22; - if (var5 == 22) { - if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(22, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var22, var19, var21); - if (var8.interactType == 1 && var7 != null) { - var7.setBlockedByFloorDec(var1, var2); - } - - } - } else { - int var23; - if (var5 != 10 && var5 != 11) { - int[] var10000; - if (var5 >= 12) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method3356(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21); - if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[var2] |= 2340; - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } else if (var5 == 0) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(0, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field527[var4], 0, var19, var21); - if (var4 == 0) { - if (var8.clipped) { - class171.field2036[var0][var1][var2] = 50; - class171.field2036[var0][var1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[var2] |= 585; - } - } else if (var4 == 1) { - if (var8.clipped) { - class171.field2036[var0][var1][var2 + 1] = 50; - class171.field2036[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[1 + var2] |= 1170; - } - } else if (var4 == 2) { - if (var8.clipped) { - class171.field2036[var0][var1 + 1][var2] = 50; - class171.field2036[var0][var1 + 1][var2 + 1] = 50; - } - - if (var8.modelClipped) { - var10000 = HealthBarUpdate.field1031[var0][var1 + 1]; - var10000[var2] |= 585; - } - } else if (var4 == 3) { - if (var8.clipped) { - class171.field2036[var0][var1][var2] = 50; - class171.field2036[var0][var1 + 1][var2] = 50; - } - - if (var8.modelClipped) { - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[var2] |= 1170; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3680(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3208(var0, var1, var2, var8.int2); - } - - } else if (var5 == 1) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(1, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field528[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - class171.field2036[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - class171.field2036[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - class171.field2036[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - class171.field2036[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3680(var1, var2, var5, var4, var8.boolean1); - } - - } else { - int var28; - if (var5 == 2) { - var28 = var4 + 1 & 3; - Object var29; - Object var30; - if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); - var30 = var8.getEntity(2, var28, var15, var17, var16, var18); - } else { - var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.field527[var4], Tiles.field527[var28], var19, var21); - if (var8.modelClipped) { - if (var4 == 0) { - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[var2] |= 585; - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[1 + var2] |= 1170; - } else if (var4 == 1) { - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[var2 + 1] |= 1170; - var10000 = HealthBarUpdate.field1031[var0][var1 + 1]; - var10000[var2] |= 585; - } else if (var4 == 2) { - var10000 = HealthBarUpdate.field1031[var0][var1 + 1]; - var10000[var2] |= 585; - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[var2] |= 1170; - } else if (var4 == 3) { - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[var2] |= 1170; - var10000 = HealthBarUpdate.field1031[var0][var1]; - var10000[var2] |= 585; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3680(var1, var2, var5, var4, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3208(var0, var1, var2, var8.int2); - } - - } else if (var5 == 3) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(3, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field528[var4], 0, var19, var21); - if (var8.clipped) { - if (var4 == 0) { - class171.field2036[var0][var1][var2 + 1] = 50; - } else if (var4 == 1) { - class171.field2036[var0][var1 + 1][var2 + 1] = 50; - } else if (var4 == 2) { - class171.field2036[var0][var1 + 1][var2] = 50; - } else if (var4 == 3) { - class171.field2036[var0][var1][var2] = 50; - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.method3680(var1, var2, var5, var4, var8.boolean1); - } - - } else if (var5 == 9) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(var5, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.method3356(var0, var1, var2, var16, 1, 1, (Entity)var22, 0, var19, var21); - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - if (var8.int2 != 16) { - var6.method3208(var0, var1, var2, var8.int2); - } - - } else if (var5 == 4) { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, Tiles.field527[var4], 0, 0, 0, var19, var21); - } else { - long var31; - Object var33; - if (var5 == 5) { - var28 = 16; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var31 != 0L) { - var28 = Canvas.getObjectDefinition(Language.Entity_unpackID(var31)).int2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, var4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.field527[var4], 0, var28 * Tiles.field523[var4], var28 * Tiles.field529[var4], var19, var21); - } else if (var5 == 6) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (var31 != 0L) { - var28 = Canvas.getObjectDefinition(Language.Entity_unpackID(var31)).int2 / 2; - } - - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.field531[var4], var28 * Tiles.field533[var4], var19, var21); - } else if (var5 == 7) { - var23 = var4 + 2 & 3; - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var22, (Entity)null, 256, var23, 0, 0, var19, var21); - } else if (var5 == 8) { - var28 = 8; - var31 = var6.getBoundaryObjectTag(var0, var1, var2); - if (0L != var31) { - var28 = Canvas.getObjectDefinition(Language.Entity_unpackID(var31)).int2 / 2; - } - - int var27 = var4 + 2 & 3; - Object var26; - if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); - var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); - } else { - var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.field531[var4], var28 * Tiles.field533[var4], var19, var21); - } - } - } - } else { - if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.getEntity(10, var4, var15, var17, var16, var18); - } else { - var22 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null); - } - - if (var22 != null && var6.method3356(var0, var1, var2, var16, var9, var10, (Entity)var22, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { - var23 = 15; - if (var22 instanceof Model) { - var23 = ((Model)var22).method2999() / 4; - if (var23 > 30) { - var23 = 30; - } - } - - for (int var24 = 0; var24 <= var9; ++var24) { - for (int var25 = 0; var25 <= var10; ++var25) { - if (var23 > class171.field2036[var0][var24 + var1][var25 + var2]) { - class171.field2036[var0][var24 + var1][var25 + var2] = (byte)var23; - } - } - } - } - - if (var8.interactType != 0 && var7 != null) { - var7.addGameObject(var1, var2, var9, var10, var8.boolean1); - } - - } - } - } - } - - @ObfuscatedName("hl") - @ObfuscatedSignature( - descriptor = "(III)V", - garbageValue = "1829350132" - ) - @Export("updateItemPile") - static final void updateItemPile(int var0, int var1) { - NodeDeque var2 = Client.groundItems[TileItemPile.Client_plane][var0][var1]; - if (var2 == null) { - UserComparator3.scene.removeGroundItemPile(TileItemPile.Client_plane, var0, var1); + ScriptFrame.method1192(); // L: 1093 + if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) { // L: 1095 + Login.currentLoginField = 1; // L: 1096 } else { - long var3 = -99999999L; - TileItem var5 = null; - - TileItem var6; - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - ItemDefinition var7 = KitDefinition.ItemDefinition_get(var6.id); - long var8 = (long)var7.price; - if (var7.isStackable == 1) { - var8 *= (long)(var6.quantity + 1); - } - - if (var8 > var3) { - var3 = var8; - var5 = var6; - } - } - - if (var5 == null) { - UserComparator3.scene.removeGroundItemPile(TileItemPile.Client_plane, var0, var1); - } else { - var2.addLast(var5); - TileItem var12 = null; - TileItem var11 = null; - - for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { - if (var6.id != var5.id) { - if (var12 == null) { - var12 = var6; - } - - if (var6.id != var12.id && var11 == null) { - var11 = var6; - } - } - } - - long var9 = class206.calculateTag(var0, var1, 3, false, 0); - UserComparator3.scene.newGroundItemPile(TileItemPile.Client_plane, var0, var1, Language.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, TileItemPile.Client_plane), var5, var9, var12, var11); - } - } - } - - @ObfuscatedName("jj") - @ObfuscatedSignature( - descriptor = "(Lbz;ZI)V", - garbageValue = "1167867750" - ) - @Export("closeInterface") - static final void closeInterface(InterfaceParent var0, boolean var1) { - int var2 = var0.group; - int var3 = (int)var0.key; - var0.remove(); - if (var1) { - Tiles.method1200(var2); + Login.currentLoginField = 0; // L: 1099 } - PlayerAppearance.method4177(var2); - Widget var4 = WorldMapSprite.getWidget(var3); - if (var4 != null) { - class234.invalidateWidget(var4); - } - - for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) { - int var7 = Client.menuOpcodes[var5]; - boolean var6 = var7 == 57 || var7 == 58 || var7 == 1007 || var7 == 25 || var7 == 30; - if (var6) { - if (var5 < Client.menuOptionsCount - 1) { - for (int var8 = var5; var8 < Client.menuOptionsCount - 1; ++var8) { - Client.menuActions[var8] = Client.menuActions[var8 + 1]; - Client.menuTargets[var8] = Client.menuTargets[var8 + 1]; - Client.menuOpcodes[var8] = Client.menuOpcodes[var8 + 1]; - Client.menuIdentifiers[var8] = Client.menuIdentifiers[var8 + 1]; - Client.menuArguments1[var8] = Client.menuArguments1[var8 + 1]; - Client.menuArguments2[var8] = Client.menuArguments2[var8 + 1]; - Client.menuShiftClick[var8] = Client.menuShiftClick[var8 + 1]; - } - } - - --var5; - --Client.menuOptionsCount; - } - } - - WorldMapEvent.method840(class69.menuWidth / 2 + WorldMapRectangle.menuX, Frames.menuY); - if (Client.rootInterface != -1) { - Language.runIntfCloseListeners(Client.rootInterface, 1); - } - - } + } // L: 1102 } diff --git a/runescape-client/src/main/java/class5.java b/runescape-client/src/main/java/class5.java index 07d97c2899..274ad4c214 100644 --- a/runescape-client/src/main/java/class5.java +++ b/runescape-client/src/main/java/class5.java @@ -1,30 +1,33 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("g") +@ObfuscatedName("o") public class class5 implements class12 { - @ObfuscatedName("m") + class5() { + } // L: 8 + + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lkn;)Lkn;" + descriptor = "(Lkf;)Lkf;" ) - public Buffer vmethod133(Buffer var1) { - Buffer var2 = new Buffer(100); - this.method65(var1, var2); - return var2; + public Buffer vmethod127(Buffer var1) { + Buffer var2 = new Buffer(100); // L: 11 + this.method78(var1, var2); // L: 12 + return var2; // L: 13 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "(Lkn;Lkn;)V" + descriptor = "(Lkf;Lkf;)V" ) - void method65(Buffer var1, Buffer var2) { - class10 var3 = new class10(var1); - class6 var4 = new class6(var3); + void method78(Buffer var1, Buffer var2) { + class10 var3 = new class10(var1); // L: 17 + class6 var4 = new class6(var3); // L: 18 long var5; - for (var5 = 0L; !var4.method83(var3.method123(), var3.method126(), var5); ++var5) { + for (var5 = 0L; !var4.method80(var3.method125(), var3.method126(), var5); ++var5) { // L: 19 20 21 } - var2.writeLong(var5); - } + var2.writeLong(var5); // L: 23 + } // L: 24 } diff --git a/runescape-client/src/main/java/class52.java b/runescape-client/src/main/java/class52.java index 38d4a1c0a6..dd64858936 100644 --- a/runescape-client/src/main/java/class52.java +++ b/runescape-client/src/main/java/class52.java @@ -3,41 +3,24 @@ import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bk") +@ObfuscatedName("bl") public final class class52 { - @ObfuscatedName("i") + @ObfuscatedName("gk") @ObfuscatedGetter( - intValue = 465278289 + intValue = 1416486083 ) - @Export("canvasHeight") - public static int canvasHeight; - @ObfuscatedName("gn") - @Export("regionLandArchiveIds") - static int[] regionLandArchiveIds; + static int field396; - @ObfuscatedName("t") + @ObfuscatedName("jm") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;II)V", - garbageValue = "-794896402" + descriptor = "(Lhq;I)V", + garbageValue = "2097597667" ) - static final void method873(String var0, int var1) { - PacketBufferNode var2 = UserComparator4.getPacketBufferNode(ClientPacket.field2329, Client.packetWriter.isaacCipher); - var2.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var0) + 1); - var2.packetBuffer.writeStringCp1252NullTerminated(var0); - var2.packetBuffer.method5744(var1); - Client.packetWriter.addNode(var2); - } + @Export("invalidateWidget") + static void invalidateWidget(Widget var0) { + if (var0.cycle == Client.field881) { // L: 10259 + Client.field882[var0.rootIndex] = true; // L: 10260 + } - @ObfuscatedName("hq") - @ObfuscatedSignature( - descriptor = "(III)Lga;", - garbageValue = "-136372501" - ) - static RouteStrategy method877(int var0, int var1) { - Client.field905.approxDestinationX = var0; - Client.field905.approxDestinationY = var1; - Client.field905.approxDestinationSizeX = 1; - Client.field905.approxDestinationSizeY = 1; - return Client.field905; - } + } // L: 10262 } diff --git a/runescape-client/src/main/java/class56.java b/runescape-client/src/main/java/class56.java index e301c43f3f..d94bee365b 100644 --- a/runescape-client/src/main/java/class56.java +++ b/runescape-client/src/main/java/class56.java @@ -3,14 +3,14 @@ import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; import netscape.javascript.JSObject; -@ObfuscatedName("bf") +@ObfuscatedName("bh") public class class56 { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V", - garbageValue = "-1802347359" + descriptor = "(Ljava/applet/Applet;Ljava/lang/String;[Ljava/lang/Object;I)Ljava/lang/Object;", + garbageValue = "232599941" ) - public static void method919(Applet var0, String var1) throws Throwable { - JSObject.getWindow(var0).eval(var1); + public static Object method899(Applet var0, String var1, Object[] var2) throws Throwable { + return JSObject.getWindow(var0).call(var1, var2); // L: 13 } } diff --git a/runescape-client/src/main/java/class58.java b/runescape-client/src/main/java/class58.java index 13f77b7e12..ffd11c1b95 100644 --- a/runescape-client/src/main/java/class58.java +++ b/runescape-client/src/main/java/class58.java @@ -1,30 +1,277 @@ import javax.imageio.ImageIO; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bd") +@ObfuscatedName("bg") public class class58 { - @ObfuscatedName("qr") - @ObfuscatedSignature( - descriptor = "Ldt;" + @ObfuscatedName("g") + @ObfuscatedGetter( + intValue = -1766812037 ) - @Export("pcmPlayer1") - static PcmPlayer pcmPlayer1; - @ObfuscatedName("cv") - public static char field442; + @Export("gameCyclesToDo") + static int gameCyclesToDo; + @ObfuscatedName("bp") + @ObfuscatedSignature( + descriptor = "Lgn;" + ) + @Export("clientLanguage") + static Language clientLanguage; static { - ImageIO.setUseCache(false); + ImageIO.setUseCache(false); // L: 12 + } // L: 13 + + @ObfuscatedName("s") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1957401130" + ) + public static void method907() { + while (true) { + ArchiveDiskAction var0; + synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 44 + var0 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast(); // L: 45 + } // L: 46 + + if (var0 == null) { + return; // L: 47 + } + + var0.archive.load(var0.archiveDisk, (int)var0.key, var0.data, false); // L: 48 + } } - @ObfuscatedName("fj") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)I", - garbageValue = "1787909255" + descriptor = "(IIIIIII)I", + garbageValue = "1050373784" ) - @Export("getWindowedMode") - static int getWindowedMode() { - return Client.isResizable ? 2 : 1; + public static int method912(int var0, int var1, int var2, int var3, int var4, int var5) { + if ((var5 & 1) == 1) { // L: 25 + int var6 = var3; // L: 26 + var3 = var4; // L: 27 + var4 = var6; // L: 28 + } + + var2 &= 3; // L: 30 + if (var2 == 0) { // L: 31 + return var1; + } else if (var2 == 1) { // L: 32 + return 7 - var0 - (var3 - 1); + } else { + return var2 == 2 ? 7 - var1 - (var4 - 1) : var0; // L: 33 + } } + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "101066912" + ) + public static void method915(int var0) { + class206.musicPlayerStatus = 1; // L: 49 + class204.musicTrackArchive = null; // L: 50 + BuddyRankComparator.musicTrackGroupId = -1; // L: 51 + class206.musicTrackFileId = -1; // L: 52 + Tiles.musicTrackVolume = 0; // L: 53 + class206.musicTrackBoolean = false; // L: 54 + FaceNormal.pcmSampleLength = var0; // L: 55 + } // L: 56 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "1" + ) + static final void method914(int var0, int var1, int var2) { + int var3; + for (var3 = 0; var3 < 8; ++var3) { // L: 93 + for (int var4 = 0; var4 < 8; ++var4) { // L: 94 + Tiles.Tiles_heights[var0][var3 + var1][var4 + var2] = 0; + } + } + + if (var1 > 0) { // L: 96 + for (var3 = 1; var3 < 8; ++var3) { // L: 97 + Tiles.Tiles_heights[var0][var1][var3 + var2] = Tiles.Tiles_heights[var0][var1 - 1][var3 + var2]; + } + } + + if (var2 > 0) { // L: 99 + for (var3 = 1; var3 < 8; ++var3) { // L: 100 + Tiles.Tiles_heights[var0][var3 + var1][var2] = Tiles.Tiles_heights[var0][var3 + var1][var2 - 1]; + } + } + + if (var1 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2] != 0) { // L: 102 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2]; + } else if (var2 > 0 && Tiles.Tiles_heights[var0][var1][var2 - 1] != 0) { // L: 103 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1][var2 - 1]; + } else if (var1 > 0 && var2 > 0 && Tiles.Tiles_heights[var0][var1 - 1][var2 - 1] != 0) { // L: 104 + Tiles.Tiles_heights[var0][var1][var2] = Tiles.Tiles_heights[var0][var1 - 1][var2 - 1]; + } + + } // L: 105 + + @ObfuscatedName("t") + @ObfuscatedSignature( + descriptor = "(CLgn;I)I", + garbageValue = "65536" + ) + @Export("lowercaseChar") + static int lowercaseChar(char var0, Language var1) { + int var2 = var0 << 4; // L: 128 + if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) { // L: 129 + var0 = Character.toLowerCase(var0); // L: 130 + var2 = (var0 << 4) + 1; // L: 131 + } + + if (var0 == 241 && var1 == Language.Language_ES) { // L: 133 + var2 = 1762; + } + + return var2; // L: 134 + } + + @ObfuscatedName("el") + @ObfuscatedSignature( + descriptor = "(IB)V", + garbageValue = "50" + ) + @Export("getLoginError") + static void getLoginError(int var0) { + if (var0 == -3) { // L: 2419 + UrlRequester.setLoginResponseString("Connection timed out.", "Please try using a different world.", ""); + } else if (var0 == -2) { // L: 2420 + UrlRequester.setLoginResponseString("Error connecting to server.", "Please try using a different world.", ""); + } else if (var0 == -1) { // L: 2421 + UrlRequester.setLoginResponseString("No response from server.", "Please try using a different world.", ""); + } else if (var0 == 3) { // L: 2422 + Login.loginIndex = 3; // L: 2423 + Login.field1213 = 1; // L: 2424 + } else if (var0 == 4) { // L: 2426 + class89.method2130(0); // L: 2427 + } else if (var0 == 5) { // L: 2429 + Login.field1213 = 2; // L: 2430 + UrlRequester.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 2431 + } else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2433 + if (var0 == 7) { // L: 2436 + UrlRequester.setLoginResponseString("This world is full.", "Please use a different world.", ""); + } else if (var0 == 8) { // L: 2437 + UrlRequester.setLoginResponseString("Unable to connect.", "Login server offline.", ""); + } else if (var0 == 9) { // L: 2438 + UrlRequester.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", ""); + } else if (var0 == 10) { // L: 2439 + UrlRequester.setLoginResponseString("Unable to connect.", "Bad session id.", ""); + } else if (var0 == 11) { // L: 2440 + UrlRequester.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", ""); + } else if (var0 == 12) { // L: 2441 + UrlRequester.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", ""); + } else if (var0 == 13) { // L: 2442 + UrlRequester.setLoginResponseString("Could not complete login.", "Please try using a different world.", ""); + } else if (var0 == 14) { // L: 2443 + UrlRequester.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 16) { // L: 2444 + UrlRequester.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", ""); + } else if (var0 == 17) { // L: 2445 + UrlRequester.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", ""); + } else if (var0 == 18) { // L: 2446 + Login.loginIndex = 12; // L: 2448 + Login.field1210 = 1; // L: 2449 + } else if (var0 == 19) { // L: 2452 + UrlRequester.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world."); + } else if (var0 == 20) { // L: 2453 + UrlRequester.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", ""); + } else if (var0 == 22) { // L: 2454 + UrlRequester.setLoginResponseString("Malformed login packet.", "Please try again.", ""); + } else if (var0 == 23) { // L: 2455 + UrlRequester.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", ""); + } else if (var0 == 24) { // L: 2456 + UrlRequester.setLoginResponseString("Error loading your profile.", "Please contact customer support.", ""); + } else if (var0 == 25) { // L: 2457 + UrlRequester.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", ""); + } else if (var0 == 26) { // L: 2458 + UrlRequester.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", ""); + } else if (var0 == 27) { // L: 2459 + UrlRequester.setLoginResponseString("", "Service unavailable.", ""); + } else if (var0 == 31) { // L: 2460 + UrlRequester.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game."); + } else if (var0 == 32) { + UrlRequester.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2461 + } else if (var0 == 37) { // L: 2462 + UrlRequester.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", ""); + } else if (var0 == 38) { // L: 2463 + UrlRequester.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!"); + } else if (var0 == 55) { // L: 2464 + Login.loginIndex = 8; // L: 2465 + } else { + if (var0 == 56) { // L: 2467 + UrlRequester.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2468 + CollisionMap.updateGameState(11); // L: 2469 + return; // L: 2470 + } + + if (var0 == 57) { // L: 2472 + UrlRequester.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2473 + CollisionMap.updateGameState(11); // L: 2474 + return; // L: 2475 + } + + if (var0 == 61) { // L: 2477 + Login.loginIndex = 7; // L: 2478 + } else { + UrlRequester.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2480 + } + } + } else { + UrlRequester.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2434 + } + + CollisionMap.updateGameState(10); // L: 2481 + } // L: 2482 + + @ObfuscatedName("ji") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "-693784957" + ) + static final void method913(int var0) { + if (WorldMapSprite.loadInterface(var0)) { // L: 10297 + Projectile.drawModelComponents(Widget.Widget_interfaceComponents[var0], -1); // L: 10298 + } + } // L: 10299 + + @ObfuscatedName("jr") + @ObfuscatedSignature( + descriptor = "(Lbq;ZI)V", + garbageValue = "-1212325817" + ) + @Export("closeInterface") + static final void closeInterface(InterfaceParent var0, boolean var1) { + int var2 = var0.group; // L: 10505 + int var3 = (int)var0.key; // L: 10506 + var0.remove(); // L: 10507 + if (var1) { // L: 10508 + SecureRandomFuture.method2225(var2); + } + + for (IntegerNode var4 = (IntegerNode)Client.widgetFlags.first(); var4 != null; var4 = (IntegerNode)Client.widgetFlags.next()) { // L: 10510 + if ((long)var2 == (var4.key >> 48 & 65535L)) { // L: 10511 + var4.remove(); // L: 10512 + } + } + + Widget var5 = TileItem.getWidget(var3); // L: 10516 + if (var5 != null) { // L: 10517 + class52.invalidateWidget(var5); + } + + class2.method24(); // L: 10518 + if (Client.rootInterface != -1) { // L: 10519 + ClientPacket.runIntfCloseListeners(Client.rootInterface, 1); + } + + } // L: 10520 } diff --git a/runescape-client/src/main/java/class6.java b/runescape-client/src/main/java/class6.java index 49bd92fb81..6715ee791f 100644 --- a/runescape-client/src/main/java/class6.java +++ b/runescape-client/src/main/java/class6.java @@ -4,77 +4,77 @@ import java.security.NoSuchAlgorithmException; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("n") +@ObfuscatedName("x") public class class6 implements class11 { - @ObfuscatedName("m") - final MessageDigest field24; + @ObfuscatedName("z") + final MessageDigest field32; @ObfuscatedSignature( - descriptor = "(Lw;)V" + descriptor = "(Ln;)V" ) class6(class10 var1) { - this.field24 = this.method77(); + this.field32 = this.method95(); // L: 14 + } // L: 15 + + @ObfuscatedName("z") + boolean method80(int var1, String var2, long var3) { + byte[] var5 = this.method83(var2, var3); // L: 18 + return method84(var5) >= var1; // L: 19 } - @ObfuscatedName("m") - boolean method83(int var1, String var2, long var3) { - byte[] var5 = this.method76(var2, var3); - return method74(var5) >= var1; - } - - @ObfuscatedName("j") - byte[] method76(String var1, long var2) { - StringBuilder var4 = new StringBuilder(); - var4.append(var1).append(Long.toHexString(var2)); - this.field24.reset(); + @ObfuscatedName("t") + byte[] method83(String var1, long var2) { + StringBuilder var4 = new StringBuilder(); // L: 56 + var4.append(var1).append(Long.toHexString(var2)); // L: 57 + this.field32.reset(); // L: 58 try { - this.field24.update(var4.toString().getBytes("UTF-8")); - } catch (UnsupportedEncodingException var6) { - var6.printStackTrace(); + this.field32.update(var4.toString().getBytes("UTF-8")); // L: 60 + } catch (UnsupportedEncodingException var6) { // L: 62 + var6.printStackTrace(); // L: 63 } - return this.field24.digest(); + return this.field32.digest(); // L: 65 } - @ObfuscatedName("p") - MessageDigest method77() { + @ObfuscatedName("i") + MessageDigest method95() { try { - return MessageDigest.getInstance("SHA-256"); - } catch (NoSuchAlgorithmException var2) { - var2.printStackTrace(); - return null; + return MessageDigest.getInstance("SHA-256"); // L: 70 + } catch (NoSuchAlgorithmException var2) { // L: 72 + var2.printStackTrace(); // L: 73 + return null; // L: 74 } } - @ObfuscatedName("o") - static int method74(byte[] var0) { - int var1 = 0; - byte[] var2 = var0; + @ObfuscatedName("k") + static int method84(byte[] var0) { + int var1 = 0; // L: 23 + byte[] var2 = var0; // L: 25 - for (int var3 = 0; var3 < var2.length; ++var3) { - byte var4 = var2[var3]; - int var5 = method75(var4); - var1 += var5; - if (var5 != 8) { + for (int var3 = 0; var3 < var2.length; ++var3) { // L: 26 + byte var4 = var2[var3]; // L: 27 + int var5 = method82(var4); // L: 29 + var1 += var5; // L: 30 + if (var5 != 8) { // L: 31 break; } } - return var1; + return var1; // L: 37 } - @ObfuscatedName("q") - static int method75(byte var0) { - int var1 = 0; - if (var0 == 0) { - var1 = 8; + @ObfuscatedName("s") + static int method82(byte var0) { + int var1 = 0; // L: 41 + if (var0 == 0) { // L: 42 + var1 = 8; // L: 43 } else { - for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { - ++var1; + for (int var2 = var0 & 255; (var2 & 128) == 0; var2 <<= 1) { // L: 46 47 49 + ++var1; // L: 48 } } - return var1; + return var1; // L: 52 } } diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java index 2efc5e6f0c..927cd02b4c 100644 --- a/runescape-client/src/main/java/class60.java +++ b/runescape-client/src/main/java/class60.java @@ -1,303 +1,142 @@ import java.applet.Applet; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bw") +@ObfuscatedName("bp") public class class60 { - @ObfuscatedName("qh") + @ObfuscatedName("sa") @ObfuscatedSignature( - descriptor = "Ldd;" + descriptor = "Lcr;" ) - @Export("pcmStreamMixer") - static PcmStreamMixer pcmStreamMixer; - @ObfuscatedName("m") + @Export("friendSystem") + public static FriendSystem friendSystem; + @ObfuscatedName("z") @Export("applet") static Applet applet; - @ObfuscatedName("o") - static String field450; - @ObfuscatedName("kf") - @ObfuscatedSignature( - descriptor = "Lby;" + @ObfuscatedName("k") + static String field451; + @ObfuscatedName("a") + static int[] field453; + @ObfuscatedName("ah") + @Export("null_string") + protected static String null_string; + @ObfuscatedName("ef") + @ObfuscatedGetter( + intValue = -1192539033 ) - @Export("localPlayer") - static Player localPlayer; + static int field456; static { - applet = null; - field450 = ""; + applet = null; // L: 10 + field451 = ""; // L: 11 } - @ObfuscatedName("o") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(Lkb;II)V", - garbageValue = "-220827004" + descriptor = "(B)Z", + garbageValue = "-14" ) - @Export("updatePlayers") - static final void updatePlayers(PacketBuffer var0, int var1) { - int var2 = var0.offset; - Players.Players_pendingUpdateCount = 0; - DynamicObject.method2373(var0); - - for (int var3 = 0; var3 < Players.Players_pendingUpdateCount; ++var3) { - int var4 = Players.Players_pendingUpdateIndices[var3]; - Player var5 = Client.players[var4]; - int var6 = var0.readUnsignedByte(); - if ((var6 & 16) != 0) { - var6 += var0.readUnsignedByte() << 8; + @Export("isKeyDown") + public static final boolean isKeyDown() { + synchronized(KeyHandler.KeyHandler_instance) { // L: 164 + if (KeyHandler.field423 == KeyHandler.field399) { // L: 165 + return false; + } else { + PlayerAppearance.field2581 = KeyHandler.field420[KeyHandler.field423]; // L: 166 + PacketWriter.field1350 = KeyHandler.field419[KeyHandler.field423]; // L: 167 + KeyHandler.field423 = KeyHandler.field423 + 1 & 127; // L: 168 + return true; // L: 169 } - - byte var7 = -1; - if ((var6 & 256) != 0) { - var7 = var0.method5750(); - } - - if ((var6 & 64) != 0) { - var5.field992 = var0.readUnsignedShort(); - if (var5.pathLength == 0) { - var5.orientation = var5.field992; - var5.field992 = -1; - } - } - - int var8; - int var9; - if ((var6 & 128) != 0) { - var8 = var0.method5757(); - if (var8 == 65535) { - var8 = -1; - } - - var9 = var0.method5748(); - SecureRandomCallable.performPlayerAnimation(var5, var8, var9); - } - - if ((var6 & 2) != 0) { - var5.overheadText = var0.readStringCp1252NullTerminated(); - if (var5.overheadText.charAt(0) == '~') { - var5.overheadText = var5.overheadText.substring(1); - ObjectSound.addGameMessage(2, var5.username.getName(), var5.overheadText); - } else if (var5 == localPlayer) { - ObjectSound.addGameMessage(2, var5.username.getName(), var5.overheadText); - } - - var5.isAutoChatting = false; - var5.overheadTextColor = 0; - var5.overheadTextEffect = 0; - var5.overheadTextCyclesRemaining = 150; - } - - if ((var6 & 512) != 0) { - var5.field995 = var0.method5750(); - var5.field1008 = var0.method5750(); - var5.field1007 = var0.method5751(); - var5.field1009 = var0.method5730(); - var5.field966 = var0.readUnsignedShort() + Client.cycle; - var5.field1011 = var0.method5755() + Client.cycle; - var5.field1006 = var0.readUnsignedShort(); - if (var5.field659) { - var5.field995 += var5.tileX; - var5.field1008 += var5.tileY; - var5.field1007 += var5.tileX; - var5.field1009 += var5.tileY; - var5.pathLength = 0; - } else { - var5.field995 += var5.pathX[0]; - var5.field1008 += var5.pathY[0]; - var5.field1007 += var5.pathX[0]; - var5.field1009 += var5.pathY[0]; - var5.pathLength = 1; - } - - var5.field1023 = 0; - } - - int var11; - int var12; - int var15; - if ((var6 & 1) != 0) { - var8 = var0.readUnsignedShort(); - PlayerType var16 = (PlayerType)FaceNormal.findEnumerated(VarbitDefinition.PlayerType_values(), var0.method5936()); - boolean var10 = var0.readUnsignedByte() == 1; - var11 = var0.method5746(); - var12 = var0.offset; - if (var5.username != null && var5.appearance != null) { - boolean var13 = false; - if (var16.isUser && ModeWhere.friendSystem.isIgnored(var5.username)) { - var13 = true; - } - - if (!var13 && Client.field787 == 0 && !var5.isHidden) { - Players.field1289.offset = 0; - var0.readBytes(Players.field1289.array, 0, var11); - Players.field1289.offset = 0; - String var14 = AbstractFont.escapeBrackets(TileItemPile.method2903(NPC.method2157(Players.field1289))); - var5.overheadText = var14.trim(); - var5.overheadTextColor = var8 >> 8; - var5.overheadTextEffect = var8 & 255; - var5.overheadTextCyclesRemaining = 150; - var5.isAutoChatting = var10; - var5.field979 = var5 != localPlayer && var16.isUser && "" != Client.field755 && var14.toLowerCase().indexOf(Client.field755) == -1; - if (var16.isPrivileged) { - var15 = var10 ? 91 : 1; - } else { - var15 = var10 ? 90 : 2; - } - - if (var16.modIcon != -1) { - ObjectSound.addGameMessage(var15, WorldMapRegion.method611(var16.modIcon) + var5.username.getName(), var14); - } else { - ObjectSound.addGameMessage(var15, var5.username.getName(), var14); - } - } - } - - var0.offset = var12 + var11; - } - - if ((var6 & 8) != 0) { - var5.targetIndex = var0.readUnsignedShort(); - if (var5.targetIndex == 65535) { - var5.targetIndex = -1; - } - } - - if ((var6 & 4096) != 0) { - var5.spotAnimation = var0.method5757(); - var8 = var0.method5766(); - var5.field1005 = var8 >> 16; - var5.field987 = (var8 & 65535) + Client.cycle; - var5.spotAnimationFrame = 0; - var5.spotAnimationFrameCycle = 0; - if (var5.field987 > Client.cycle) { - var5.spotAnimationFrame = -1; - } - - if (var5.spotAnimation == 65535) { - var5.spotAnimation = -1; - } - } - - if ((var6 & 1024) != 0) { - for (var8 = 0; var8 < 3; ++var8) { - var5.actions[var8] = var0.readStringCp1252NullTerminated(); - } - } - - if ((var6 & 2048) != 0) { - Players.field1278[var4] = var0.method5750(); - } - - if ((var6 & 4) != 0) { - var8 = var0.method5746(); - int var18; - int var19; - int var21; - if (var8 > 0) { - for (var9 = 0; var9 < var8; ++var9) { - var11 = -1; - var12 = -1; - var21 = -1; - var19 = var0.readUShortSmart(); - if (var19 == 32767) { - var19 = var0.readUShortSmart(); - var12 = var0.readUShortSmart(); - var11 = var0.readUShortSmart(); - var21 = var0.readUShortSmart(); - } else if (var19 != 32766) { - var12 = var0.readUShortSmart(); - } else { - var19 = -1; - } - - var18 = var0.readUShortSmart(); - var5.addHitSplat(var19, var12, var11, var21, Client.cycle, var18); - } - } - - var9 = var0.readUnsignedByte(); - if (var9 > 0) { - for (var19 = 0; var19 < var9; ++var19) { - var11 = var0.readUShortSmart(); - var12 = var0.readUShortSmart(); - if (var12 != 32767) { - var21 = var0.readUShortSmart(); - var18 = var0.method5748(); - var15 = var12 > 0 ? var0.method5746() : var18; - var5.addHealthBar(var11, Client.cycle, var12, var21, var18, var15); - } else { - var5.removeHealthBar(var11); - } - } - } - } - - if ((var6 & 32) != 0) { - var8 = var0.method5748(); - byte[] var22 = new byte[var8]; - Buffer var17 = new Buffer(var22); - var0.method5821(var22, 0, var8); - Players.field1279[var4] = var17; - var5.read(var17); - } - - if (var5.field659) { - if (var7 == 127) { - var5.resetPath(var5.tileX, var5.tileY); - } else { - byte var20; - if (var7 != -1) { - var20 = var7; - } else { - var20 = Players.field1278[var4]; - } - - var5.method1300(var5.tileX, var5.tileY, var20); - } - } - } - - if (var0.offset - var2 != var1) { - throw new RuntimeException(var0.offset - var2 + " " + var1); } } - @ObfuscatedName("g") + @ObfuscatedName("m") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "76630753" + descriptor = "(IIIB)I", + garbageValue = "-34" ) - public static void method972() { - SpotAnimationDefinition.SpotAnimationDefinition_cached.clear(); - SpotAnimationDefinition.SpotAnimationDefinition_cachedModels.clear(); + static final int method947(int var0, int var1, int var2) { + int var3 = var0 / var2; // L: 825 + int var4 = var0 & var2 - 1; // L: 826 + int var5 = var1 / var2; // L: 827 + int var6 = var1 & var2 - 1; // L: 828 + int var7 = TileItem.method2206(var3, var5); // L: 829 + int var8 = TileItem.method2206(var3 + 1, var5); // L: 830 + int var9 = TileItem.method2206(var3, var5 + 1); // L: 831 + int var10 = TileItem.method2206(var3 + 1, var5 + 1); // L: 832 + int var11 = ArchiveDisk.method5991(var7, var8, var4, var2); // L: 833 + int var12 = ArchiveDisk.method5991(var9, var10, var4, var2); // L: 834 + int var14 = 65536 - Rasterizer3D.Rasterizer3D_cosine[var6 * 1024 / var2] >> 1; // L: 837 + int var13 = ((65536 - var14) * var11 >> 16) + (var14 * var12 >> 16); // L: 838 + return var13; // L: 840 } - @ObfuscatedName("jc") + @ObfuscatedName("n") @ObfuscatedSignature( - descriptor = "(Lhd;IIS)V", - garbageValue = "-5579" + descriptor = "(Lhq;IS)V", + garbageValue = "15262" ) - @Export("clickWidget") - static final void clickWidget(Widget var0, int var1, int var2) { - if (Client.clickedWidget == null && !Client.isMenuOpen) { - if (var0 != null && GrandExchangeEvent.method157(var0) != null) { - Client.clickedWidget = var0; - Widget var4 = FriendSystem.method1994(var0); - if (var4 == null) { - var4 = var0.parent; - } + @Export("Widget_setKeyIgnoreHeld") + static final void Widget_setKeyIgnoreHeld(Widget var0, int var1) { + if (var0.field2626 == null) { // L: 934 + throw new RuntimeException(); // L: 935 + } else { + if (var0.field2661 == null) { // L: 937 + var0.field2661 = new int[var0.field2626.length]; // L: 938 + } - Client.clickedWidgetParent = var4; - Client.widgetClickX = var1; - Client.widgetClickY = var2; - GrandExchangeOfferAgeComparator.widgetDragDuration = 0; - Client.isDraggingWidget = false; - int var5 = UrlRequester.method3421(); - if (var5 != -1) { - WorldMapSection1.method648(var5); - } + var0.field2661[var1] = Integer.MAX_VALUE; // L: 940 + } + } // L: 941 + @ObfuscatedName("c") + @ObfuscatedSignature( + descriptor = "(IIII)I", + garbageValue = "877979774" + ) + @Export("hslToRgb") + static final int hslToRgb(int var0, int var1, int var2) { + if (var2 > 179) { // L: 884 + var1 /= 2; + } + + if (var2 > 192) { // L: 885 + var1 /= 2; + } + + if (var2 > 217) { // L: 886 + var1 /= 2; + } + + if (var2 > 243) { // L: 887 + var1 /= 2; + } + + int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2; // L: 888 + return var3; // L: 889 + } + + @ObfuscatedName("kh") + @ObfuscatedSignature( + descriptor = "(Lkf;II)V", + garbageValue = "-1719664383" + ) + static void method937(Buffer var0, int var1) { + byte[] var2 = var0.array; // L: 10815 + if (Client.randomDatData == null) { // L: 10817 + Client.randomDatData = new byte[24]; + } + + class310.writeRandomDat(var2, var1, Client.randomDatData, 0, 24); // L: 10818 + if (JagexCache.JagexCache_randomDat != null) { // L: 10821 + try { + JagexCache.JagexCache_randomDat.seek(0L); // L: 10823 + JagexCache.JagexCache_randomDat.write(var0.array, var1, 24); // L: 10824 + } catch (Exception var4) { // L: 10826 } } - } + + } // L: 10829 } diff --git a/runescape-client/src/main/java/class69.java b/runescape-client/src/main/java/class69.java index 49cd44cf71..e0771b1a93 100644 --- a/runescape-client/src/main/java/class69.java +++ b/runescape-client/src/main/java/class69.java @@ -1,13 +1,65 @@ import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; +import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("bi") +@ObfuscatedName("bx") public class class69 { - @ObfuscatedName("lu") - @ObfuscatedGetter( - intValue = 2113683905 + @ObfuscatedName("y") + static String[] field570; + + @ObfuscatedName("z") + @ObfuscatedSignature( + descriptor = "([Ljava/lang/String;[SIII)V", + garbageValue = "928633152" ) - @Export("menuWidth") - static int menuWidth; + @Export("sortItemsByName") + public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) { + if (var2 < var3) { // L: 9 + int var4 = (var3 + var2) / 2; // L: 10 + int var5 = var2; // L: 11 + String var6 = var0[var4]; // L: 12 + var0[var4] = var0[var3]; // L: 13 + var0[var3] = var6; // L: 14 + short var7 = var1[var4]; // L: 15 + var1[var4] = var1[var3]; // L: 16 + var1[var3] = var7; // L: 17 + + for (int var8 = var2; var8 < var3; ++var8) { // L: 18 + if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) { // L: 19 + String var9 = var0[var8]; // L: 20 + var0[var8] = var0[var5]; // L: 21 + var0[var5] = var9; // L: 22 + short var10 = var1[var8]; // L: 23 + var1[var8] = var1[var5]; // L: 24 + var1[var5++] = var10; // L: 25 + } + } + + var0[var3] = var0[var5]; // L: 29 + var0[var5] = var6; // L: 30 + var1[var3] = var1[var5]; // L: 31 + var1[var5] = var7; // L: 32 + sortItemsByName(var0, var1, var2, var5 - 1); // L: 33 + sortItemsByName(var0, var1, var5 + 1, var3); // L: 34 + } + + } // L: 36 + + @ObfuscatedName("jy") + @ObfuscatedSignature( + descriptor = "(Lhq;IIII)V", + garbageValue = "1412729632" + ) + @Export("drawCompass") + static final void drawCompass(Widget var0, int var1, int var2, int var3) { + SpriteMask var4 = var0.getSpriteMask(false); // L: 10637 + if (var4 != null) { // L: 10638 + if (Client.minimapState < 3) { // L: 10639 + LoginPacket.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths); + } else { + Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths); // L: 10640 + } + + } + } // L: 10641 } diff --git a/runescape-client/src/main/java/class7.java b/runescape-client/src/main/java/class7.java index fe88bafb1c..9fca19415e 100644 --- a/runescape-client/src/main/java/class7.java +++ b/runescape-client/src/main/java/class7.java @@ -2,155 +2,82 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -import net.runelite.rs.ScriptOpcodes; -@ObfuscatedName("u") +@ObfuscatedName("w") public enum class7 implements Enumerated { - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lu;" + descriptor = "Lw;" ) - field30(0, 0); + field37(0, 0); - @ObfuscatedName("ox") + @ObfuscatedName("g") + static int[] field39; + @ObfuscatedName("be") @ObfuscatedSignature( - descriptor = "Lfv;" + descriptor = "Lls;" ) - @Export("mouseWheel") - static MouseWheel mouseWheel; - @ObfuscatedName("eb") - static int[] field28; - @ObfuscatedName("o") + static IndexedSprite field36; + @ObfuscatedName("if") @ObfuscatedGetter( - intValue = -372916347 + intValue = 1039444805 ) - public final int field26; - @ObfuscatedName("q") + static int field40; + @ObfuscatedName("k") @ObfuscatedGetter( - intValue = 546495013 + intValue = 1712649125 ) - final int field27; + final int field35; + @ObfuscatedName("s") + @ObfuscatedGetter( + intValue = 969088693 + ) + final int field38; class7(int var3, int var4) { - this.field26 = var3; - this.field27 = var4; - } + this.field35 = var3; + this.field38 = var4; // L: 13 + } // L: 14 - @ObfuscatedName("m") + @ObfuscatedName("s") @ObfuscatedSignature( descriptor = "(I)I", - garbageValue = "-995092303" + garbageValue = "385513888" ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field27; + return this.field38; // L: 17 } - @ObfuscatedName("w") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;B)V", - garbageValue = "-89" + descriptor = "(Lw;I)Lh;", + garbageValue = "1469756534" ) - static final void method95(String var0) { - StringBuilder var10000 = new StringBuilder(); - Object var10001 = null; - var10000 = var10000.append("Please remove ").append(var0); - var10001 = null; - String var1 = var10000.append(" from your ignore list first").toString(); - ObjectSound.addGameMessage(30, "", var1); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(IIS)Z", - garbageValue = "17445" - ) - static final boolean method97(int var0, int var1) { - ObjectDefinition var2 = Canvas.getObjectDefinition(var0); - if (var1 == 11) { - var1 = 10; - } - - if (var1 >= 5 && var1 <= 8) { - var1 = 4; - } - - return var2.method4786(var1); - } - - @ObfuscatedName("r") - @ObfuscatedSignature( - descriptor = "(ILcs;ZI)I", - garbageValue = "669918470" - ) - static int method100(int var0, Script var1, boolean var2) { - Widget var3 = var2 ? KeyHandler.field407 : SecureRandomCallable.field544; - if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { - Interpreter.Interpreter_intStack[++UrlRequester.Interpreter_intStackSize - 1] = WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var3)); - return 1; - } else if (var0 != ScriptOpcodes.CC_GETOP) { - if (var0 == ScriptOpcodes.CC_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { - int var4 = Interpreter.Interpreter_intStack[--UrlRequester.Interpreter_intStackSize]; - --var4; - if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = var3.actions[var4]; - } else { - Interpreter.Interpreter_stringStack[++WorldMapEvent.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + public static class12 method102(class7 var0) { + switch(var0.field35) { // L: 9 + case 0: + return new class5(); // L: 12 + default: + throw new IllegalArgumentException(); // L: 16 } } - @ObfuscatedName("gm") + @ObfuscatedName("fk") @ObfuscatedSignature( - descriptor = "(S)Z", - garbageValue = "255" + descriptor = "(IIII)V", + garbageValue = "-2096801183" ) - static boolean method98() { - return (Client.drawPlayerNames & 4) != 0; - } - - @ObfuscatedName("hv") - @ObfuscatedSignature( - descriptor = "(II)Z", - garbageValue = "-1244259463" - ) - static final boolean method94(int var0) { - if (var0 < 0) { - return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } - - return var1 == 1007; - } - } - - @ObfuscatedName("jw") - @ObfuscatedSignature( - descriptor = "(B)V", - garbageValue = "9" - ) - @Export("FriendSystem_invalidateFriends") - static final void FriendSystem_invalidateFriends() { - for (int var0 = 0; var0 < Players.Players_count; ++var0) { - Player var1 = Client.players[Players.Players_indices[var0]]; - var1.clearIsInClanChat(); + @Export("queueSoundEffect") + static void queueSoundEffect(int var0, int var1, int var2) { + if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) { // L: 3277 + Client.soundEffectIds[Client.soundEffectCount] = var0; // L: 3278 + Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1; // L: 3279 + Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2; // L: 3280 + Client.soundEffects[Client.soundEffectCount] = null; // L: 3281 + Client.soundLocations[Client.soundEffectCount] = 0; // L: 3282 + ++Client.soundEffectCount; // L: 3283 } - } + } // L: 3285 } diff --git a/runescape-client/src/main/java/class8.java b/runescape-client/src/main/java/class8.java index 2198f65ae5..84ee85e417 100644 --- a/runescape-client/src/main/java/class8.java +++ b/runescape-client/src/main/java/class8.java @@ -1,192 +1,81 @@ import java.util.concurrent.Callable; import net.runelite.mapping.Export; +import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("a") +@ObfuscatedName("g") public class class8 implements Callable { - @ObfuscatedName("fo") - @ObfuscatedSignature( - descriptor = "Llj;" + @ObfuscatedName("rf") + @ObfuscatedGetter( + intValue = 796418753 ) - static AbstractSocket field35; - @ObfuscatedName("m") + static int field43; + @ObfuscatedName("pv") + @Export("ClanChat_inClanChat") + static boolean ClanChat_inClanChat; + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkf;" ) - final Buffer field33; - @ObfuscatedName("o") + final Buffer field45; + @ObfuscatedName("k") @ObfuscatedSignature( - descriptor = "Lc;" + descriptor = "Lh;" ) - final class12 field31; + final class12 field42; // $FF: synthetic field @ObfuscatedSignature( - descriptor = "Lz;" + descriptor = "Lm;" ) final class9 this$0; @ObfuscatedSignature( - descriptor = "(Lz;Lkn;Lc;)V" + descriptor = "(Lm;Lkf;Lh;)V" ) class8(class9 var1, Buffer var2, class12 var3) { - this.this$0 = var1; - this.field33 = var2; - this.field31 = var3; - } + this.this$0 = var1; // L: 47 + this.field45 = var2; // L: 48 + this.field42 = var3; // L: 49 + } // L: 50 public Object call() { - return this.field31.vmethod133(this.field33); + return this.field42.vmethod127(this.field45); // L: 53 } - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(Lic;I)V", - garbageValue = "2132474559" + descriptor = "(I)V", + garbageValue = "-552632511" ) - public static void method103(AbstractArchive var0) { - class198.ParamDefinition_archive = var0; - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(III)I", - garbageValue = "1765213617" - ) - public static int method104(int var0, int var1) { - int var2; - for (var2 = 0; var1 > 0; --var1) { - var2 = var2 << 1 | var0 & 1; - var0 >>>= 1; - } - - return var2; - } - - @ObfuscatedName("gh") - @ObfuscatedSignature( - descriptor = "(ZLkb;I)V", - garbageValue = "-826788637" - ) - @Export("loadRegions") - static final void loadRegions(boolean var0, PacketBuffer var1) { - Client.isInInstance = var0; - int var2; - int var4; - int var5; - int var6; - int var7; - int var8; - if (!Client.isInInstance) { - var2 = var1.method5757(); - int var3 = var1.method5757(); - var4 = var1.readUnsignedShort(); - WorldMapData_1.xteaKeys = new int[var4][4]; - - for (var5 = 0; var5 < var4; ++var5) { - for (var6 = 0; var6 < 4; ++var6) { - WorldMapData_1.xteaKeys[var5][var6] = var1.readInt(); - } - } - - class41.regions = new int[var4]; - StudioGame.regionMapArchiveIds = new int[var4]; - class52.regionLandArchiveIds = new int[var4]; - class90.regionLandArchives = new byte[var4][]; - class1.regionMapArchives = new byte[var4][]; - boolean var16 = false; - if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) { - var16 = true; - } - - if (var3 / 8 == 48 && var2 / 8 == 148) { - var16 = true; - } - - var4 = 0; - - for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) { - for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) { - var8 = var7 + (var6 << 8); - if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { - class41.regions[var4] = var8; - StudioGame.regionMapArchiveIds[var4] = WorldMapRectangle.archive5.getGroupId("m" + var6 + "_" + var7); - class52.regionLandArchiveIds[var4] = WorldMapRectangle.archive5.getGroupId("l" + var6 + "_" + var7); - ++var4; - } - } - } - - TextureProvider.method2900(var3, var2, true); + static void method105() { + if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) { // L: 119 + KeyHandler.KeyHandler_keyCodes[186] = 57; // L: 120 + KeyHandler.KeyHandler_keyCodes[187] = 27; // L: 121 + KeyHandler.KeyHandler_keyCodes[188] = 71; // L: 122 + KeyHandler.KeyHandler_keyCodes[189] = 26; // L: 123 + KeyHandler.KeyHandler_keyCodes[190] = 72; // L: 124 + KeyHandler.KeyHandler_keyCodes[191] = 73; // L: 125 + KeyHandler.KeyHandler_keyCodes[192] = 58; // L: 126 + KeyHandler.KeyHandler_keyCodes[219] = 42; // L: 127 + KeyHandler.KeyHandler_keyCodes[220] = 74; // L: 128 + KeyHandler.KeyHandler_keyCodes[221] = 43; // L: 129 + KeyHandler.KeyHandler_keyCodes[222] = 59; // L: 130 + KeyHandler.KeyHandler_keyCodes[223] = 28; // L: 131 } else { - var2 = var1.method5867(); - boolean var15 = var1.readUnsignedByte() == 1; - var4 = var1.method5757(); - var5 = var1.readUnsignedShort(); - var1.importIndex(); - - int var9; - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = var1.readBits(1); - if (var9 == 1) { - Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26); - } else { - Client.instanceChunkTemplates[var6][var7][var8] = -1; - } - } - } - } - - var1.exportIndex(); - WorldMapData_1.xteaKeys = new int[var5][4]; - - for (var6 = 0; var6 < var5; ++var6) { - for (var7 = 0; var7 < 4; ++var7) { - WorldMapData_1.xteaKeys[var6][var7] = var1.readInt(); - } - } - - class41.regions = new int[var5]; - StudioGame.regionMapArchiveIds = new int[var5]; - class52.regionLandArchiveIds = new int[var5]; - class90.regionLandArchives = new byte[var5][]; - class1.regionMapArchives = new byte[var5][]; - var5 = 0; - - for (var6 = 0; var6 < 4; ++var6) { - for (var7 = 0; var7 < 13; ++var7) { - for (var8 = 0; var8 < 13; ++var8) { - var9 = Client.instanceChunkTemplates[var6][var7][var8]; - if (var9 != -1) { - int var10 = var9 >> 14 & 1023; - int var11 = var9 >> 3 & 2047; - int var12 = (var10 / 8 << 8) + var11 / 8; - - int var13; - for (var13 = 0; var13 < var5; ++var13) { - if (class41.regions[var13] == var12) { - var12 = -1; - break; - } - } - - if (var12 != -1) { - class41.regions[var5] = var12; - var13 = var12 >> 8 & 255; - int var14 = var12 & 255; - StudioGame.regionMapArchiveIds[var5] = WorldMapRectangle.archive5.getGroupId("m" + var13 + "_" + var14); - class52.regionLandArchiveIds[var5] = WorldMapRectangle.archive5.getGroupId("l" + var13 + "_" + var14); - ++var5; - } - } - } - } - } - - TextureProvider.method2900(var4, var2, !var15); + KeyHandler.KeyHandler_keyCodes[44] = 71; // L: 134 + KeyHandler.KeyHandler_keyCodes[45] = 26; // L: 135 + KeyHandler.KeyHandler_keyCodes[46] = 72; // L: 136 + KeyHandler.KeyHandler_keyCodes[47] = 73; // L: 137 + KeyHandler.KeyHandler_keyCodes[59] = 57; // L: 138 + KeyHandler.KeyHandler_keyCodes[61] = 27; // L: 139 + KeyHandler.KeyHandler_keyCodes[91] = 42; // L: 140 + KeyHandler.KeyHandler_keyCodes[92] = 74; // L: 141 + KeyHandler.KeyHandler_keyCodes[93] = 43; // L: 142 + KeyHandler.KeyHandler_keyCodes[192] = 28; // L: 143 + KeyHandler.KeyHandler_keyCodes[222] = 58; // L: 144 + KeyHandler.KeyHandler_keyCodes[520] = 59; // L: 145 } - } + } // L: 147 } diff --git a/runescape-client/src/main/java/class89.java b/runescape-client/src/main/java/class89.java index b14b27e2d1..cf13977f72 100644 --- a/runescape-client/src/main/java/class89.java +++ b/runescape-client/src/main/java/class89.java @@ -1,294 +1,97 @@ -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; import java.math.BigInteger; -import java.net.URL; -import java.net.URLConnection; -import java.util.Random; +import java.util.Iterator; +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cp") +@ObfuscatedName("cq") public class class89 { - @ObfuscatedName("p") + @ObfuscatedName("i") static final BigInteger field1161; - @ObfuscatedName("g") - static final BigInteger field1163; + @ObfuscatedName("o") + static final BigInteger field1164; static { - field1161 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); - field1163 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); + field1161 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049"); // L: 20 + field1164 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683"); // L: 21 } - @ObfuscatedName("q") + @ObfuscatedName("o") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "735302127" + garbageValue = "-1737643934" ) - public static void method2161() { - WorldMapSprite.midiPcmStream.clear(); - class206.field2439 = 1; - Huffman.musicTrackArchive = null; - } - - @ObfuscatedName("a") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "-963420797" - ) - static void method2159() { - Login.Login_username = Login.Login_username.trim(); - if (Login.Login_username.length() == 0) { - MusicPatchPcmStream.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); - } else { - long var1 = WorldMapEvent.method839(); - byte var0; - if (0L == var1) { - var0 = 5; - } else { - String var4 = Login.Login_username; - Random var5 = new Random(); - Buffer var6 = new Buffer(128); - Buffer var7 = new Buffer(128); - int[] var8 = new int[]{var5.nextInt(), var5.nextInt(), (int)(var1 >> 32), (int)var1}; - var6.writeByte(10); - - int var9; - for (var9 = 0; var9 < 4; ++var9) { - var6.writeInt(var5.nextInt()); - } - - var6.writeInt(var8[0]); - var6.writeInt(var8[1]); - var6.writeLong(var1); - var6.writeLong(0L); - - for (var9 = 0; var9 < 4; ++var9) { - var6.writeInt(var5.nextInt()); - } - - var6.encryptRsa(field1161, field1163); - var7.writeByte(10); - - for (var9 = 0; var9 < 3; ++var9) { - var7.writeInt(var5.nextInt()); - } - - var7.writeLong(var5.nextLong()); - var7.writeLongMedium(var5.nextLong()); - if (Client.randomDatData != null) { - var7.writeBytes(Client.randomDatData, 0, Client.randomDatData.length); - } else { - byte[] var10 = new byte[24]; - - try { - JagexCache.JagexCache_randomDat.seek(0L); - JagexCache.JagexCache_randomDat.readFully(var10); - - int var11; - for (var11 = 0; var11 < 24 && var10[var11] == 0; ++var11) { - } - - if (var11 >= 24) { - throw new IOException(); - } - } catch (Exception var39) { - for (int var12 = 0; var12 < 24; ++var12) { - var10[var12] = -1; - } - } - - var7.writeBytes(var10, 0, var10.length); - } - - var7.writeLong(var5.nextLong()); - var7.encryptRsa(field1161, field1163); - var9 = DynamicObject.stringCp1252NullTerminatedByteSize(var4); - if (var9 % 8 != 0) { - var9 += 8 - var9 % 8; - } - - Buffer var40 = new Buffer(var9); - var40.writeStringCp1252NullTerminated(var4); - var40.offset = var9; - var40.xteaEncryptAll(var8); - Buffer var28 = new Buffer(var7.offset + var6.offset + var40.offset + 5); - var28.writeByte(2); - var28.writeByte(var6.offset); - var28.writeBytes(var6.array, 0, var6.offset); - var28.writeByte(var7.offset); - var28.writeBytes(var7.array, 0, var7.offset); - var28.writeShort(var40.offset); - var28.writeBytes(var40.array, 0, var40.offset); - byte[] var13 = var28.array; - int var15 = var13.length; - StringBuilder var16 = new StringBuilder(); - - int var20; - for (int var17 = 0; var17 < var15 + 0; var17 += 3) { - int var18 = var13[var17] & 255; - var16.append(class299.field3677[var18 >>> 2]); - if (var17 < var15 - 1) { - int var19 = var13[var17 + 1] & 255; - var16.append(class299.field3677[(var18 & 3) << 4 | var19 >>> 4]); - if (var17 < var15 - 2) { - var20 = var13[var17 + 2] & 255; - var16.append(class299.field3677[(var19 & 15) << 2 | var20 >>> 6]).append(class299.field3677[var20 & 63]); - } else { - var16.append(class299.field3677[(var19 & 15) << 2]).append("="); - } - } else { - var16.append(class299.field3677[(var18 & 3) << 4]).append("=="); - } - } - - String var14 = var16.toString(); - var14 = var14; - - byte var3; - try { - URL var31 = new URL(HealthBarDefinition.method4669("services", false) + "m=accountappeal/login.ws"); - URLConnection var41 = var31.openConnection(); - var41.setDoInput(true); - var41.setDoOutput(true); - var41.setConnectTimeout(5000); - OutputStreamWriter var32 = new OutputStreamWriter(var41.getOutputStream()); - var20 = var14.length(); - StringBuilder var21 = new StringBuilder(var20); - - int var22; - for (var22 = 0; var22 < var20; ++var22) { - char var23 = var14.charAt(var22); - if ((var23 < 'a' || var23 > 'z') && (var23 < 'A' || var23 > 'Z') && (var23 < '0' || var23 > '9') && var23 != '.' && var23 != '-' && var23 != '*' && var23 != '_') { - if (var23 == ' ') { - var21.append('+'); - } else { - byte var24 = UserComparator3.charToByteCp1252(var23); - var21.append('%'); - int var25 = var24 >> 4 & 15; - if (var25 >= 10) { - var21.append((char)(var25 + 55)); - } else { - var21.append((char)(var25 + 48)); - } - - var25 = var24 & 15; - if (var25 >= 10) { - var21.append((char)(var25 + 55)); - } else { - var21.append((char)(var25 + 48)); - } - } - } else { - var21.append(var23); - } - } - - String var34 = var21.toString(); - String var35 = "data2=" + var34 + "&dest="; - var22 = "passwordchoice.ws".length(); - StringBuilder var36 = new StringBuilder(var22); - - for (int var44 = 0; var44 < var22; ++var44) { - char var45 = "passwordchoice.ws".charAt(var44); - if ((var45 < 'a' || var45 > 'z') && (var45 < 'A' || var45 > 'Z') && (var45 < '0' || var45 > '9') && var45 != '.' && var45 != '-' && var45 != '*' && var45 != '_') { - if (var45 == ' ') { - var36.append('+'); - } else { - byte var26 = UserComparator3.charToByteCp1252(var45); - var36.append('%'); - int var27 = var26 >> 4 & 15; - if (var27 >= 10) { - var36.append((char)(var27 + 55)); - } else { - var36.append((char)(var27 + 48)); - } - - var27 = var26 & 15; - if (var27 >= 10) { - var36.append((char)(var27 + 55)); - } else { - var36.append((char)(var27 + 48)); - } - } - } else { - var36.append(var45); - } - } - - String var42 = var36.toString(); - var32.write(var35 + var42); - var32.flush(); - InputStream var37 = var41.getInputStream(); - var28 = new Buffer(new byte[1000]); - - while (true) { - int var43 = var37.read(var28.array, var28.offset, 1000 - var28.offset); - if (var43 == -1) { - var32.close(); - var37.close(); - String var46 = new String(var28.array); - if (var46.startsWith("OFFLINE")) { - var3 = 4; - } else if (var46.startsWith("WRONG")) { - var3 = 7; - } else if (var46.startsWith("RELOAD")) { - var3 = 3; - } else if (var46.startsWith("Not permitted for social network accounts.")) { - var3 = 6; - } else { - var28.xteaDecryptAll(var8); - - while (var28.offset > 0 && var28.array[var28.offset - 1] == 0) { - --var28.offset; - } - - var46 = new String(var28.array, 0, var28.offset); - if (GrandExchangeOfferUnitPriceComparator.method204(var46)) { - WorldMapSectionType.openURL(var46, true, false); - var3 = 2; - } else { - var3 = 5; - } - } - break; - } - - var28.offset += var43; - if (var28.offset >= 1000) { - var3 = 5; - break; - } - } - } catch (Throwable var38) { - var38.printStackTrace(); - var3 = 5; - } - - var0 = var3; - } - - switch(var0) { - case 2: - MusicPatchPcmStream.setLoginResponseString(Strings.field3060, Strings.field3061, Strings.field3062); - Login.loginIndex = 6; - break; - case 3: - MusicPatchPcmStream.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 4: - MusicPatchPcmStream.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); - break; - case 5: - MusicPatchPcmStream.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); - break; - case 6: - MusicPatchPcmStream.setLoginResponseString("", "Error connecting to server.", ""); - break; - case 7: - MusicPatchPcmStream.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); - } + static void method2127() { + Iterator var0 = Messages.Messages_hashTable.iterator(); // L: 50 + while (var0.hasNext()) { + Message var1 = (Message)var0.next(); // L: 51 + var1.clearIsFromFriend(); // L: 53 } - } + + } // L: 56 + + @ObfuscatedName("d") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "1760703138" + ) + static void method2130(int var0) { + Login.loginIndex = 12; // L: 1733 + Login.field1210 = var0; // L: 1734 + } // L: 1735 + + @ObfuscatedName("fq") + @ObfuscatedSignature( + descriptor = "(II)V", + garbageValue = "602324309" + ) + @Export("forceDisconnect") + static final void forceDisconnect(int var0) { + ViewportMouse.logOut(); // L: 2510 + switch(var0) { // L: 2511 + case 1: + Login.loginIndex = 24; // L: 2520 + UrlRequester.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2521 + break; + case 2: + GrandExchangeOfferTotalQuantityComparator.method169(); // L: 2514 + } + + } // L: 2526 + + @ObfuscatedName("gb") + @ObfuscatedSignature( + descriptor = "(IIIB)V", + garbageValue = "-29" + ) + @Export("worldToScreen") + static final void worldToScreen(int var0, int var1, int var2) { + if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4945 + int var3 = ArchiveLoader.getTileHeight(var0, var1, Huffman.Client_plane) - var2; // L: 4950 + var0 -= VertexNormal.cameraX; // L: 4951 + var3 -= FaceNormal.cameraY; // L: 4952 + var1 -= AbstractWorldMapData.cameraZ; // L: 4953 + int var4 = Rasterizer3D.Rasterizer3D_sine[PacketBuffer.cameraPitch]; // L: 4954 + int var5 = Rasterizer3D.Rasterizer3D_cosine[PacketBuffer.cameraPitch]; // L: 4955 + int var6 = Rasterizer3D.Rasterizer3D_sine[ServerPacket.cameraYaw]; // L: 4956 + int var7 = Rasterizer3D.Rasterizer3D_cosine[ServerPacket.cameraYaw]; // L: 4957 + int var8 = var6 * var1 + var0 * var7 >> 16; // L: 4958 + var1 = var7 * var1 - var0 * var6 >> 16; // L: 4959 + var0 = var8; // L: 4960 + var8 = var5 * var3 - var4 * var1 >> 16; // L: 4961 + var1 = var3 * var4 + var5 * var1 >> 16; // L: 4962 + if (var1 >= 50) { // L: 4964 + Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 4965 + Client.viewportTempY = Client.viewportHeight / 2 + var8 * Client.viewportZoom / var1; // L: 4966 + } else { + Client.viewportTempX = -1; // L: 4969 + Client.viewportTempY = -1; // L: 4970 + } + + } else { + Client.viewportTempX = -1; // L: 4946 + Client.viewportTempY = -1; // L: 4947 + } + } // L: 4948 4972 } diff --git a/runescape-client/src/main/java/class9.java b/runescape-client/src/main/java/class9.java index ab76de9ad2..bdf4981093 100644 --- a/runescape-client/src/main/java/class9.java +++ b/runescape-client/src/main/java/class9.java @@ -2,692 +2,246 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("z") +@ObfuscatedName("m") public class class9 { - @ObfuscatedName("ra") - @ObfuscatedGetter( - intValue = 2090323123 - ) - static int field42; - @ObfuscatedName("hl") + @ObfuscatedName("ql") @ObfuscatedSignature( - descriptor = "[Llz;" + descriptor = "Ldf;" ) - @Export("mapMarkerSprites") - static Sprite[] mapMarkerSprites; - @ObfuscatedName("m") - ExecutorService field45; - @ObfuscatedName("o") - Future field44; - @ObfuscatedName("q") + @Export("decimator") + static Decimator decimator; + @ObfuscatedName("z") + ExecutorService field52; + @ObfuscatedName("k") + Future field48; + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "Lkn;" + descriptor = "Lkf;" ) - final Buffer field40; - @ObfuscatedName("j") + final Buffer field49; + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "Lc;" + descriptor = "Lh;" ) - final class12 field41; + final class12 field50; @ObfuscatedSignature( - descriptor = "(Lkn;Lc;)V" + descriptor = "(Lkf;Lh;)V" ) public class9(Buffer var1, class12 var2) { - this.field45 = Executors.newSingleThreadExecutor(); - this.field40 = var1; - this.field41 = var2; - this.method109(); - } + this.field52 = Executors.newSingleThreadExecutor(); // L: 10 + this.field49 = var1; // L: 16 + this.field50 = var2; // L: 17 + this.method118(); // L: 18 + } // L: 19 - @ObfuscatedName("m") + @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "(I)Z", - garbageValue = "1196678116" + descriptor = "(B)Z", + garbageValue = "16" ) - public boolean method106() { - return this.field44.isDone(); + public boolean method109() { + return this.field48.isDone(); // L: 22 } - @ObfuscatedName("o") + @ObfuscatedName("k") @ObfuscatedSignature( descriptor = "(I)V", - garbageValue = "1944585860" + garbageValue = "-1920645781" ) - public void method107() { - this.field45.shutdown(); - this.field45 = null; - } + public void method110() { + this.field52.shutdown(); // L: 26 + this.field52 = null; // L: 27 + } // L: 28 - @ObfuscatedName("q") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(I)Lkn;", - garbageValue = "1647170417" + descriptor = "(I)Lkf;", + garbageValue = "-1217218558" ) - public Buffer method108() { + public Buffer method122() { try { - return (Buffer)this.field44.get(); - } catch (Exception var2) { - return null; + return (Buffer)this.field48.get(); // L: 32 + } catch (Exception var2) { // L: 34 + return null; // L: 35 } } - @ObfuscatedName("j") + @ObfuscatedName("t") @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "2093000238" + descriptor = "(B)V", + garbageValue = "113" ) - void method109() { - this.field44 = this.field45.submit(new class8(this, this.field40, this.field41)); - } + void method118() { + this.field48 = this.field52.submit(new class8(this, this.field49, this.field50)); // L: 40 + } // L: 41 - @ObfuscatedName("gd") + @ObfuscatedName("gr") @ObfuscatedSignature( - descriptor = "(Lby;ZI)V", - garbageValue = "928487649" + descriptor = "(I)I", + garbageValue = "653540515" ) - @Export("addPlayerToScene") - static void addPlayerToScene(Player var0, boolean var1) { - if (var0 != null && var0.isVisible() && !var0.isHidden) { - var0.isUnanimated = false; - if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) { - var0.isUnanimated = true; - } - - int var2 = var0.x >> 7; - int var3 = var0.y >> 7; - if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) { - long var4 = class206.calculateTag(0, 0, 0, false, var0.index); - if (var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) { - var0.isUnanimated = false; - var0.tileHeight = Language.getTileHeight(var0.x, var0.y, TileItemPile.Client_plane); - var0.playerCycle = Client.cycle; - UserComparator3.scene.addNullableObject(TileItemPile.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.field648, var0.field649, var0.field650, var0.field651); - } else { - if ((var0.x & 127) == 64 && (var0.y & 127) == 64) { - if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) { - return; - } - - Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount; - } - - var0.tileHeight = Language.getTileHeight(var0.x, var0.y, TileItemPile.Client_plane); - var0.playerCycle = Client.cycle; - UserComparator3.scene.drawEntity(TileItemPile.Client_plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.rotation, var4, var0.isWalking); - } - } - } - - } - - @ObfuscatedName("jr") - @ObfuscatedSignature( - descriptor = "([Lhd;IIIIIIII)V", - garbageValue = "-1819097133" - ) - @Export("updateInterface") - static final void updateInterface(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { - for (int var8 = 0; var8 < var0.length; ++var8) { - Widget var9 = var0[var8]; - if (var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || KeyHandler.getWidgetFlags(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) { - if (var9.isIf3) { - if (Entity.isComponentHidden(var9)) { - continue; - } - } else if (var9.type == 0 && var9 != WorldMapSection1.mousedOverWidgetIf1 && Entity.isComponentHidden(var9)) { - continue; - } - - int var10 = var9.x + var6; - int var11 = var7 + var9.y; - int var12; - int var13; - int var14; - int var15; - int var18; - int var26; - if (var9.type == 2) { - var12 = var2; - var13 = var3; - var14 = var4; - var15 = var5; - } else { - int var16; - if (var9.type == 9) { - var16 = var10; - var26 = var11; - var18 = var10 + var9.width; - int var19 = var11 + var9.height; - if (var18 < var10) { - var16 = var18; - var18 = var10; - } - - if (var19 < var11) { - var26 = var19; - var19 = var11; - } - - ++var18; - ++var19; - var12 = var16 > var2 ? var16 : var2; - var13 = var26 > var3 ? var26 : var3; - var14 = var18 < var4 ? var18 : var4; - var15 = var19 < var5 ? var19 : var5; + static final int method111() { + if (Tile.clientPreferences.roofsHidden) { // L: 4331 + return Huffman.Client_plane; + } else { + int var0 = 3; // L: 4332 + if (PacketBuffer.cameraPitch < 310) { // L: 4333 + label168: { + int var1; + int var2; + if (Client.oculusOrbState == 1) { // L: 4336 + var1 = GrandExchangeOfferWorldComparator.oculusOrbFocalPointX >> 7; // L: 4337 + var2 = MouseHandler.oculusOrbFocalPointY >> 7; // L: 4338 } else { - var16 = var10 + var9.width; - var26 = var11 + var9.height; - var12 = var10 > var2 ? var10 : var2; - var13 = var11 > var3 ? var11 : var3; - var14 = var16 < var4 ? var16 : var4; - var15 = var26 < var5 ? var26 : var5; + var1 = WorldMapLabelSize.localPlayer.x >> 7; // L: 4341 + var2 = WorldMapLabelSize.localPlayer.y >> 7; // L: 4342 } - } - if (var9 == Client.clickedWidget) { - Client.field854 = true; - Client.field855 = var10; - Client.field856 = var11; - } - - boolean var32 = false; - if (var9.field2709) { - switch(Client.field835) { - case 0: - var32 = true; - case 1: - default: - break; - case 2: - if (Client.field671 == var9.id >>> 16) { - var32 = true; - } - break; - case 3: - if (var9.id == Client.field671) { - var32 = true; - } - } - } - - if (var32 || !var9.isIf3 || var12 < var14 && var13 < var15) { - if (var9.isIf3) { - ScriptEvent var17; - if (var9.noClickThrough) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var17 = (ScriptEvent)Client.scriptEvents.last(); var17 != null; var17 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var17.isMouseInputEvent) { - var17.remove(); - var17.widget.containsMouse = false; - } - } - - if (GrandExchangeOfferAgeComparator.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - FontName.addCancelMenuEntry(); - } + int var3 = VertexNormal.cameraX >> 7; // L: 4344 + int var4 = AbstractWorldMapData.cameraZ >> 7; // L: 4345 + if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) { // L: 4346 + if (var1 >= 0 && var2 >= 0 && var1 < 104 && var2 < 104) { // L: 4347 + if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4348 + var0 = Huffman.Client_plane; } - } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - for (var17 = (ScriptEvent)Client.scriptEvents.last(); var17 != null; var17 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var17.isMouseInputEvent && var17.widget.onScroll == var17.args) { - var17.remove(); - } - } - } - } - var26 = MouseHandler.MouseHandler_x; - var18 = MouseHandler.MouseHandler_y; - if (MouseHandler.MouseHandler_lastButton != 0) { - var26 = MouseHandler.MouseHandler_lastPressedX; - var18 = MouseHandler.MouseHandler_lastPressedY; - } - - boolean var33 = var26 >= var12 && var18 >= var13 && var26 < var14 && var18 < var15; - if (var9.contentType == 1337) { - if (!Client.isLoading && !Client.isMenuOpen && var33) { - WorldMapData_1.addSceneMenuOptions(var26, var18, var12, var13); - } - } else if (var9.contentType == 1338) { - class1.checkIfMinimapClicked(var9, var10, var11); - } else { - if (var9.contentType == 1400) { - class228.worldMap.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height); - } - - if (!Client.isMenuOpen && var33) { - if (var9.contentType == 1400) { - class228.worldMap.addElementMenuOptions(var10, var11, var9.width, var9.height, var26, var18); + int var5; + if (var1 > var3) { // L: 4350 + var5 = var1 - var3; } else { - Message.Widget_addToMenu(var9, var26 - var10, var18 - var11); + var5 = var3 - var1; // L: 4351 } - } - boolean var21; - int var23; - if (var32) { - for (int var20 = 0; var20 < var9.field2647.length; ++var20) { - var21 = false; - boolean var22 = false; - if (!var21 && var9.field2647[var20] != null) { - for (var23 = 0; var23 < var9.field2647[var20].length; ++var23) { - boolean var24 = false; - if (var9.field2723 != null) { - var24 = KeyHandler.KeyHandler_pressedKeys[var9.field2647[var20][var23]]; - } - - if (ArchiveDiskAction.method4302(var9.field2647[var20][var23]) || var24) { - var21 = true; - if (var9.field2723 != null && var9.field2723[var20] > Client.cycle) { - break; - } - - byte var31 = var9.field2678[var20][var23]; - if (var31 == 0 || ((var31 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var31 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var31 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var31 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) { - var22 = true; - break; - } - } - } - } - - if (var22) { - if (var20 < 10) { - class247.widgetDefaultMenuAction(var20 + 1, var9.id, var9.childIndex, var9.itemId, ""); - } else if (var20 == 10) { - GrandExchangeOffer.Widget_runOnTargetLeave(); - AttackOption.selectSpell(var9.id, var9.childIndex, WorldMapID.Widget_unpackTargetMask(KeyHandler.getWidgetFlags(var9)), var9.itemId); - Client.selectedSpellActionName = WorldMapAreaData.Widget_getSpellActionName(var9); - if (Client.selectedSpellActionName == null) { - Client.selectedSpellActionName = "null"; - } - - Client.selectedSpellName = var9.dataText + ItemContainer.colorStartTag(16777215); - } - - var23 = var9.field2679[var20]; - if (var9.field2723 == null) { - var9.field2723 = new int[var9.field2647.length]; - } - - if (var9.field2680 == null) { - var9.field2680 = new int[var9.field2647.length]; - } - - if (var23 != 0) { - if (var9.field2723[var20] == 0) { - var9.field2723[var20] = var23 + Client.cycle + var9.field2680[var20]; - } else { - var9.field2723[var20] = var23 + Client.cycle; - } - } else { - var9.field2723[var20] = Integer.MAX_VALUE; - } - } - - if (!var21 && var9.field2723 != null) { - var9.field2723[var20] = 0; - } - } - } - - if (var9.isIf3) { - if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - var33 = true; + int var6; + if (var2 > var4) { // L: 4353 + var6 = var2 - var4; } else { - var33 = false; + var6 = var4 - var2; // L: 4354 } - boolean var34 = false; - if ((MouseHandler.MouseHandler_currentButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) { - var34 = true; - } + int var7; + int var8; + if (var5 > var6) { // L: 4355 + var7 = var6 * 65536 / var5; // L: 4356 + var8 = 32768; // L: 4357 - var21 = false; - if ((MouseHandler.MouseHandler_lastButton == 1 || !ArchiveLoader.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) { - var21 = true; - } + while (true) { + if (var3 == var1) { // L: 4358 + break label168; + } - if (var21) { - class60.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11); - } + if (var3 < var1) { + ++var3; // L: 4359 + } else if (var3 > var1) { // L: 4360 + --var3; + } - if (var9.contentType == 1400) { - class228.worldMap.method6693(var26, var18, var33 & var34, var33 & var21); - } + if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4361 + var0 = Huffman.Client_plane; + } - if (Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && WorldMapScaleHandler.method819(KeyHandler.getWidgetFlags(var9))) { - Client.draggedOnWidget = var9; - } + var8 += var7; // L: 4362 + if (var8 >= 65536) { // L: 4363 + var8 -= 65536; // L: 4364 + if (var4 < var2) { // L: 4365 + ++var4; + } else if (var4 > var2) { // L: 4366 + --var4; + } - if (var9 == Client.clickedWidgetParent) { - Client.field692 = true; - Client.field852 = var10; - Client.field853 = var11; - } - - if (var9.hasListener) { - ScriptEvent var27; - if (var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseY = Client.mouseWheelRotation; - var27.args = var9.onScroll; - Client.scriptEvents.addFirst(var27); - } - - if (Client.clickedWidget != null || KeyHandler.dragInventoryWidget != null || Client.isMenuOpen) { - var21 = false; - var34 = false; - var33 = false; - } - - if (!var9.isClicked && var21) { - var9.isClicked = true; - if (var9.onClick != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10; - var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11; - var27.args = var9.onClick; - Client.scriptEvents.addFirst(var27); + if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4367 + var0 = Huffman.Client_plane; + } } } + } else { + if (var6 > 0) { // L: 4371 + var7 = var5 * 65536 / var6; // L: 4372 + var8 = 32768; // L: 4373 - if (var9.isClicked && var34 && var9.onClickRepeat != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onClickRepeat; - Client.scriptEvents.addFirst(var27); - } + while (var4 != var2) { // L: 4374 + if (var4 < var2) { // L: 4375 + ++var4; + } else if (var4 > var2) { // L: 4376 + --var4; + } - if (var9.isClicked && !var34) { - var9.isClicked = false; - if (var9.onRelease != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onRelease; - Client.field691.addFirst(var27); - } - } + if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4377 + var0 = Huffman.Client_plane; + } - if (var34 && var9.onHold != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onHold; - Client.scriptEvents.addFirst(var27); - } + var8 += var7; // L: 4378 + if (var8 >= 65536) { // L: 4379 + var8 -= 65536; // L: 4380 + if (var3 < var1) { // L: 4381 + ++var3; + } else if (var3 > var1) { // L: 4382 + --var3; + } - if (!var9.containsMouse && var33) { - var9.containsMouse = true; - if (var9.onMouseOver != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onMouseOver; - Client.scriptEvents.addFirst(var27); - } - } - - if (var9.containsMouse && var33 && var9.onMouseRepeat != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onMouseRepeat; - Client.scriptEvents.addFirst(var27); - } - - if (var9.containsMouse && !var33) { - var9.containsMouse = false; - if (var9.onMouseLeave != null) { - var27 = new ScriptEvent(); - var27.isMouseInputEvent = true; - var27.widget = var9; - var27.mouseX = MouseHandler.MouseHandler_x - var10; - var27.mouseY = MouseHandler.MouseHandler_y - var11; - var27.args = var9.onMouseLeave; - Client.field691.addFirst(var27); - } - } - - if (var9.onTimer != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onTimer; - Client.field891.addFirst(var27); - } - - ScriptEvent var25; - int var35; - int var36; - if (var9.onVarTransmit != null && Client.field860 > var9.field2736) { - if (var9.varTransmitTriggers != null && Client.field860 - var9.field2736 <= 32) { - label877: - for (var35 = var9.field2736; var35 < Client.field860; ++var35) { - var23 = Client.field859[var35 & 31]; - - for (var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) { - if (var23 == var9.varTransmitTriggers[var36]) { - var25 = new ScriptEvent(); - var25.widget = var9; - var25.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var25); - break label877; - } + if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][var3][var4] & 4) != 0) { // L: 4383 + var0 = Huffman.Client_plane; } } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onVarTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2736 = Client.field860; - } - - if (var9.onInvTransmit != null && Client.field878 > var9.field2643) { - if (var9.invTransmitTriggers != null && Client.field878 - var9.field2643 <= 32) { - label853: - for (var35 = var9.field2643; var35 < Client.field878; ++var35) { - var23 = Client.changedItemContainers[var35 & 31]; - - for (var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) { - if (var23 == var9.invTransmitTriggers[var36]) { - var25 = new ScriptEvent(); - var25.widget = var9; - var25.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var25); - break label853; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onInvTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2643 = Client.field878; - } - - if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field2721) { - if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field2721 <= 32) { - label829: - for (var35 = var9.field2721; var35 < Client.changedSkillsCount; ++var35) { - var23 = Client.changedSkills[var35 & 31]; - - for (var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) { - if (var23 == var9.statTransmitTriggers[var36]) { - var25 = new ScriptEvent(); - var25.widget = var9; - var25.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var25); - break label829; - } - } - } - } else { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStatTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2721 = Client.changedSkillsCount; - } - - if (Client.chatCycle > var9.field2735 && var9.onChatTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onChatTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field866 > var9.field2735 && var9.onFriendTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onFriendTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field943 > var9.field2735 && var9.onClanTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onClanTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field818 > var9.field2735 && var9.onStockTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onStockTransmit; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field869 > var9.field2735 && var9.field2719 != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.field2719; - Client.scriptEvents.addFirst(var27); - } - - if (Client.field870 > var9.field2735 && var9.onMiscTransmit != null) { - var27 = new ScriptEvent(); - var27.widget = var9; - var27.args = var9.onMiscTransmit; - Client.scriptEvents.addFirst(var27); - } - - var9.field2735 = Client.cycleCntr; - if (var9.onKey != null) { - for (var35 = 0; var35 < Client.field894; ++var35) { - ScriptEvent var30 = new ScriptEvent(); - var30.widget = var9; - var30.keyTyped = Client.field896[var35]; - var30.keyPressed = Client.field920[var35]; - var30.args = var9.onKey; - Client.scriptEvents.addFirst(var30); } } + break label168; } } - if (!var9.isIf3) { - if (Client.clickedWidget != null || KeyHandler.dragInventoryWidget != null || Client.isMenuOpen) { - continue; - } - - if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - if (var9.mouseOverRedirect >= 0) { - WorldMapSection1.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect]; - } else { - WorldMapSection1.mousedOverWidgetIf1 = var9; - } - } - - if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) { - SecureRandomCallable.field542 = var9; - } - - if (var9.scrollHeight > var9.height) { - Coord.method4135(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y); - } - } - - if (var9.type == 0) { - updateInterface(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - if (var9.children != null) { - updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY); - } - - InterfaceParent var28 = (InterfaceParent)Client.interfaceParents.get((long)var9.id); - if (var28 != null) { - if (var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) { - for (ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) { - if (var29.isMouseInputEvent) { - var29.remove(); - var29.widget.containsMouse = false; - } - } - - if (GrandExchangeOfferAgeComparator.widgetDragDuration == 0) { - Client.clickedWidget = null; - Client.clickedWidgetParent = null; - } - - if (!Client.isMenuOpen) { - FontName.addCancelMenuEntry(); - } - } - - MusicPatchNode.updateRootInterface(var28.group, var12, var13, var14, var15, var10, var11); - } - } + return Huffman.Client_plane; } + + return Huffman.Client_plane; } } + + if (WorldMapLabelSize.localPlayer.x >= 0 && WorldMapLabelSize.localPlayer.y >= 0 && WorldMapLabelSize.localPlayer.x < 13312 && WorldMapLabelSize.localPlayer.y < 13312) { // L: 4388 + if ((Tiles.Tiles_renderFlags[Huffman.Client_plane][WorldMapLabelSize.localPlayer.x >> 7][WorldMapLabelSize.localPlayer.y >> 7] & 4) != 0) { // L: 4389 + var0 = Huffman.Client_plane; + } + + return var0; // L: 4390 + } else { + return Huffman.Client_plane; + } + } + } + + @ObfuscatedName("gg") + @ObfuscatedSignature( + descriptor = "(IIIIIIIIII)V", + garbageValue = "-1834411387" + ) + @Export("updatePendingSpawn") + static final void updatePendingSpawn(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + PendingSpawn var9 = null; // L: 6609 + + for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) { // L: 6610 6611 6616 + if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) { // L: 6612 + var9 = var10; // L: 6613 + break; + } } - } - - @ObfuscatedName("kc") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/String;I)V", - garbageValue = "1962834261" - ) - @Export("clanKickUser") - static final void clanKickUser(String var0) { - if (ClientPreferences.clanChat != null) { - PacketBufferNode var1 = UserComparator4.getPacketBufferNode(ClientPacket.field2325, Client.packetWriter.isaacCipher); - var1.packetBuffer.writeByte(DynamicObject.stringCp1252NullTerminatedByteSize(var0)); - var1.packetBuffer.writeStringCp1252NullTerminated(var0); - Client.packetWriter.addNode(var1); + if (var9 == null) { // L: 6618 + var9 = new PendingSpawn(); // L: 6619 + var9.plane = var0; // L: 6620 + var9.type = var3; // L: 6621 + var9.x = var1; // L: 6622 + var9.y = var2; // L: 6623 + WorldMapIcon_1.method375(var9); // L: 6624 + Client.pendingSpawns.addFirst(var9); // L: 6625 } - } + + var9.id = var4; // L: 6627 + var9.field964 = var5; // L: 6628 + var9.orientation = var6; // L: 6629 + var9.delay = var7; // L: 6630 + var9.hitpoints = var8; // L: 6631 + } // L: 6632 } diff --git a/runescape-client/src/main/java/class90.java b/runescape-client/src/main/java/class90.java index d05d04640a..f849880377 100644 --- a/runescape-client/src/main/java/class90.java +++ b/runescape-client/src/main/java/class90.java @@ -1,133 +1,270 @@ +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; import net.runelite.mapping.Export; -import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("ci") +@ObfuscatedName("cc") public class class90 { - @ObfuscatedName("bb") - @ObfuscatedSignature( - descriptor = "[Llz;" - ) - @Export("worldSelectBackSprites") - static Sprite[] worldSelectBackSprites; - @ObfuscatedName("en") - @ObfuscatedGetter( - intValue = -664685957 - ) - @Export("port1") - static int port1; - @ObfuscatedName("gl") - @Export("regionLandArchives") - static byte[][] regionLandArchives; - - @ObfuscatedName("m") - @ObfuscatedSignature( - descriptor = "(I)V", - garbageValue = "1343662154" - ) - public static void method2164() { - class105.reflectionChecks = new IterableNodeDeque(); - } - - @ObfuscatedName("o") - @ObfuscatedSignature( - descriptor = "(Llz;IIII)V", - garbageValue = "-1824687226" - ) - static void method2166(Sprite var0, int var1, int var2, int var3) { - DemotingHashTable var4 = WorldMapRegion.WorldMapRegion_cachedSprites; - long var6 = (long)(var3 << 16 | var1 << 8 | var2); - var4.put(var0, var6, var0.pixels.length * 4); - } - - @ObfuscatedName("p") - @ObfuscatedSignature( - descriptor = "(Ljava/lang/CharSequence;II[BIB)I", - garbageValue = "-25" - ) - @Export("encodeStringCp1252") - public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) { - int var5 = var2 - var1; - - for (int var6 = 0; var6 < var5; ++var6) { - char var7 = var0.charAt(var6 + var1); - if (var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) { - var3[var6 + var4] = (byte)var7; - } else if (var7 == 8364) { - var3[var6 + var4] = -128; - } else if (var7 == 8218) { - var3[var6 + var4] = -126; - } else if (var7 == 402) { - var3[var6 + var4] = -125; - } else if (var7 == 8222) { - var3[var6 + var4] = -124; - } else if (var7 == 8230) { - var3[var6 + var4] = -123; - } else if (var7 == 8224) { - var3[var6 + var4] = -122; - } else if (var7 == 8225) { - var3[var6 + var4] = -121; - } else if (var7 == 710) { - var3[var6 + var4] = -120; - } else if (var7 == 8240) { - var3[var6 + var4] = -119; - } else if (var7 == 352) { - var3[var6 + var4] = -118; - } else if (var7 == 8249) { - var3[var6 + var4] = -117; - } else if (var7 == 338) { - var3[var6 + var4] = -116; - } else if (var7 == 381) { - var3[var6 + var4] = -114; - } else if (var7 == 8216) { - var3[var6 + var4] = -111; - } else if (var7 == 8217) { - var3[var6 + var4] = -110; - } else if (var7 == 8220) { - var3[var6 + var4] = -109; - } else if (var7 == 8221) { - var3[var6 + var4] = -108; - } else if (var7 == 8226) { - var3[var6 + var4] = -107; - } else if (var7 == 8211) { - var3[var6 + var4] = -106; - } else if (var7 == 8212) { - var3[var6 + var4] = -105; - } else if (var7 == 732) { - var3[var6 + var4] = -104; - } else if (var7 == 8482) { - var3[var6 + var4] = -103; - } else if (var7 == 353) { - var3[var6 + var4] = -102; - } else if (var7 == 8250) { - var3[var6 + var4] = -101; - } else if (var7 == 339) { - var3[var6 + var4] = -100; - } else if (var7 == 382) { - var3[var6 + var4] = -98; - } else if (var7 == 376) { - var3[var6 + var4] = -97; - } else { - var3[var6 + var4] = 63; - } - } - - return var5; - } + @ObfuscatedName("gh") + @Export("regions") + static int[] regions; @ObfuscatedName("z") @ObfuscatedSignature( - descriptor = "([BI)Lko;", - garbageValue = "166705545" + descriptor = "(Ljava/lang/String;Ljava/lang/String;IIB)V", + garbageValue = "4" ) - static Font method2168(byte[] var0) { - if (var0 == null) { - return null; - } else { - Font var1 = new Font(var0, class335.SpriteBuffer_xOffsets, NPC.SpriteBuffer_yOffsets, class335.SpriteBuffer_spriteWidths, class335.SpriteBuffer_spriteHeights, class335.SpriteBuffer_spritePalette, ItemDefinition.SpriteBuffer_pixels); - GrandExchangeEvent.method158(); - return var1; + public static void method2138(String var0, String var1, int var2, int var3) throws IOException { + GZipDecompressor.idxCount = var3; // L: 40 + SoundSystem.cacheGamebuild = var2; // L: 41 + + try { + WorldMapRegion.field277 = System.getProperty("os.name"); // L: 43 + } catch (Exception var33) { // L: 45 + WorldMapRegion.field277 = "Unknown"; // L: 46 } - } + + JagexCache.field2094 = WorldMapRegion.field277.toLowerCase(); // L: 48 + + try { + UserComparator2.userHomeDirectory = System.getProperty("user.home"); // L: 50 + if (UserComparator2.userHomeDirectory != null) { // L: 51 + UserComparator2.userHomeDirectory = UserComparator2.userHomeDirectory + "/"; + } + } catch (Exception var32) { // L: 53 + } + + try { + if (JagexCache.field2094.startsWith("win")) { // L: 55 + if (UserComparator2.userHomeDirectory == null) { // L: 56 + UserComparator2.userHomeDirectory = System.getenv("USERPROFILE"); + } + } else if (UserComparator2.userHomeDirectory == null) { // L: 59 + UserComparator2.userHomeDirectory = System.getenv("HOME"); + } + + if (UserComparator2.userHomeDirectory != null) { // L: 61 + UserComparator2.userHomeDirectory = UserComparator2.userHomeDirectory + "/"; + } + } catch (Exception var31) { // L: 63 + } + + if (UserComparator2.userHomeDirectory == null) { // L: 64 + UserComparator2.userHomeDirectory = "~/"; + } + + UserComparator4.field2005 = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", UserComparator2.userHomeDirectory, "/tmp/", ""}; // L: 65 + class69.field570 = new String[]{".jagex_cache_" + SoundSystem.cacheGamebuild, ".file_store_" + SoundSystem.cacheGamebuild}; // L: 66 + int var18 = 0; + + label272: + while (var18 < 4) { + String var6 = var18 == 0 ? "" : "" + var18; // L: 70 + JagexCache.JagexCache_locationFile = new File(UserComparator2.userHomeDirectory, "jagex_cl_" + var0 + "_" + var1 + var6 + ".dat"); // L: 71 + String var7 = null; // L: 72 + String var8 = null; // L: 73 + boolean var9 = false; // L: 74 + Buffer var11; + int var12; + int var14; + File var38; + if (JagexCache.JagexCache_locationFile.exists()) { // L: 75 + try { + AccessFile var10 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 78 + + for (var11 = new Buffer((int)var10.length()); var11.offset < var11.array.length; var11.offset += var12) { // L: 79 80 83 + var12 = var10.read(var11.array, var11.offset, var11.array.length - var11.offset); // L: 81 + if (var12 == -1) { // L: 82 + throw new IOException(); + } + } + + var11.offset = 0; // L: 85 + var12 = var11.readUnsignedByte(); // L: 86 + if (var12 < 1 || var12 > 3) { // L: 87 + throw new IOException("" + var12); + } + + int var13 = 0; // L: 88 + if (var12 > 1) { // L: 89 + var13 = var11.readUnsignedByte(); + } + + if (var12 <= 2) { // L: 90 + var7 = var11.readStringCp1252NullCircumfixed(); // L: 91 + if (var13 == 1) { // L: 92 + var8 = var11.readStringCp1252NullCircumfixed(); + } + } else { + var7 = var11.readCESU8(); // L: 95 + if (var13 == 1) { // L: 96 + var8 = var11.readCESU8(); + } + } + + var10.close(); // L: 98 + } catch (IOException var35) { // L: 100 + var35.printStackTrace(); // L: 101 + } + + if (var7 != null) { // L: 103 + var38 = new File(var7); // L: 104 + if (!var38.exists()) { // L: 105 + var7 = null; // L: 106 + } + } + + if (var7 != null) { // L: 109 + var38 = new File(var7, "test.dat"); // L: 110 + + boolean var40; + try { + RandomAccessFile var19 = new RandomAccessFile(var38, "rw"); // L: 114 + var14 = var19.read(); // L: 115 + var19.seek(0L); // L: 116 + var19.write(var14); // L: 117 + var19.seek(0L); // L: 118 + var19.close(); // L: 119 + var38.delete(); // L: 120 + var40 = true; // L: 121 + } catch (Exception var30) { // L: 123 + var40 = false; // L: 124 + } + + if (!var40) { // L: 127 + var7 = null; // L: 128 + } + } + } + + if (var7 == null && var18 == 0) { // L: 132 + label246: + for (int var20 = 0; var20 < class69.field570.length; ++var20) { // L: 133 + for (int var21 = 0; var21 < UserComparator4.field2005.length; ++var21) { // L: 134 + File var22 = new File(UserComparator4.field2005[var21] + class69.field570[var20] + File.separatorChar + var0 + File.separatorChar); // L: 135 + if (var22.exists()) { // L: 136 + File var23 = new File(var22, "test.dat"); // L: 138 + + boolean var42; + try { + RandomAccessFile var15 = new RandomAccessFile(var23, "rw"); // L: 141 + int var16 = var15.read(); // L: 142 + var15.seek(0L); // L: 143 + var15.write(var16); // L: 144 + var15.seek(0L); // L: 145 + var15.close(); // L: 146 + var23.delete(); // L: 147 + var42 = true; // L: 148 + } catch (Exception var29) { // L: 150 + var42 = false; // L: 151 + } + + if (var42) { // L: 154 + var7 = var22.toString(); // L: 155 + var9 = true; // L: 156 + break label246; // L: 157 + } + } + } + } + } + + if (var7 == null) { // L: 163 + var7 = UserComparator2.userHomeDirectory + File.separatorChar + "jagexcache" + var6 + File.separatorChar + var0 + File.separatorChar + var1 + File.separatorChar; // L: 164 + var9 = true; // L: 165 + } + + File var37; + if (var8 != null) { // L: 167 + var37 = new File(var8); // L: 168 + var38 = new File(var7); // L: 169 + + try { + File[] var47 = var37.listFiles(); // L: 171 + File[] var44 = var47; // L: 173 + + for (var14 = 0; var14 < var44.length; ++var14) { // L: 174 + File var43 = var44[var14]; // L: 175 + File var24 = new File(var38, var43.getName()); // L: 177 + boolean var17 = var43.renameTo(var24); // L: 178 + if (!var17) { // L: 179 + throw new IOException(); + } + } + } catch (Exception var34) { // L: 184 + var34.printStackTrace(); // L: 185 + } + + var9 = true; // L: 187 + } + + if (var9) { // L: 189 + var37 = new File(var7); // L: 190 + var11 = null; // L: 191 + + try { + AccessFile var48 = new AccessFile(JagexCache.JagexCache_locationFile, "rw", 10000L); // L: 195 + Buffer var45 = new Buffer(500); // L: 196 + var45.writeByte(3); // L: 197 + var45.writeByte(var11 != null ? 1 : 0); // L: 198 + var45.writeCESU8(var37.getPath()); // L: 199 + if (var11 != null) { // L: 200 + var45.writeCESU8(""); + } + + var48.write(var45.array, 0, var45.offset); // L: 201 + var48.close(); // L: 202 + } catch (IOException var28) { // L: 204 + var28.printStackTrace(); // L: 205 + } + } + + File var5 = new File(var7); // L: 209 + JagexCache.cacheDir = var5; // L: 211 + if (!JagexCache.cacheDir.exists()) { // L: 212 + JagexCache.cacheDir.mkdirs(); + } + + File[] var36 = JagexCache.cacheDir.listFiles(); // L: 213 + if (var36 != null) { // L: 214 + File[] var39 = var36; // L: 216 + + for (int var25 = 0; var25 < var39.length; ++var25) { // L: 217 + File var26 = var39[var25]; // L: 218 + + boolean var46; + try { + RandomAccessFile var41 = new RandomAccessFile(var26, "rw"); // L: 223 + var12 = var41.read(); // L: 224 + var41.seek(0L); // L: 225 + var41.write(var12); // L: 226 + var41.seek(0L); // L: 227 + var41.close(); // L: 228 + var46 = true; // L: 230 + } catch (Exception var27) { // L: 232 + var46 = false; // L: 233 + } + + if (!var46) { // L: 236 + ++var18; // L: 67 + continue label272; + } + } + } + break; + } + + WorldMapDecoration.method406(JagexCache.cacheDir); // L: 243 + GraphicsObject.method2091(); // L: 244 + JagexCache.JagexCache_dat2File = new BufferedFile(new AccessFile(AbstractWorldMapIcon.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); // L: 245 + JagexCache.JagexCache_idx255File = new BufferedFile(new AccessFile(AbstractWorldMapIcon.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); // L: 246 + JagexCache.JagexCache_idxFiles = new BufferedFile[GZipDecompressor.idxCount]; // L: 247 + + for (var18 = 0; var18 < GZipDecompressor.idxCount; ++var18) { // L: 248 + JagexCache.JagexCache_idxFiles[var18] = new BufferedFile(new AccessFile(AbstractWorldMapIcon.getFile("main_file_cache.idx" + var18), "rw", 1048576L), 6000, 0); // L: 249 + } + + } // L: 251 } diff --git a/runescape-client/src/main/java/class92.java b/runescape-client/src/main/java/class92.java index 37446a674a..9f14d13148 100644 --- a/runescape-client/src/main/java/class92.java +++ b/runescape-client/src/main/java/class92.java @@ -3,222 +3,103 @@ import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; -@ObfuscatedName("cq") +@ObfuscatedName("cj") public class class92 { - @ObfuscatedName("m") - static final BigInteger field1188; - @ObfuscatedName("o") - static final BigInteger field1189; + @ObfuscatedName("z") + static final BigInteger field1186; + @ObfuscatedName("k") + static final BigInteger field1187; + @ObfuscatedName("g") + @Export("SpriteBuffer_pixels") + static byte[][] SpriteBuffer_pixels; static { - field1188 = new BigInteger("10001", 16); - field1189 = new BigInteger("919cad4728c710a807a4355c136224dcaaf09055884c0f64d7c6ed68fa70062efc8449e71ef7d0b47bbe8fe89c56f988451b5459787c721ee76da46f7ce5b08982d0d24bd3ddc839e8da8b81278a27a06c107103c25355b793c60d170853f1205ee212e3b9cc208521e39224d4d87601905024f0ee199333be0b111fecdbfdd9", 16); + field1186 = new BigInteger("10001", 16); // L: 6 + field1187 = new BigInteger("966c96603c214f0c82e83159c85817fafbe6be59656eefede88f4b3d88a54a724b2cf5240c069e8654478ce882c03760ca0e6df1b9aa477f1357a6b74f87019581982517b5ade0af529e696b3b4c0ba5b89b4ff13e051485664f934bfb5cc71851706403454af6668eaa8ffc75f37c1e6f9f7fe62c32dad12e06a330baa04413", 16); // L: 7 } - @ObfuscatedName("j") + @ObfuscatedName("s") @ObfuscatedSignature( - descriptor = "(Lkb;II)V", - garbageValue = "213550097" + descriptor = "(Ljava/lang/CharSequence;IZI)Z", + garbageValue = "-1472251746" ) - @Export("readPlayerUpdate") - static void readPlayerUpdate(PacketBuffer var0, int var1) { - boolean var2 = var0.readBits(1) == 1; - if (var2) { - Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1; - } + static boolean method2141(CharSequence var0, int var1, boolean var2) { + if (var1 >= 2 && var1 <= 36) { // L: 38 + boolean var3 = false; // L: 39 + boolean var4 = false; // L: 40 + int var5 = 0; // L: 41 + int var6 = var0.length(); // L: 42 - int var3 = var0.readBits(2); - Player var4 = Client.players[var1]; - if (var3 == 0) { - if (var2) { - var4.field659 = false; - } else if (Client.localPlayerIndex == var1) { - throw new RuntimeException(); - } else { - Players.Players_regions[var1] = (var4.plane << 28) + (class182.baseX + var4.pathX[0] >> 13 << 14) + (SecureRandomFuture.baseY + var4.pathY[0] >> 13); - if (var4.field992 != -1) { - Players.Players_orientations[var1] = var4.field992; - } else { - Players.Players_orientations[var1] = var4.orientation; + for (int var7 = 0; var7 < var6; ++var7) { // L: 43 + char var8 = var0.charAt(var7); // L: 44 + if (var7 == 0) { // L: 45 + if (var8 == '-') { // L: 46 + var3 = true; // L: 47 + continue; + } + + if (var8 == '+') { // L: 50 + continue; + } } - Players.Players_targetIndices[var1] = var4.targetIndex; - Client.players[var1] = null; - if (var0.readBits(1) != 0) { - ArchiveDiskAction.updateExternalPlayer(var0, var1); - } - - } - } else { - int var5; - int var6; - int var7; - if (var3 == 1) { - var5 = var0.readBits(3); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - --var6; - --var7; - } else if (var5 == 1) { - --var7; - } else if (var5 == 2) { - ++var6; - --var7; - } else if (var5 == 3) { - --var6; - } else if (var5 == 4) { - ++var6; - } else if (var5 == 5) { - --var6; - ++var7; - } else if (var5 == 6) { - ++var7; - } else if (var5 == 7) { - ++var6; - ++var7; - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.field659 = false; - } else if (var2) { - var4.field659 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field659 = false; - var4.method1300(var6, var7, Players.field1278[var1]); - } - - } else if (var3 == 2) { - var5 = var0.readBits(4); - var6 = var4.pathX[0]; - var7 = var4.pathY[0]; - if (var5 == 0) { - var6 -= 2; - var7 -= 2; - } else if (var5 == 1) { - --var6; - var7 -= 2; - } else if (var5 == 2) { - var7 -= 2; - } else if (var5 == 3) { - ++var6; - var7 -= 2; - } else if (var5 == 4) { - var6 += 2; - var7 -= 2; - } else if (var5 == 5) { - var6 -= 2; - --var7; - } else if (var5 == 6) { - var6 += 2; - --var7; - } else if (var5 == 7) { - var6 -= 2; - } else if (var5 == 8) { - var6 += 2; - } else if (var5 == 9) { - var6 -= 2; - ++var7; - } else if (var5 == 10) { - var6 += 2; - ++var7; - } else if (var5 == 11) { - var6 -= 2; - var7 += 2; - } else if (var5 == 12) { - --var6; - var7 += 2; - } else if (var5 == 13) { - var7 += 2; - } else if (var5 == 14) { - ++var6; - var7 += 2; - } else if (var5 == 15) { - var6 += 2; - var7 += 2; - } - - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var6, var7); - var4.field659 = false; - } else if (var2) { - var4.field659 = true; - var4.tileX = var6; - var4.tileY = var7; - } else { - var4.field659 = false; - var4.method1300(var6, var7, Players.field1278[var1]); - } - - } else { - var5 = var0.readBits(1); - int var8; - int var9; int var10; - int var11; - if (var5 == 0) { - var6 = var0.readBits(12); - var7 = var6 >> 10; - var8 = var6 >> 5 & 31; - if (var8 > 15) { - var8 -= 32; - } - - var9 = var6 & 31; - if (var9 > 15) { - var9 -= 32; - } - - var10 = var8 + var4.pathX[0]; - var11 = var9 + var4.pathY[0]; - if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) { - if (var2) { - var4.field659 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field659 = false; - var4.method1300(var10, var11, Players.field1278[var1]); - } - } else { - var4.resetPath(var10, var11); - var4.field659 = false; - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - TileItemPile.Client_plane = var4.plane; - } - + if (var8 >= '0' && var8 <= '9') { // L: 52 + var10 = var8 - '0'; + } else if (var8 >= 'A' && var8 <= 'Z') { + var10 = var8 - '7'; // L: 53 } else { - var6 = var0.readBits(30); - var7 = var6 >> 28; - var8 = var6 >> 14 & 16383; - var9 = var6 & 16383; - var10 = (var8 + class182.baseX + var4.pathX[0] & 16383) - class182.baseX; - var11 = (var9 + SecureRandomFuture.baseY + var4.pathY[0] & 16383) - SecureRandomFuture.baseY; - if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) { - var4.resetPath(var10, var11); - var4.field659 = false; - } else if (var2) { - var4.field659 = true; - var4.tileX = var10; - var4.tileY = var11; - } else { - var4.field659 = false; - var4.method1300(var10, var11, Players.field1278[var1]); - } - - var4.plane = (byte)(var7 + var4.plane & 3); - if (Client.localPlayerIndex == var1) { - TileItemPile.Client_plane = var4.plane; + if (var8 < 'a' || var8 > 'z') { // L: 54 + return false; // L: 55 } + var10 = var8 - 'W'; } + + if (var10 >= var1) { // L: 56 + return false; + } + + if (var3) { // L: 57 + var10 = -var10; + } + + int var9 = var5 * var1 + var10; // L: 58 + if (var9 / var1 != var5) { // L: 59 + return false; + } + + var5 = var9; // L: 60 + var4 = true; // L: 61 } + + return var4; // L: 63 + } else { + throw new IllegalArgumentException("" + var1); } } + + @ObfuscatedName("g") + @ObfuscatedSignature( + descriptor = "(I)V", + garbageValue = "-1375275397" + ) + public static final void method2142() { + ViewportMouse.ViewportMouse_isInViewport = false; // L: 94 + ViewportMouse.ViewportMouse_entityCount = 0; // L: 95 + } // L: 96 + + @ObfuscatedName("ke") + @ObfuscatedSignature( + descriptor = "(IIIZB)V", + garbageValue = "0" + ) + public static void method2143(int var0, int var1, int var2, boolean var3) { + PacketBufferNode var4 = Client.getPacketBufferNode(ClientPacket.field2327, Client.packetWriter.isaacCipher); // L: 10863 + var4.packetBuffer.writeShort(var1); // L: 10864 + var4.packetBuffer.method5662(0); // L: 10865 + var4.packetBuffer.writeShort(var0); // L: 10866 + var4.packetBuffer.method5644(var2); // L: 10867 + Client.packetWriter.addNode(var4); // L: 10868 + } }